Changeset 1959

Timestamp:

06/14/10 14:56:46 (3 years ago)

Author:

shibuya246

Message:

[Branch 1.4] sql for multiste

File:

• branches/1.4/libs/extensions/ezSQL/mysql/ez_sql_mysql.php (modified) (5 diffs)

branches/1.4/libs/extensions/ezSQL/mysql/ez_sql_mysql.php

@@ -169 +169 @@
         */
 
-        function query($query = '')
+        function query($query = '', $add_siteid_to_query = TRUE)
         {
 
@@ -216 +216 @@
             }
 
-            if (MULTI_SITE == 'true') { $query = $this->whereMultiSite($query); }
+            if (MULTI_SITE == 'true' && $add_siteid_to_query) { $query = $this->whereMultiSite($query); }
 
             // Perform the query via std mysql_query function..
@@ -391 +391 @@
             if (stripos($query, ' FROM ')  !== false) {
                 $array = explode('FROM ',$query);
-                
-                if (!isset($array[1])) { var_dump($array);  }
-                $array2 = explode(' ', $array[1]);
-                $table = $array2[0];
-
-                $array3 = explode('_', $table);
-                $tablename = $array3[1];
-
-                $tablename = str_replace(',', '', $tablename);
-
-                if (array_key_exists($tablename, $siteidtables)) {
-                    if (stripos($query, $table)) { 
-                        if (stripos($query, 'WHERE') !== false) {
-                            $array = explode('WHERE ', $query);
-                            $query = $array[0] . ' WHERE ' . $siteidtables[$tablename] . '_siteid = ' . SITEID . " AND " . $array[1];
-                        } else {        
-                            $array = $array = explode('FROM ' . $table ,$query);
-                            $query = $array[0] . ' FROM ' . $table . ' WHERE ' . $siteidtables[$tablename] . '_siteid = ' . SITEID . $array[1];
+
+                if ($array[0] != 'SHOW COLUMNS') {
+
+                    if (!isset($array[1])) { var_dump($array);  }
+                    $array2 = explode(' ', $array[1]);
+                    $table = $array2[0];
+
+                    $array3 = explode('_', $table);
+                    $tablename = $array3[1];
+
+                    $tablename = str_replace(',', '', $tablename);
+
+                    if (array_key_exists($tablename, $siteidtables)) {
+                        if (stripos($query, $table)) {
+                            if (stripos($query, 'WHERE') !== false) {
+                                $array = explode('WHERE ', $query);
+                                $query = $array[0] . ' WHERE ' . $siteidtables[$tablename] . '_siteid = ' . SITEID . " AND " . $array[1];
+                            } else {
+                                $array = $array = explode('FROM ' . $table ,$query);
+                                $query = $array[0] . ' FROM ' . $table . ' WHERE ' . $siteidtables[$tablename] . '_siteid = ' . SITEID . $array[1];
+                            }
+
+                            $after =  "<span style='color:red; font-weight:bold;'>AFTER</span>: " . $query . "<br/><br/>";
+    //print $after;
                         }
-
-                        $after =  "<span style='color:red; font-weight:bold;'>AFTER</span>: " . $query . "<br/><br/>";
-//print $after;
                     }
-                }               
+                }
             } 
 
@@ -439 +442 @@
             
             if (stripos($query, 'INSERT INTO ')  !== false) {
-  //  print "<br/>this is INSERT " . $before;
-                $pattern = '/^INSERT INTO(.*?)\(/';
+   // print "<br/>this is INSERT " . $before;
+                $pattern = '/^INSERT INTO(.*?)\SET/';
                 preg_match($pattern, $query, $matches);
-                
-                if ($matches) { $tablename = trim($matches[1]); }
-                //print $tablename;
+                if ($matches) { $tablename = trim($matches[1]); } else {
+                    $pattern = '/^INSERT INTO(.*?)\(/';
+                    preg_match($pattern, $query, $matches);
+                    if ($matches) { $tablename = trim($matches[1]);     }
+                }
+
+//              print $tablename;
                 $tablename = str_ireplace(DB_PREFIX, '', $tablename);
 
@@ -522 +529 @@
 
             //if ($after == 'no') { print $before; }
-//          print $after;
+            //print $after;
             return $query;
         }