upgrade to codeigniter 1.7.2 for f12

[www-register-wizard.git] / database / drivers / sqlite / sqlite_driver.php

diff --git a/database/drivers/sqlite/sqlite_driver.php b/database/drivers/sqlite/sqlite_driver.php
index 968bb3f..0cb7997 100644 (file)
--- a/database/drivers/sqlite/sqlite_driver.php
+++ b/database/drivers/sqlite/sqlite_driver.php
@@ -6,7 +6,7 @@
  *
  * @package            CodeIgniter
  * @author             ExpressionEngine Dev Team
- * @copyright  Copyright (c) 2008, EllisLab, Inc.
+ * @copyright  Copyright (c) 2008 - 2009, EllisLab, Inc.
  * @license            http://codeigniter.com/user_guide/license.html
  * @link               http://codeigniter.com
  * @since              Version 1.0
@@ -37,6 +37,10 @@ class CI_DB_sqlite_driver extends CI_DB {
        // The character used to escape with - not needed for SQLite
        var $_escape_char = '';
 
+       // clause and character used for LIKE escape sequences
+       var $_like_escape_str = " ESCAPE '%s' ";
+       var $_like_escape_chr = '!';
+       
        /**
         * The syntax to count rows is slightly different across different
         * database engines, so this string appears in each driver and is
@@ -95,6 +99,22 @@ class CI_DB_sqlite_driver extends CI_DB {
        
        // --------------------------------------------------------------------
 
+       /**
+        * Reconnect
+        *
+        * Keep / reestablish the db connection if no queries have been
+        * sent for a length of time exceeding the server's idle timeout
+        *
+        * @access      public
+        * @return      void
+        */
+       function reconnect()
+       {
+               // not implemented in SQLite
+       }
+
+       // --------------------------------------------------------------------
+
        /**
         * Select the database
         *
@@ -253,11 +273,32 @@ class CI_DB_sqlite_driver extends CI_DB {
         *
         * @access      public
         * @param       string
+        * @param       bool    whether or not the string will be used in a LIKE condition
         * @return      string
         */
-       function escape_str($str)       
+       function escape_str($str, $like = FALSE)
        {
-               return sqlite_escape_string($str);
+               if (is_array($str))
+               {
+                       foreach($str as $key => $val)
+                       {
+                               $str[$key] = $this->escape_str($val, $like);
+                       }
+               
+                       return $str;
+               }
+       
+               $str = sqlite_escape_string($str);
+               
+               // escape LIKE condition wildcards
+               if ($like === TRUE)
+               {
+                       $str = str_replace(     array('%', '_', $this->_like_escape_chr),
+                                                               array($this->_like_escape_chr.'%', $this->_like_escape_chr.'_', $this->_like_escape_chr.$this->_like_escape_chr),
+                                                               $str);
+               }
+               
+               return $str;
        }
                
        // --------------------------------------------------------------------
@@ -301,15 +342,19 @@ class CI_DB_sqlite_driver extends CI_DB {
        function count_all($table = '')
        {
                if ($table == '')
-                       return '0';
-       
-               $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE));
+               {
+                       return 0;
+               }
+
+               $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows') . " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE));
                
                if ($query->num_rows() == 0)
-                       return '0';
+               {
+                       return 0;
+               }
 
                $row = $query->row();
-               return $row->numrows;
+               return (int) $row->numrows;
        }
 
        // --------------------------------------------------------------------
@@ -329,7 +374,7 @@ class CI_DB_sqlite_driver extends CI_DB {
 
                if ($prefix_limit !== FALSE AND $this->dbprefix != '')
                {
-                       $sql .= " AND 'name' LIKE '".$this->dbprefix."%'";
+                       $sql .= " AND 'name' LIKE '".$this->escape_like_str($this->dbprefix)."%' ".sprintf($this->_like_escape_str, $this->_like_escape_char);
                }
                return $sql;
        }
@@ -410,6 +455,17 @@ class CI_DB_sqlite_driver extends CI_DB {
                {
                        return $item;
                }
+
+               foreach ($this->_reserved_identifiers as $id)
+               {
+                       if (strpos($item, '.'.$id) !== FALSE)
+                       {
+                               $str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item);  
+                               
+                               // remove duplicates if the user already included the escape
+                               return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str);
+                       }               
+               }
        
                if (strpos($item, '.') !== FALSE)
                {