Changeset 1663 for trunk/system/libraries/drivers/Database_Mysql.php

Timestamp:

01/02/2008 11:53:40 AM (12 months ago)

Author:

zombor

Message:

Fix for #299. Table names can be aliased in query builder methods now.

Files:

• trunk/system/libraries/drivers/Database_Mysql.php (modified) (1 diff)

trunk/system/libraries/drivers/Database_Mysql.php

@@ -102 +102 @@
         public function escape_table($table)
         {
+                if (stripos($table, ' AS ') !== FALSE)
+                {
+                        // Force 'AS' to uppercase
+                        $table = str_ireplace(' AS ', ' AS ', $table);
+
+                        // Runs escape_table on both sides of an AS statement
+                        $table = array_map(array($this, __FUNCTION__), explode(' AS ', $table));
+
+                        // Re-create the AS statement
+                        return implode(' AS ', $table);
+                }
                 return '`'.str_replace('.', '`.`', $table).'`';
         }