Merge pull request #3063 from mohjak/master

jasonbahl · web-flow · commit 9b80d11904d4 · 2024-03-14T15:26:42.000-06:00
fix: taking care about the case of empty order by
diff --git a/src/Data/Config.php b/src/Data/Config.php
@@ -205,7 +205,7 @@ public function graphql_wp_query_cursor_pagination_stability( string $orderby, W
 		$key    = $cursor->get_cursor_id_key();
 
 		// If there is a cursor compare in the arguments, use it as the stablizer for cursors.
-		return "{$orderby}, {$key} {$order}";
+		return ( $orderby ? "{$orderby}, " : '' ) . "{$key} {$order}";
 	}
 
 	/**
@@ -307,7 +307,7 @@ public function graphql_wp_user_query_cursor_pagination_stability( $orderby, \WP
 		$cursor = new UserCursor( $query->query_vars );
 		$key    = $cursor->get_cursor_id_key();
 
-		return "{$orderby}, {$key} {$order}";
+		return ( $orderby ? "{$orderby}, " : '' ) . "{$key} {$order}";
 	}
 
 	/**
@@ -420,16 +420,21 @@ public function graphql_wp_term_query_cursor_pagination_support( array $pieces,
 			$pieces['where'] = $pieces['where'] . $before_cursor->get_where();
 		}
 
-		// Check the cursor compare order
+		// Check the cursor compare order.
 		$order = '>' === $args['graphql_cursor_compare'] ? 'ASC' : 'DESC';
 
 		// Get Cursor ID key.
 		$cursor = new TermObjectCursor( $args );
 		$key    = $cursor->get_cursor_id_key();
 
 		// If there is a cursor compare in the arguments, use it as the stabilizer for cursors.
-		$pieces['orderby'] = "{$pieces['orderby']} {$pieces['order']}, {$key} {$order}";
-		$pieces['order']   = '';
+		if ( ! empty( $pieces['orderby'] ) ) {
+			$pieces['orderby'] = "{$pieces['orderby']} {$pieces['order']}, {$key} {$order}";
+		} else {
+			$pieces['orderby'] = "ORDER BY {$key} {$order}";
+		}
+
+		$pieces['order'] = '';
 
 		return $pieces;
 	}
