Changeset 2350018

Timestamp:

07/31/2020 06:36:23 PM (6 years ago)

Author:

andy

Message:

Add support for information_schema and transactions

File:

• hyperdb/trunk/db.php (modified) (3 diffs)

hyperdb/trunk/db.php

@@ -267 +267 @@
 
     /**
-     * Find the first table name referenced in a query
+     * Find the table to be used for query routing. Falls back on
+     * core get_table_from_query after checking for special cases.
      * @param string query
      * @return string table
@@ -280 +281 @@
         $q = preg_replace( '/\((?!\s*select)[^(]*?\)/is', '()', substr( $q, 0, 1500 ) );
 
-        // Refer to the previous query
-        // wpdb doesn't implement last_table, so we run it first.
+        // SELECT FOUND_ROWS() refers to the previous SELECT query
         if ( preg_match('/^\s*SELECT.*?\s+FOUND_ROWS\(\)/is', $q) )
             return $this->last_table;
 
-        if( method_exists( get_parent_class( $this ), 'get_table_from_query' ) ) {
-            // WPDB has added support for get_table_from_query, which should take precedence
-            return parent::get_table_from_query( $q );
-        }
-
-        // Quickly match most common queries
-        if ( preg_match('/^\s*(?:'
-                . 'SELECT.*?\s+FROM'
-                . '|INSERT(?:\s+IGNORE)?(?:\s+INTO)?'
-                . '|REPLACE(?:\s+INTO)?'
-                . '|UPDATE(?:\s+IGNORE)?'
-                . '|DELETE(?:\s+IGNORE)?(?:\s+FROM)?'
-                . ')\s+`?([\w-]+)`?/is', $q, $maybe) )
+        // SELECT FROM information_schema.* WHERE TABLE_NAME = 'wp_12345_foo'
+        if ( preg_match('/^\s*'
+                . 'SELECT.*?\s+FROM\s+`?information_schema`?\.'
+                . '.*\s+TABLE_NAME\s*=\s*["\']([\w-]+)["\']/is', $q, $maybe) )
             return $maybe[1];
 
-        // SHOW TABLE STATUS and SHOW TABLES
-        if ( preg_match('/^\s*(?:'
-                . 'SHOW\s+TABLE\s+STATUS.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)'
-                . '|SHOW\s+(?:FULL\s+)?TABLES.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)'
-                . ')\W([\w-]+)\W/is', $q, $maybe) )
+        // Transaction support, requires a table hint via comment: IN_TABLE=table_name
+        if ( preg_match('/^\s*'
+                . '(?:START\s+TRANSACTION|COMMIT|ROLLBACK)\s*\/[*]\s*IN_TABLE\s*=\s*'
+                . "'?([\w-]+)'?/is", $q, $maybe) ) {
             return $maybe[1];
-
-        // Big pattern for the rest of the table-related queries in MySQL 5.0
-        if ( preg_match('/^\s*(?:'
-                . '(?:EXPLAIN\s+(?:EXTENDED\s+)?)?SELECT.*?\s+FROM'
-                . '|INSERT(?:\s+LOW_PRIORITY|\s+DELAYED|\s+HIGH_PRIORITY)?(?:\s+IGNORE)?(?:\s+INTO)?'
-                . '|REPLACE(?:\s+LOW_PRIORITY|\s+DELAYED)?(?:\s+INTO)?'
-                . '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?'
-                . '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:\s+FROM)?'
-                . '|DESCRIBE|DESC|EXPLAIN|HANDLER'
-                . '|(?:LOCK|UNLOCK)\s+TABLE(?:S)?'
-                . '|(?:RENAME|OPTIMIZE|BACKUP|RESTORE|CHECK|CHECKSUM|ANALYZE|OPTIMIZE|REPAIR).*\s+TABLE'
-                . '|TRUNCATE(?:\s+TABLE)?'
-                . '|CREATE(?:\s+TEMPORARY)?\s+TABLE(?:\s+IF\s+NOT\s+EXISTS)?'
-                . '|ALTER(?:\s+IGNORE)?\s+TABLE'
-                . '|DROP\s+TABLE(?:\s+IF\s+EXISTS)?'
-                . '|CREATE(?:\s+\w+)?\s+INDEX.*\s+ON'
-                . '|DROP\s+INDEX.*\s+ON'
-                . '|LOAD\s+DATA.*INFILE.*INTO\s+TABLE'
-                . '|(?:GRANT|REVOKE).*ON\s+TABLE'
-                . '|SHOW\s+(?:.*FROM|.*TABLE)'
-                . ')\s+`?([\w-]+)`?/is', $q, $maybe) )
-            return $maybe[1];
+        }
+
+        return $this->last_table = parent::get_table_from_query( $q );
     }
 
@@ -380 +351 @@
             return false;
 
-        $this->last_table = $this->table = $this->get_table_from_query($query);
+        $this->table = $this->get_table_from_query($query);
 
         if ( isset($this->hyper_tables[$this->table]) ) {