Ticket #32090: 32090-41.patch
File 32090-41.patch, 2.7 KB (added by , 10 years ago) |
---|
-
branches/4.1/src/wp-includes/wp-db.php
2246 2246 } 2247 2247 2248 2248 $charsets = $columns = array(); 2249 $results = $this->get_results( "SHOW FULL COLUMNS FROM `$table`" ); 2249 2250 $table_parts = explode( '.', $table ); 2251 $table = '`' . implode( '`.`', $table_parts ) . '`'; 2252 $results = $this->get_results( "SHOW FULL COLUMNS FROM $table" ); 2250 2253 if ( ! $results ) { 2251 2254 return new WP_Error( 'wpdb_get_table_charset_failure' ); 2252 2255 } … … 2819 2822 . '|REPLACE(?:\s+LOW_PRIORITY|\s+DELAYED)?(?:\s+INTO)?' 2820 2823 . '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?' 2821 2824 . '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:\s+FROM)?' 2822 . ')\s+ `?([\w-]+)`?/is', $query, $maybe ) ) {2823 return $maybe[1];2825 . ')\s+((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe ) ) { 2826 return str_replace( '`', '', $maybe[1] ); 2824 2827 } 2825 2828 2826 2829 // SHOW TABLE STATUS and SHOW TABLES 2827 2830 if ( preg_match( '/^\s*(?:' 2828 2831 . 'SHOW\s+TABLE\s+STATUS.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)' 2829 2832 . '|SHOW\s+(?:FULL\s+)?TABLES.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)' 2830 . ')\W( [\w-]+)\W/is', $query, $maybe ) ) {2831 return $maybe[1];2833 . ')\W((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\W/is', $query, $maybe ) ) { 2834 return str_replace( '`', '', $maybe[1] ); 2832 2835 } 2833 2836 2834 2837 // Big pattern for the rest of the table-related queries. … … 2846 2849 . '|LOAD\s+DATA.*INFILE.*INTO\s+TABLE' 2847 2850 . '|(?:GRANT|REVOKE).*ON\s+TABLE' 2848 2851 . '|SHOW\s+(?:.*FROM|.*TABLE)' 2849 . ')\s+\(*\s* `?([\w-]+)`?\s*\)*/is', $query, $maybe ) ) {2850 return $maybe[1];2852 . ')\s+\(*\s*((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe ) ) { 2853 return str_replace( '`', '', $maybe[1] ); 2851 2854 } 2852 2855 2853 2856 return false; -
branches/4.1/tests/phpunit/tests/db.php
526 526 */ 527 527 function data_get_table_from_query() { 528 528 $table = 'a_test_table_name'; 529 $db_table = '`a_test_db`.`another_test_table`'; 529 530 530 531 $queries = array( 531 532 // Basic … … 628 629 "SHOW INDEX FROM $table", 629 630 ); 630 631 631 foreach ( $queries as &$query ) { 632 $query = array( $query, $table ); 632 $querycount = count( $queries ); 633 for ( $ii = 0; $ii < $querycount; $ii++ ) { 634 $db_query = str_replace( $table, $db_table, $queries[ $ii ] ); 635 $expected_db_table = str_replace( '`', '', $db_table ); 636 637 $queries[ $ii ] = array( $queries[ $ii ], $table ); 638 $queries[] = array( $db_query, $expected_db_table ); 633 639 } 634 640 return $queries; 635 641 }