<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16266] trunk/wp-includes: Make get_meta_sql() a standalone function.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16266">16266</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-09 23:22:13 +0000 (Tue, 09 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make get_meta_sql() a standalone function. See <a href="http://trac.wordpress.org/ticket/15032">#15032</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpobjectqueryphp">trunk/wp-includes/class-wp-object-query.php</a></li>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpobjectqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-object-query.php (16265 => 16266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-object-query.php 2010-11-09 22:00:50 UTC (rev 16265)
+++ trunk/wp-includes/class-wp-object-query.php 2010-11-09 23:22:13 UTC (rev 16266)
</span><span class="lines">@@ -72,99 +72,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><del>- * Used internally to generate an SQL string for searching across multiple meta key = value pairs
- *
- * @access protected
- * @since 3.1.0
- *
- * @param array $meta_query List of metadata queries. A single query is an associative array:
- * - 'key' string The meta key
- * - 'value' string|array The meta value
- * - 'compare' (optional) string How to compare the key to the value.
- * Possible values: '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'.
- * Default: '='
- * - 'type' string (optional) The type of the value.
- * Possible values: 'NUMERIC', 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED'.
- * Default: 'CHAR'
- *
- * @param string $meta_type
- * @param string $primary_table
- * @param string $primary_id_column
- * @return array( $join_sql, $where_sql )
- */
- function get_meta_sql( $meta_query, $meta_type, $primary_table, $primary_id_column ) {
- global $wpdb;
-
- if ( ! $meta_table = _get_meta_table( $meta_type ) )
- return false;
-
- $meta_id_column = esc_sql( $meta_type . '_id' );
-
- $clauses = array();
-
- $join = '';
- $where = '';
- $i = 0;
- foreach ( $meta_query as $q ) {
- $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
- $meta_value = isset( $q['value'] ) ? $q['value'] : '';
- $meta_compare = isset( $q['compare'] ) ? strtoupper( $q['compare'] ) : '=';
- $meta_type = isset( $q['type'] ) ? strtoupper( $q['type'] ) : 'CHAR';
-
- if ( ! in_array( $meta_compare, array( '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) )
- $meta_compare = '=';
-
- if ( 'NUMERIC' == $meta_type )
- $meta_type = 'SIGNED';
- elseif ( ! in_array( $meta_type, array( 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED' ) ) )
- $meta_type = 'CHAR';
-
- if ( empty( $meta_key ) && empty( $meta_value ) )
- continue;
-
- $alias = $i ? 'mt' . $i : $meta_table;
-
- $join .= "\nINNER JOIN $meta_table";
- $join .= $i ? " AS $alias" : '';
- $join .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)";
-
- $i++;
-
- if ( !empty( $meta_key ) )
- $where .= $wpdb->prepare( " AND $alias.meta_key = %s", $meta_key );
-
- if ( in_array( $meta_compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
- if ( ! is_array( $meta_value ) )
- $meta_value = preg_split( '/[,\s]+/', $meta_value );
- } else {
- $meta_value = trim( $meta_value );
- }
-
- if ( empty( $meta_value ) )
- continue;
-
- if ( 'IN' == substr( $meta_compare, -2) ) {
- $meta_field_types = substr( str_repeat( ',%s', count( $meta_value ) ), 1 );
- $meta_compare_string = "($meta_field_types)";
- unset( $meta_field_types );
- } elseif ( 'BETWEEN' == substr( $meta_compare, -7) ) {
- $meta_value = array_slice( $meta_value, 0, 2 );
- $meta_compare_string = '%s AND %s';
- } elseif ( 'LIKE' == substr( $meta_compare, -4 ) ) {
- $meta_value = '%' . like_escape( $meta_value ) . '%';
- $meta_compare_string = '%s';
- } else {
- $meta_compare_string = '%s';
- }
- $where .= $wpdb->prepare( " AND CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$meta_compare_string}", $meta_value );
-
- unset( $meta_compare_string );
- }
-
- return apply_filters( 'get_meta_sql', compact( 'join', 'where' ), $meta_query, $meta_type, $primary_table, $primary_id_column );
- }
-
- /*
</del><span class="cx"> * Used internally to generate an SQL string for searching across multiple taxonomies
</span><span class="cx"> *
</span><span class="cx"> * @access protected
</span></span></pre></div>
<a id="trunkwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/meta.php (16265 => 16266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2010-11-09 22:00:50 UTC (rev 16265)
+++ trunk/wp-includes/meta.php 2010-11-09 23:22:13 UTC (rev 16266)
</span><span class="lines">@@ -351,6 +351,98 @@
</span><span class="cx"> return $cache;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/*
+ * Given a meta query, generates SQL clauses to be appended to a main query
+ *
+ * @since 3.1.0
+ *
+ * @param array $meta_query List of metadata queries. A single query is an associative array:
+ * - 'key' string The meta key
+ * - 'value' string|array The meta value
+ * - 'compare' (optional) string How to compare the key to the value.
+ * Possible values: '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'.
+ * Default: '='
+ * - 'type' string (optional) The type of the value.
+ * Possible values: 'NUMERIC', 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED'.
+ * Default: 'CHAR'
+ *
+ * @param string $meta_type
+ * @param string $primary_table
+ * @param string $primary_id_column
+ * @return array( 'join' => $join_sql, 'where' => $where_sql )
+ */
+function get_meta_sql( $meta_query, $meta_type, $primary_table, $primary_id_column ) {
+ global $wpdb;
+
+ if ( ! $meta_table = _get_meta_table( $meta_type ) )
+ return false;
+
+ $meta_id_column = esc_sql( $meta_type . '_id' );
+
+ $clauses = array();
+
+ $join = '';
+ $where = '';
+ $i = 0;
+ foreach ( $meta_query as $q ) {
+ $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
+ $meta_value = isset( $q['value'] ) ? $q['value'] : '';
+ $meta_compare = isset( $q['compare'] ) ? strtoupper( $q['compare'] ) : '=';
+ $meta_type = isset( $q['type'] ) ? strtoupper( $q['type'] ) : 'CHAR';
+
+ if ( ! in_array( $meta_compare, array( '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) )
+ $meta_compare = '=';
+
+ if ( 'NUMERIC' == $meta_type )
+ $meta_type = 'SIGNED';
+ elseif ( ! in_array( $meta_type, array( 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED' ) ) )
+ $meta_type = 'CHAR';
+
+ if ( empty( $meta_key ) && empty( $meta_value ) )
+ continue;
+
+ $alias = $i ? 'mt' . $i : $meta_table;
+
+ $join .= "\nINNER JOIN $meta_table";
+ $join .= $i ? " AS $alias" : '';
+ $join .= " ON ($primary_table.$primary_id_column = $alias.$meta_id_column)";
+
+ $i++;
+
+ if ( !empty( $meta_key ) )
+ $where .= $wpdb->prepare( " AND $alias.meta_key = %s", $meta_key );
+
+ if ( in_array( $meta_compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
+ if ( ! is_array( $meta_value ) )
+ $meta_value = preg_split( '/[,\s]+/', $meta_value );
+ } else {
+ $meta_value = trim( $meta_value );
+ }
+
+ if ( empty( $meta_value ) )
+ continue;
+
+ if ( 'IN' == substr( $meta_compare, -2) ) {
+ $meta_field_types = substr( str_repeat( ',%s', count( $meta_value ) ), 1 );
+ $meta_compare_string = "($meta_field_types)";
+ unset( $meta_field_types );
+ } elseif ( 'BETWEEN' == substr( $meta_compare, -7) ) {
+ $meta_value = array_slice( $meta_value, 0, 2 );
+ $meta_compare_string = '%s AND %s';
+ } elseif ( 'LIKE' == substr( $meta_compare, -4 ) ) {
+ $meta_value = '%' . like_escape( $meta_value ) . '%';
+ $meta_compare_string = '%s';
+ } else {
+ $meta_compare_string = '%s';
+ }
+ $where .= $wpdb->prepare( " AND CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$meta_compare_string}", $meta_value );
+
+ unset( $meta_compare_string );
+ }
+
+ return apply_filters( 'get_meta_sql', compact( 'join', 'where' ), $meta_query, $meta_type, $primary_table, $primary_id_column );
+}
+
</ins><span class="cx"> /**
</span><span class="cx"> * Retrieve the name of the metadata table for the specified object type.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (16265 => 16266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-11-09 22:00:50 UTC (rev 16265)
+++ trunk/wp-includes/query.php 2010-11-09 23:22:13 UTC (rev 16266)
</span><span class="lines">@@ -2147,7 +2147,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty( $q['meta_query'] ) ) {
</span><del>- $clauses = $this->get_meta_sql( $q['meta_query'], 'post', $wpdb->posts, 'ID' );
</del><ins>+ $clauses = get_meta_sql( $q['meta_query'], 'post', $wpdb->posts, 'ID' );
</ins><span class="cx"> $join .= $clauses['join'];
</span><span class="cx"> $where .= $clauses['where'];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (16265 => 16266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-11-09 22:00:50 UTC (rev 16265)
+++ trunk/wp-includes/user.php 2010-11-09 23:22:13 UTC (rev 16266)
</span><span class="lines">@@ -481,7 +481,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty( $qv['meta_query'] ) ) {
</span><del>- $clauses = $this->get_meta_sql( $qv['meta_query'], 'user', $wpdb->users, 'ID' );
</del><ins>+ $clauses = get_meta_sql( $qv['meta_query'], 'user', $wpdb->users, 'ID' );
</ins><span class="cx"> $this->query_from .= $clauses['join'];
</span><span class="cx"> $this->query_where .= $clauses['where'];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>