Many new Active Record functions, and another whack of stuff

4 files changed, 406 insertions, 68 deletions

diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php
index 6189b1ff0..2d0ca157c 100644
--- a/system/database/drivers/sqlite/sqlite_driver.php
+++ b/system/database/drivers/sqlite/sqlite_driver.php
@@ -37,7 +37,7 @@ class CI_DB_sqlite_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 = ' Random()'; // database specific random keyword

 

 	/**

@@ -104,6 +104,22 @@ class CI_DB_sqlite_driver extends CI_DB {
 	// --------------------------------------------------------------------

 

 	/**

+	 * Set client character set

+	 *

+	 * @access	public

+	 * @param	string

+	 * @param	string

+	 * @return	resource

+	 */

+	function db_set_charset($charset, $collation)

+	{

+		// TODO - add support if needed

+		return TRUE;

+	}

+

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

+	

+	/**

 	 * Version number query string

 	 *

 	 * @access	public

@@ -299,11 +315,18 @@ class CI_DB_sqlite_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()

+	function _list_tables($prefix_limit = FALSE)

 	{

-		return "SELECT name from sqlite_master WHERE type='table'";

+		$sql = "SELECT name from sqlite_master WHERE type='table'";

+

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

+		{

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

+		}

+		return $sql;

 	}

 

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

@@ -390,6 +413,58 @@ class CI_DB_sqlite_driver extends CI_DB {
 	// --------------------------------------------------------------------

 

 	/**

+	 * 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;

+	}

+			

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

+

+	/**

 	 * Insert statement

 	 *

 	 * Generates a platform-specific insert string from the supplied data

@@ -416,9 +491,11 @@ class CI_DB_sqlite_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)

 		{

@@ -426,8 +503,29 @@ class CI_DB_sqlite_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).$orderby.$limit;

+	}

+

 	

-		return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where).$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 $this->_delete($table);

 	}

 	

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

@@ -440,15 +538,30 @@ class CI_DB_sqlite_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/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php
new file mode 100644
index 000000000..54b65987d
--- /dev/null
+++ b/system/database/drivers/sqlite/sqlite_forge.php
@@ -0,0 +1,233 @@
+<?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

+ */

+

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

+

+/**

+ * SQLite Forge Class

+ *

+ * @category	Database

+ * @author		Rick Ellis

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

+ */

+class CI_DB_sqlite_forge extends CI_DB_forge {

+

+	/**

+	 * Create database

+	 *

+	 * @access	public

+	 * @param	string	the database name

+	 * @return	bool

+	 */

+	function _create_database()

+	{

+		// In SQLite, a database is created when you connect to the database.

+		// We'll return TRUE so that an error isn't generated

+		return TRUE;

+	}

+

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

+

+	/**

+	 * Drop database

+	 *

+	 * @access	private

+	 * @param	string	the database name

+	 * @return	bool

+	 */

+	function _drop_database($name)

+	{

+		if ( ! @file_exists($this->db->database) OR ! @unlink($this->db->database))

+		{

+			if ($this->db->db_debug)

+			{

+				return $this->db->display_error('db_unable_to_drop');

+			}

+			return FALSE;

+		}

+		return TRUE;

+	}

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

+

+	/**

+	 * Create Table

+	 *

+	 * @access	private

+	 * @param	string	the table name

+	 * @param	array	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)." (";

+		$current_field_count = 0;

+

+		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);

+				

+				$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) && $attributes['NULL'] === TRUE)

+				{

+					$sql .= ' NULL';

+				}

+				else

+				{

+					$sql .= ' 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 .= ',';

+			}

+		}

+

+		if (count($primary_keys) > 0)

+		{

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

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

+		}

+

+		if (count($keys) > 0)

+		{

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

+			$sql .= ",\n\tUNIQUE (" . implode(', ', $keys) . ")";

+		}

+

+		$sql .= "\n)";

+

+		return $sql;

+	}

+

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

+

+	/**

+	 * Drop Table

+	 *

+	 *  Unsupported feature in SQLite

+	 *

+	 * @access	private

+	 * @return	bool

+	 */

+	function _drop_table($table)

+	{

+		if ($this->db->db_debug)

+		{

+			return $this->db->display_error('db_unsuported_feature');

+		}

+		return array();

+	}

+

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

+

+	/**

+	 * 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	string	the table name

+	 * @param	string	the column definition

+	 * @param	string	the default value

+	 * @param	boolean	should 'NOT NULL' be added

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

+	 * @return	object

+	 */

+	function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '')

+	{

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

+

+		// DROP has everything it needs now.

+		if ($alter_type == 'DROP')

+		{

+			// SQLite does not support dropping columns

+			// http://www.sqlite.org/omitted.html

+			// http://www.sqlite.org/faq.html#q11

+			return FALSE;

+		}

+

+		$sql .= " $column_definition";

+

+		if ($default_value != '')

+		{

+			$sql .= " DEFAULT \"$default_value\"";

+		}

+

+		if ($null === NULL)

+		{

+			$sql .= ' NULL';

+		}

+		else

+		{

+			$sql .= ' NOT NULL';

+		}

+

+		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/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php
index caa167813..0939c87b8 100644
--- a/system/database/drivers/sqlite/sqlite_result.php
+++ b/system/database/drivers/sqlite/sqlite_result.php
@@ -167,7 +167,14 @@ class CI_DB_sqlite_result extends CI_DB_result {
 		}

 		else

 		{

-			return $this->_fetch_assoc();

+			$arr = sqlite_fetch_array($this->result_id, SQLITE_ASSOC);

+			if (is_array($arr))

+			{

+				$obj = (object) $arr;

+				return $obj;

+			} else {

+				return NULL;

+			} 

 		}

 	}

 

diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php
index 85e74d05f..1c78c54b7 100644
--- a/system/database/drivers/sqlite/sqlite_utility.php
+++ b/system/database/drivers/sqlite/sqlite_utility.php
@@ -24,45 +24,6 @@
  */

 class CI_DB_sqlite_utility extends CI_DB_utility {

 

-

-	/**

-	 * Create database

-	 *

-	 * @access	public

-	 * @param	string	the database name

-	 * @return	bool

-	 */

-	function _create_database()

-	{

-		// In SQLite, a database is created when you connect to the database.

-		// We'll return TRUE so that an error isn't generated

-		return TRUE;

-	}

-

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

-

-	/**

-	 * Drop database

-	 *

-	 * @access	private

-	 * @param	string	the database name

-	 * @return	bool

-	 */

-	function _drop_database($name)

-	{

-		if ( ! @file_exists($this->db->database) OR ! @unlink($this->db->database))

-		{

-			if ($this->db->db_debug)

-			{

-				return $this->db->display_error('db_unable_to_drop');

-			}

-			return FALSE;

-		}

-		return TRUE;

-	}

-

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

-

 	/**

 	 * List databases

 	 *

@@ -86,25 +47,6 @@ class CI_DB_sqlite_utility extends CI_DB_utility {
 	// --------------------------------------------------------------------

 

 	/**

-	 * Drop Table

-	 *

-	 *  Unsupported feature in SQLite

-	 *

-	 * @access	private

-	 * @return	bool

-	 */

-	function _drop_table($table)

-	{

-		if ($this->db->db_debug)

-		{

-			return $this->db->display_error('db_unsuported_feature');

-		}

-		return array();

-	}

-

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

-

-	/**

 	 * Optimize table query

 	 *

 	 * Is optimization even supported in SQLite?

@@ -149,6 +91,49 @@ class CI_DB_sqlite_utility extends CI_DB_utility {
 		return $this->db->display_error('db_unsuported_feature');

 	}

 

-}

+	/**

+	 *

+	 * 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	public

+	 * @param	string	the database name

+	 * @return	bool

+	 */

+	function _create_database()

+	{

+		// In SQLite, a database is created when you connect to the database.

+		// We'll return TRUE so that an error isn't generated

+		return TRUE;

+	}

 

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

+

+	/**

+	 * Drop database

+	 *

+	 * @access	private

+	 * @param	string	the database name

+	 * @return	bool

+	 */

+	function _drop_database($name)

+	{

+		if ( ! @file_exists($this->db->database) OR ! @unlink($this->db->database))

+		{

+			if ($this->db->db_debug)

+			{

+				return $this->db->display_error('db_unable_to_drop');

+			}

+			return FALSE;

+		}

+		return TRUE;

+	}

+

+}

 ?>
\ No newline at end of file