<!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" />
<title>[BuddyPress][13396] trunk: Activity: adding test to confirm `BP_Activity_Activity::get` returns the proper data when using the `meta_query` argument.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/13396">13396</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13396","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>espellcaste</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-01-07 00:42:51 +0000 (Sat, 07 Jan 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Activity: adding test to confirm `BP_Activity_Activity::get` returns the proper data when using the `meta_query` argument.
See <a href="http://buddypress.trac.wordpress.org/ticket/8556">#8556</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivityclassesclassbpactivityactivityphp">trunk/src/bp-activity/classes/class-bp-activity-activity.php</a></li>
<li><a href="#trunktestsphpunittestcasesactivityclassBP_Activity_Activityphp">trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivityclassesclassbpactivityactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/classes/class-bp-activity-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/classes/class-bp-activity-activity.php 2023-01-07 00:18:55 UTC (rev 13395)
+++ trunk/src/bp-activity/classes/class-bp-activity-activity.php 2023-01-07 00:42:51 UTC (rev 13396)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1049,6 +1049,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $meta_query An array of meta_query filters. See the
</span><span class="cx" style="display: block; padding: 0 10px"> * documentation for WP_Meta_Query for details.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array $sql_array 'join' and 'where' clauses.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1056,25 +1058,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_meta_query_sql( $meta_query = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Default array keys & empty values.
</ins><span class="cx" style="display: block; padding: 0 10px"> $sql_array = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'join' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'where' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $meta_query ) ) {
- $activity_meta_query = new WP_Meta_Query( $meta_query );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bail if no meta query.
+ if ( empty( $meta_query ) ) {
+ return $sql_array;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // WP_Meta_Query expects the table name at
- // $wpdb->activitymeta.
- $wpdb->activitymeta = buddypress()->activity->table_name_meta;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp = buddypress();
+ $activity_meta_query = new WP_Meta_Query( $meta_query );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta_sql = $activity_meta_query->get_sql( 'activity', 'a', 'id' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // WP_Meta_Query expects the table name at $wpdb->activitymeta.
+ $wpdb->activitymeta = $bp->activity->table_name_meta;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Strip the leading AND - BP handles it in get().
- $sql_array['where'] = preg_replace( '/^\sAND/', '', $meta_sql['where'] );
- $sql_array['join'] = $meta_sql['join'];
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_sql = $activity_meta_query->get_sql( 'activity', 'a', 'id' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Strip the leading AND - BP handles it in get().
+ $sql_array['where'] = preg_replace( '/^\sAND/', '', $meta_sql['where'] );
+ $sql_array['join'] = $meta_sql['join'];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $sql_array;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestcasesactivityclassBP_Activity_Activityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php 2023-01-07 00:18:55 UTC (rev 13395)
+++ trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php 2023-01-07 00:42:51 UTC (rev 13396)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,18 +94,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_with_meta_query() {
</span><span class="cx" style="display: block; padding: 0 10px"> $a1 = self::factory()->activity->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $a2 = self::factory()->activity->create();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_activity_update_meta( $a1, 'foo', 'bar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $activity = BP_Activity_Activity::get( array(
- 'meta_query' => array(
- array(
- 'key' => 'foo',
- 'value' => 'bar',
- ),
- ),
- ) );
- $ids = wp_list_pluck( $activity['activities'], 'id' );
- $this->assertEquals( $ids, array( $a1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $activity = BP_Activity_Activity::get(
+ [
+ 'meta_query' => [
+ [
+ 'key' => 'foo',
+ 'compare' => 'EXISTS',
+ ],
+ ],
+ ]
+ );
+
+ $this->assertEquals( [ $a1 ], wp_list_pluck( $activity['activities'], 'id' ) );
+
+ $activity = BP_Activity_Activity::get(
+ [
+ 'meta_query' => [
+ [
+ 'key' => 'foo',
+ 'compare' => 'NOT EXISTS',
+ ],
+ ],
+ ]
+ );
+
+ $this->assertEquals( [ $a2 ], wp_list_pluck( $activity['activities'], 'id' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>