Many new Active Record functions, and another whack of stuff

3 files changed, 374 insertions, 55 deletions

diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index cd86ebf52..a164552ed 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -42,7 +42,7 @@ class CI_DB_mysql_driver extends CI_DB {
 	 * database engines, so this string appears in each driver and is

 	 * used for the count_all() and count_all_results() functions.

 	 */

-	var $_count_string = "SELECT COUNT(*) AS numrows ";

+	var $_count_string = 'SELECT COUNT(*) AS ';

 	var $_random_keyword = ' RAND()'; // database specific random keyword

 

 	/**

@@ -85,6 +85,21 @@ class CI_DB_mysql_driver extends CI_DB {
 	// --------------------------------------------------------------------

 

 	/**

+	 * Set client character set

+	 *

+	 * @access	public

+	 * @param	string

+	 * @param	string

+	 * @return	resource

+	 */

+	function db_set_charset($charset, $collation)

+	{

+		return @mysql_query("SET NAMES '".$this->escape_str($charset)."' COLLATE '".$this->escape_str($collation)."'", $this->conn_id);

+	}

+

+	// --------------------------------------------------------------------

+	

+	/**

 	 * Version number query string

 	 *

 	 * @access	public

@@ -314,17 +329,18 @@ class CI_DB_mysql_driver extends CI_DB {
 	 * Generates a platform-specific query string so that the table names can be fetched

 	 *

 	 * @access	private

+	 * @param	boolean

 	 * @return	string

 	 */

 	function _list_tables($prefix_limit = FALSE)

 	{

 		$sql = "SHOW TABLES FROM `".$this->database."`";	

-		

-		if ($prefix_limit !== FALSE AND $this->_stdprefix != '')

+

+		if ($prefix_limit !== FALSE AND $this->dbprefix != '')

 		{

-			$sql .= " LIKE '".$this->_stdprefix."%'";

+			$sql .= " LIKE '".$this->dbprefix."%'";

 		}

-		

+

 		return $sql;

 	}

 	

@@ -400,14 +416,66 @@ class CI_DB_mysql_driver extends CI_DB {
 	 */

 	function _escape_table($table)

 	{

-		if (stristr($table, '.'))

+		if (strpos($table, '.') !== FALSE)

 		{

-			$table = preg_replace("/\./", "`.`", $table);

+			$table = str_replace('.', '`.`', $table);

 		}

 		

 		return $table;

 	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Protect Identifiers

+	 *

+	 * This function adds backticks if appropriate based on db type

+	 *

+	 * @access	private

+	 * @param	mixed	the item to escape

+	 * @param	boolean	only affect the first word

+	 * @return	mixed	the item with backticks

+	 */

+	function _protect_identifiers($item, $first_word_only = FALSE)

+	{

+		if (is_array($item))

+		{

+			$escaped_array = array();

+

+			foreach($item as $k=>$v)

+			{

+				$escaped_array[$this->_protect_identifiers($k)] = $this->_protect_identifiers($v, $first_word_only);

+			}

+

+			return $escaped_array;

+		}	

+

+		// This function may get "item1 item2" as a string, and so

+		// we may need "`item1` `item2`" and not "`item1 item2`"

+		if (strpos($item, ' ') !== FALSE)

+		{

+			// This function may get "field >= 1", and need it to return "`field` >= 1"

+			if ($first_word_only === TRUE)

+			{

+				return '`'.preg_replace('/ /', '` ', $item, 1);

+			}

+

+			$item = preg_replace('/(^|\s|\()([\w\d\-\_]+?)(\s|\)|$)/iS', '$1`$2`$3', $item);

+		}

+

+		$exceptions = array('AS', '/', '-', '%', '+', '*');

+		

+		foreach ($exceptions as $exception)

+		{

 		

+			if (stristr($item, " `{$exception}` ") !== FALSE)

+			{

+				$item = preg_replace('/ `('.preg_quote($exception).')` /i', ' $1 ', $item);

+			}

+		}

+		return $item;

+	}

+			

 	// --------------------------------------------------------------------

 

 	/**

@@ -437,9 +505,11 @@ class CI_DB_mysql_driver extends CI_DB {
 	 * @param	string	the table name

 	 * @param	array	the update data

 	 * @param	array	the where clause

+	 * @param	array	the orderby clause

+	 * @param	array	the limit clause

 	 * @return	string

 	 */

-	function _update($table, $values, $where, $limit = FALSE)

+	function _update($table, $values, $where, $orderby = array(), $limit = FALSE)

 	{

 		foreach($values as $key => $val)

 		{

@@ -447,8 +517,28 @@ class CI_DB_mysql_driver extends CI_DB {
 		}

 		

 		$limit = (!$limit) ? '' : ' LIMIT '.$limit;

+		

+		$orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):'';

 	

-		return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where).$limit;

+		return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where).$orderby.$limit;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Truncate statement

+	 *

+	 * Generates a platform-specific truncate string from the supplied data

+	 * If the database does not support the truncate() command

+	 * This function maps to "DELETE FROM table"

+	 *

+	 * @access	public

+	 * @param	string	the table name

+	 * @return	string

+	 */	

+	function _truncate($table)

+	{

+		return "TRUNCATE ".$this->_escape_table($table);

 	}

 	

 	// --------------------------------------------------------------------

@@ -461,13 +551,28 @@ class CI_DB_mysql_driver extends CI_DB {
 	 * @access	public

 	 * @param	string	the table name

 	 * @param	array	the where clause

+	 * @param	string	the limit clause

 	 * @return	string

 	 */	

-	function _delete($table, $where, $limit = FALSE)

+	function _delete($table, $where = array(), $like = array(), $limit = FALSE)

 	{

+		$conditions = '';

+

+		if (count($where) > 0 || count($like) > 0)

+		{

+			$conditions = "\nWHERE ";

+			$conditions .= implode("\n", $this->ar_where);

+

+			if (count($where) > 0 && count($like) > 0)

+			{

+				$conditions .= " AND ";

+			}

+			$conditions .= implode("\n", $like);

+		}

+

 		$limit = (!$limit) ? '' : ' LIMIT '.$limit;

 	

-		return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where).$limit;

+		return "DELETE FROM ".$table.$conditions.$limit;

 	}

 

 	// --------------------------------------------------------------------

diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php
new file mode 100644
index 000000000..8a918c026
--- /dev/null
+++ b/system/database/drivers/mysql/mysql_forge.php
@@ -0,0 +1,223 @@
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');

+/**

+ * CodeIgniter

+ *

+ * An open source application development framework for PHP 4.3.2 or newer

+ *

+ * @package		CodeIgniter

+ * @author		Rick Ellis

+ * @copyright	Copyright (c) 2006, EllisLab, Inc.

+ * @license		http://www.codeigniter.com/user_guide/license.html

+ * @link		http://www.codeigniter.com

+ * @since		Version 1.0

+ * @filesource

+ */

+

+// ------------------------------------------------------------------------

+

+/**

+ * MySQL Forge Class

+ *

+ * @category	Database

+ * @author		Rick Ellis

+ * @link		http://www.codeigniter.com/user_guide/database/

+ */

+class CI_DB_mysql_forge extends CI_DB_forge {

+	

+	/**

+	 * Create database

+	 *

+	 * @access	private

+	 * @param	string	the database name

+	 * @return	bool

+	 */

+	function _create_database($name)

+	{

+		return "CREATE DATABASE ".$name;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Drop database

+	 *

+	 * @access	private

+	 * @param	string	the database name

+	 * @return	bool

+	 */

+	function _drop_database($name)

+	{

+		return "DROP DATABASE ".$name;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Process Fields

+	 *

+	 * @access	private

+	 * @param	mixed	the fields

+	 * @return	string

+	 */

+	function _process_fields($fields)

+	{

+		$current_field_count = 0;

+		$sql = '';

+

+		foreach ($fields as $field=>$attributes)

+		{

+			// Numeric field names aren't allowed in databases, so if the key is

+			// numeric, we know it was assigned by PHP and the developer manually

+			// entered the field information, so we'll simply add it to the list

+			if (is_numeric($field))

+			{

+				$sql .= "\n\t$attributes";

+			}

+			else

+			{

+				$attributes = array_change_key_case($attributes, CASE_UPPER);

+				

+				$sql .= "\n\t".$this->db->_protect_identifiers($field);

+

+				if (array_key_exists('NAME', $attributes))

+				{

+					$sql .= ' '.$this->db->_protect_identifiers($attributes['NAME']).' ';

+				}

+				

+				if (array_key_exists('TYPE', $attributes))

+				{

+					$sql .=  ' '.$attributes['TYPE'];

+				}

+	

+				if (array_key_exists('CONSTRAINT', $attributes))

+				{

+					$sql .= '('.$attributes['CONSTRAINT'].')';

+				}

+	

+				if (array_key_exists('UNSIGNED', $attributes) && $attributes['UNSIGNED'] === TRUE)

+				{

+					$sql .= ' UNSIGNED';

+				}

+	

+				if (array_key_exists('DEFAULT', $attributes))

+				{

+					$sql .= ' DEFAULT \''.$attributes['DEFAULT'].'\'';

+				}

+	

+				if (array_key_exists('NULL', $attributes))

+				{

+					$sql .= ($attributes['NULL'] === TRUE) ? ' NULL' : ' NOT NULL';

+				}

+	

+				if (array_key_exists('AUTO_INCREMENT', $attributes) && $attributes['AUTO_INCREMENT'] === TRUE)

+				{

+					$sql .= ' AUTO_INCREMENT';

+				}

+			}

+			

+			// don't add a comma on the end of the last field

+			if (++$current_field_count < count($fields))

+			{

+				$sql .= ',';

+			}

+		}

+		

+		return $sql;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Create Table

+	 *

+	 * @access	private

+	 * @param	string	the table name

+	 * @param	mixed	the fields

+	 * @param	mixed	primary key(s)

+	 * @param	mixed	key(s)

+	 * @param	boolean	should 'IF NOT EXISTS' be added to the SQL

+	 * @return	bool

+	 */

+	function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists)

+	{

+		$sql = 'CREATE TABLE ';

+		

+		if ($if_not_exists === TRUE)

+		{

+			$sql .= 'IF NOT EXISTS ';

+		}

+		

+		$sql .= $this->db->_escape_table($table)." (";

+

+		$sql .= $this->_process_fields($fields);

+

+		if (count($primary_keys) > 0)

+		{

+			$primary_keys = $this->db->_protect_identifiers($primary_keys);

+			$sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")";

+		}

+

+		if (is_array($keys) && count($keys) > 0)

+		{

+			$keys = $this->db->_protect_identifiers($keys);

+			foreach ($keys as $key)

+			{

+				$sql .= ",\n\tKEY ($key)";

+			}

+		}

+

+		$sql .= "\n) DEFAULT CHARACTER SET {$this->db->char_set} COLLATE {$this->db->dbcollat};";

+

+		return $sql;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Drop Table

+	 *

+	 * @access	private

+	 * @return	bool

+	 */

+	function _drop_table($table)

+	{

+		return "DROP TABLE IF EXISTS ".$this->db->_escape_table($table);

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Alter table query

+	 *

+	 * Generates a platform-specific query so that a table can be altered

+	 * Called by add_column(), drop_column(), and column_alter(),

+	 *

+	 * @access	private

+	 * @param	string	the ALTER type (ADD, DROP, CHANGE)

+	 * @param	string	the column name

+	 * @param	array	fields

+	 * @param	string	the field after which we should add the new field

+	 * @return	object

+	 */

+	function _alter_table($alter_type, $table, $fields, $after_field = '')

+	{

+		$sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type ";

+

+		// DROP has everything it needs now.

+		if ($alter_type == 'DROP')

+		{

+			return $sql.$this->db->_protect_identifiers($fields);

+		}

+

+		$sql .= $this->_process_fields($fields);

+

+		if ($after_field != '')

+		{

+			$sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field);

+		}

+		

+		return $sql;

+	}

+

+}

+?>
\ No newline at end of file
diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php
index 54c110e09..c24a008fa 100644
--- a/system/database/drivers/mysql/mysql_utility.php
+++ b/system/database/drivers/mysql/mysql_utility.php
@@ -23,34 +23,6 @@
  * @link		http://www.codeigniter.com/user_guide/database/

  */

 class CI_DB_mysql_utility extends CI_DB_utility {

-	

-	/**

-	 * Create database

-	 *

-	 * @access	private

-	 * @param	string	the database name

-	 * @return	bool

-	 */

-	function _create_database($name)

-	{

-		return "CREATE DATABASE ".$name;

-	}

-

-	// --------------------------------------------------------------------

-

-	/**

-	 * Drop database

-	 *

-	 * @access	private

-	 * @param	string	the database name

-	 * @return	bool

-	 */

-	function _drop_database($name)

-	{

-		return "DROP DATABASE ".$name;

-	}

-

-	// --------------------------------------------------------------------

 

 	/**

 	 * List databases

@@ -66,19 +38,6 @@ class CI_DB_mysql_utility extends CI_DB_utility {
 	// --------------------------------------------------------------------

 

 	/**

-	 * Drop Table

-	 *

-	 * @access	private

-	 * @return	bool

-	 */

-	function _drop_table($table)

-	{

-		return "DROP TABLE IF EXISTS ".$this->db->_escape_table($table);

-	}

-

-	// --------------------------------------------------------------------

-

-	/**

 	 * Optimize table query

 	 *

 	 * Generates a platform-specific query so that a table can be optimized

@@ -109,7 +68,6 @@ class CI_DB_mysql_utility extends CI_DB_utility {
 	}

 

 	// --------------------------------------------------------------------

-

 	/**

 	 * MySQL Export

 	 *

@@ -187,9 +145,10 @@ class CI_DB_mysql_utility extends CI_DB_utility {
 			$is_int = array();

 			while ($field = mysql_fetch_field($query->result_id))

 			{

+				// Most versions of MySQL store timestamp as a string

 				$is_int[$i] = (in_array(

 										strtolower(mysql_field_type($query->result_id, $i)),

-										array('tinyint', 'smallint', 'mediumint', 'int', 'bigint', 'timestamp'),

+										array('tinyint', 'smallint', 'mediumint', 'int', 'bigint'), //, 'timestamp'), 

 										TRUE)

 										) ? TRUE : FALSE;

 										

@@ -255,7 +214,39 @@ class CI_DB_mysql_utility extends CI_DB_utility {
 		return $output;

 	}

 

+	/**

+	 *

+	 * The functions below have been deprecated as of 1.6, and are only here for backwards

+	 * compatibility.  They now reside in dbforge().  The use of dbutils for database manipulation

+	 * is STRONGLY discouraged in favour if using dbforge.

+	 *

+	 */

 

-}

+	/**

+	 * Create database

+	 *

+	 * @access	private

+	 * @param	string	the database name

+	 * @return	bool

+	 */

+	function _create_database($name)

+	{

+		return "CREATE DATABASE ".$name;

+	}

 

+	// --------------------------------------------------------------------

+

+	/**

+	 * Drop database

+	 *

+	 * @access	private

+	 * @param	string	the database name

+	 * @return	bool

+	 */

+	function _drop_database($name)

+	{

+		return "DROP DATABASE ".$name;

+	}

+

+}

 ?>
\ No newline at end of file