Changeset 25269

Timestamp:

09/05/2013 11:31:28 PM (13 years ago)

Author:

wonderboymusic

Message:

Move get_meta_type() into the WP_Meta_Query class as get_cast_for_type(). WP_Query can then access it like: $this->meta_query->get_cast_for_type().

See #21621, [25255].

Location:

trunk/src/wp-includes

Files:

• meta.php (modified) (3 diffs)
• query.php (modified) (1 diff)

trunk/src/wp-includes/meta.php

@@ -604 +604 @@
 }
 
-/**
- * Given a meta type, return the appropriate alias if applicable
- *
- * @since 3.7.0
- *
- * @see WP_Meta_Query
- *
- * @param string $type MySQL type to cast meta_value
- * @return string MySQL type
- */
-function get_meta_type( $type = '' ) {
-    if ( empty( $type ) )
-        return 'CHAR';
-
-    $meta_type = strtoupper( $type );
-
-    if ( ! in_array( $meta_type, array( 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED', 'NUMERIC' ) ) )
-        return 'CHAR';
-
-    if ( 'NUMERIC' == $meta_type )
-        $meta_type = 'SIGNED';
-
-    return $meta_type;
-}
 /**
  * Container class for a multiple metadata query
@@ -714 +690 @@
 
     /**
+     * Given a meta type, return the appropriate alias if applicable
+     *
+     * @since 3.7.0
+     *
+     * @param string $type MySQL type to cast meta_value
+     * @return string MySQL type
+     */
+    function get_cast_for_type( $type = '' ) {
+        if ( empty( $type ) )
+            return 'CHAR';
+
+        $meta_type = strtoupper( $type );
+
+        if ( ! in_array( $meta_type, array( 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED', 'NUMERIC' ) ) )
+            return 'CHAR';
+
+        if ( 'NUMERIC' == $meta_type )
+            $meta_type = 'SIGNED';
+
+        return $meta_type;
+    }
+
+    /**
      * Generates SQL clauses to be appended to a main query.
      *
@@ -769 +768 @@
         foreach ( $queries as $k => $q ) {
             $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
-            $meta_type = get_meta_type( isset( $q['type'] ) ? $q['type'] : '' );
+            $meta_type = $this->get_cast_for_type( isset( $q['type'] ) ? $q['type'] : '' );
 
             $meta_value = isset( $q['value'] ) ? $q['value'] : null;

trunk/src/wp-includes/query.php

@@ -2422 +2422 @@
                     case 'meta_value':
                         if ( isset( $q['meta_type'] ) ) {
-                            $meta_type = get_meta_type( $q['meta_type'] );
+                            $meta_type = $this->meta_query->get_cast_for_type( $q['meta_type'] );
                             $orderby = "CAST($wpdb->postmeta.meta_value AS {$meta_type})";
                         } else {
                             $orderby = "$wpdb->postmeta.meta_value";
-                        }   
+                        }
                         break;
                     case 'meta_value_num':