Changeset 37594

Timestamp:

05/30/2016 04:35:16 AM (8 years ago)

Author:

boonebgorges

Message:

In WP_Meta_Query, don't cast meta_value to CHAR.

CHAR is redundant, since the meta_value column is LONGTEXT. Meanwhile,
use of CAST() causes MySQL to ignore any index that the administrator may
have added to the column.

A number of automated tests were doing searches for CAST in the SQL strings
generated by WP_Meta_Query (for reasons unrelated to the CAST() behavior).
These tests have been updated to expect the new query format.

Props ericlewis.
Fixes #36625.

Location:

trunk

Files:

• src/wp-includes/class-wp-meta-query.php (modified) (1 diff)
• tests/phpunit/tests/meta/query.php (modified) (6 diffs)

trunk/src/wp-includes/class-wp-meta-query.php

@@ -633 +633 @@
 
             if ( $where ) {
-                $sql_chunks['where'][] = "CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$where}";
+                if ( 'CHAR' === $meta_type ) {
+                    $sql_chunks['where'][] = "$alias.meta_value {$meta_compare} {$where}";
+                } else {
+                    $sql_chunks['where'][] = "CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$where}";
+                }
             }
         }

trunk/tests/phpunit/tests/meta/query.php

@@ -494 +494 @@
         $sql = $query->get_sql( 'post', $wpdb->posts, 'ID', $this );
 
-        $this->assertEquals( 1, substr_count( $sql['where'], "CAST($wpdb->postmeta.meta_value AS CHAR) = ''" ) );
+        $this->assertEquals( 1, substr_count( $sql['where'], "$wpdb->postmeta.meta_value = ''" ) );
     }
 
@@ -602 +602 @@
         $sql = $query->get_sql( 'post', $wpdb->posts, 'ID', $this );
 
-        $this->assertSame( 1, substr_count( $sql['where'], "CAST($wpdb->postmeta.meta_value AS CHAR) = ''" ) );
+        $this->assertSame( 1, substr_count( $sql['where'], "$wpdb->postmeta.meta_value = ''" ) );
     }
 
@@ -633 +633 @@
         $sql = $query->get_sql( 'post', $wpdb->posts, 'ID', $this );
 
-        $this->assertSame( 1, substr_count( $sql['where'], "CAST($wpdb->postmeta.meta_value AS CHAR) IN" ) );
+        $this->assertSame( 1, substr_count( $sql['where'], "$wpdb->postmeta.meta_value IN" ) );
     }
 
@@ -648 +648 @@
         $sql = $query->get_sql( 'post', $wpdb->posts, 'ID', $this );
 
-        $this->assertSame( 1, substr_count( $sql['where'], "CAST($wpdb->postmeta.meta_value AS CHAR) =" ) );
+        $this->assertSame( 1, substr_count( $sql['where'], "$wpdb->postmeta.meta_value =" ) );
     }
 
@@ -664 +664 @@
         $sql = $query->get_sql( 'post', $wpdb->posts, 'ID', $this );
 
-        $this->assertSame( 1, substr_count( $sql['where'], "CAST($wpdb->postmeta.meta_value AS CHAR) =" ) );
+        $this->assertSame( 1, substr_count( $sql['where'], "$wpdb->postmeta.meta_value =" ) );
     }
 
@@ -761 +761 @@
         $sql = $query->get_sql( 'post', $wpdb->posts, 'ID', $this );
 
-        $this->assertSame( 1, substr_count( $sql['where'], "CAST($wpdb->postmeta.meta_value AS CHAR) = 'bar'" ) );
+        $this->assertSame( 1, substr_count( $sql['where'], "$wpdb->postmeta.meta_value = 'bar'" ) );
     }