summaryrefslogtreecommitdiff
path: root/kohana/libraries/drivers/Database/Mysql.php
diff options
context:
space:
mode:
Diffstat (limited to 'kohana/libraries/drivers/Database/Mysql.php')
-rw-r--r--kohana/libraries/drivers/Database/Mysql.php107
1 files changed, 43 insertions, 64 deletions
diff --git a/kohana/libraries/drivers/Database/Mysql.php b/kohana/libraries/drivers/Database/Mysql.php
index 9315ed1f..978de459 100644
--- a/kohana/libraries/drivers/Database/Mysql.php
+++ b/kohana/libraries/drivers/Database/Mysql.php
@@ -22,12 +22,6 @@ class Database_Mysql_Driver extends Database_Driver {
protected $db_config;
/**
- * Performance caches.
- */
- private $tables_cache;
- private $fields_cache;
-
- /**
* Sets the config for the class.
*
* @param array database configuration
@@ -35,8 +29,6 @@ class Database_Mysql_Driver extends Database_Driver {
public function __construct($config)
{
$this->db_config = $config;
- $this->tables_cache = array();
- $this->fields_cache = array();
Kohana::log('debug', 'MySQL Database Driver Initialized');
}
@@ -85,23 +77,23 @@ class Database_Mysql_Driver extends Database_Driver {
public function query($sql)
{
// Only cache if it's turned on, and only cache if it's not a write statement
- if ($this->db_config['cache'] AND ! preg_match('#\b(?:INSERT|UPDATE|REPLACE|SET)\b#i', $sql))
+ if ($this->db_config['cache'] AND ! preg_match('#\b(?:INSERT|UPDATE|REPLACE|SET|DELETE|TRUNCATE)\b#i', $sql))
{
$hash = $this->query_hash($sql);
- if ( ! isset(self::$query_cache[$hash]))
+ if ( ! isset($this->query_cache[$hash]))
{
// Set the cached object
- self::$query_cache[$hash] = new Mysql_Result(mysql_query($sql, $this->link), $this->link, $this->db_config['object'], $sql);
+ $this->query_cache[$hash] = new Mysql_Result(mysql_query($sql, $this->link), $this->link, $this->db_config['object'], $sql);
}
else
{
// Rewind cached result
- self::$query_cache[$hash]->rewind();
+ $this->query_cache[$hash]->rewind();
}
// Return the cached query
- return self::$query_cache[$hash];
+ return $this->query_cache[$hash];
}
return new Mysql_Result(mysql_query($sql, $this->link), $this->link, $this->db_config['object'], $sql);
@@ -136,9 +128,22 @@ class Database_Mysql_Driver extends Database_Driver {
if (!$this->db_config['escape'])
return $column;
- if (strtolower($column) == 'count(*)' OR $column == '*')
+ if ($column == '*')
return $column;
+ // This matches any functions we support to SELECT.
+ if ( preg_match('/(avg|count|sum|max|min)\(\s*(.*)\s*\)(\s*as\s*(.+)?)?/i', $column, $matches))
+ {
+ if ( count($matches) == 3)
+ {
+ return $matches[1].'('.$this->escape_column($matches[2]).')';
+ }
+ else if ( count($matches) == 5)
+ {
+ return $matches[1].'('.$this->escape_column($matches[2]).') AS '.$this->escape_column($matches[2]);
+ }
+ }
+
// This matches any modifiers we support to SELECT.
if ( ! preg_match('/\b(?:rand|all|distinct(?:row)?|high_priority|sql_(?:small_result|b(?:ig_result|uffer_result)|no_cache|ca(?:che|lc_found_rows)))\s/i', $column))
{
@@ -217,8 +222,8 @@ class Database_Mysql_Driver extends Database_Driver {
{
$froms[] = $this->escape_column($from);
}
- $sql .= "\nFROM ";
- $sql .= implode(', ', $froms);
+ $sql .= "\nFROM (";
+ $sql .= implode(', ', $froms).")";
}
if (count($database['join']) > 0)
@@ -273,11 +278,11 @@ class Database_Mysql_Driver extends Database_Driver {
return mysql_real_escape_string($str, $this->link);
}
- public function list_tables(Database $db)
+ public function list_tables()
{
- $tables =& $this->tables_cache;
+ $tables = array();
- if (empty($tables) AND $query = $db->query('SHOW TABLES FROM '.$this->escape_table($this->db_config['connection']['database'])))
+ if ($query = $this->query('SHOW TABLES FROM '.$this->escape_table($this->db_config['connection']['database'])))
{
foreach ($query->result(FALSE) as $row)
{
@@ -295,63 +300,37 @@ class Database_Mysql_Driver extends Database_Driver {
public function list_fields($table)
{
- $tables =& $this->fields_cache;
+ $result = NULL;
- if (empty($tables[$table]))
+ foreach ($this->field_data($table) as $row)
{
- foreach ($this->field_data($table) as $row)
+ // Make an associative array
+ $result[$row->Field] = $this->sql_type($row->Type);
+
+ if ($row->Key === 'PRI' AND $row->Extra === 'auto_increment')
+ {
+ // For sequenced (AUTO_INCREMENT) tables
+ $result[$row->Field]['sequenced'] = TRUE;
+ }
+
+ if ($row->Null === 'YES')
{
- // Make an associative array
- $tables[$table][$row->Field] = $this->sql_type($row->Type);
-
- if ($row->Key === 'PRI' AND $row->Extra === 'auto_increment')
- {
- // For sequenced (AUTO_INCREMENT) tables
- $tables[$table][$row->Field]['sequenced'] = TRUE;
- }
-
- if ($row->Null === 'YES')
- {
- // Set NULL status
- $tables[$table][$row->Field]['null'] = TRUE;
- }
+ // Set NULL status
+ $result[$row->Field]['null'] = TRUE;
}
}
- if (!isset($tables[$table]))
+ if (!isset($result))
throw new Kohana_Database_Exception('database.table_not_found', $table);
- return $tables[$table];
+ return $result;
}
public function field_data($table)
{
- $columns = array();
-
- if ($query = mysql_query('SHOW COLUMNS FROM '.$this->escape_table($table), $this->link))
- {
- if (mysql_num_rows($query))
- {
- while ($row = mysql_fetch_object($query))
- {
- $columns[] = $row;
- }
- }
- }
+ $result = $this->query('SHOW COLUMNS FROM '.$this->escape_table($table));
- return $columns;
- }
-
- /**
- * Clears the internal query cache.
- *
- * @param string SQL query
- */
- public function clear_cache($sql = NULL)
- {
- parent::clear_cache($sql);
- $this->tables_cache = array();
- $this->fields_cache = array();
+ return $result->result_array(TRUE);
}
} // End Database_Mysql_Driver Class
@@ -514,4 +493,4 @@ class Mysql_Result extends Database_Result {
}
}
-} // End Mysql_Result Class \ No newline at end of file
+} // End Mysql_Result Class
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 12:46:54 +0000