Changeset 891

Timestamp:

10/25/2007 03:50:45 PM (13 months ago)

Author:

zombor

Message:

Partial fix for #155

Files:

• trunk/system/libraries/drivers/Database_Mysql.php (modified) (4 diffs)

trunk/system/libraries/drivers/Database_Mysql.php

@@ -80 +80 @@
         public function delete($table, $where)
         {
-        return 'DELETE FROM '.$this->escape_table($table).' WHERE '.implode(' ', $where);
+                return 'DELETE FROM '.$this->escape_table($table).' WHERE '.implode(' ', $where);
         }
 
@@ -186 +186 @@
                                         if ( ! $this->has_operator($k))
                                         {
-                                           $k .= ' =';
+                                                $k = $this->escape_column($k).' =';
+                                        }
+                                        else
+                                        {
+                                                // This detect the position of the operator and escape the rest...
+                                                //$k = $this->escape_column($k);
                                         }
 
@@ -242 +247 @@
         public function compile_select($database)
         {
-                $sql  = ($database['distinct'] == TRUE) ? 'SELECT DISTINCT ' : 'SELECT ';
+                $sql = ($database['distinct'] == TRUE) ? 'SELECT DISTINCT ' : 'SELECT ';
                 $sql .= (count($database['select']) > 0) ? implode(', ', $database['select']) : '*';
 
@@ -311 +316 @@
                         case 'string':
                                 $str = "'".$this->escape_str($str)."'";
-                        break;
+                                break;
                         case 'boolean':
                                 $str = (int) $str;