Fixed regression with sql queries

wp-media · Jan 22, 2025 · fffaa9d · fffaa9d
1 parent 72a3ea0
commit fffaa9d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/inc/classes/class-imagify-db.php b/inc/classes/class-imagify-db.php
@@ -236,33 +236,28 @@ public static function get_required_wp_metadata_exist_clause( $id_field = 'p.ID'
 			'test'     => false,
 		)  );
 
-		$first          = true;
-		$initial_clause = '';
+		$first = true;
 
 		foreach ( self::get_required_wp_metadata_aliases() as $meta_name => $alias ) {
 			if ( $first ) {
 				$first = false;
-				$initial_clause = "
-                    OR NOT EXISTS(
-                        SELECT 1 FROM $wpdb->postmeta AS $alias WHERE
-                        $alias.post_id = $id_field AND $alias.meta_key = '$meta_name' $special_join_conditions
-                    )
-                    OR EXISTS(
+				$clause .= "
+                    EXISTS(
                         SELECT 1 FROM $wpdb->postmeta AS $alias WHERE
-                        $alias.post_id = $id_field AND $alias.meta_key = '$meta_name' $special_join_conditions
+                        $alias.post_id = $id_field AND $alias.meta_key = '$meta_name'
                         $additional_clause
                     )
                 ";
 				continue;
 			}
 
 			$clause .= "
-                    NOT EXISTS (
+                    OR NOT EXISTS (
                     SELECT 1 FROM $wpdb->postmeta AS $alias WHERE
                     $alias.post_id = $id_field AND $alias.meta_key = '$meta_name')";
 		}
 
-		return "AND( $clause $initial_clause )";
+		return "AND( $clause  )";
 	}
 
 	/**

diff --git a/inc/functions/admin-stats.php b/inc/functions/admin-stats.php
@@ -33,11 +33,15 @@ function imagify_count_attachments() {
 
 	$mime_types   = Imagify_DB::get_mime_types();
 	$statuses     = Imagify_DB::get_post_statuses();
-	$nodata_join  = Imagify_DB::get_required_wp_metadata_join_clause('p.ID', true, true,
-		"AND p.post_mime_type IN ( $mime_types )
+	$nodata_join  = '';
+	$nodata_where = '';
+	if ( ! imagify_has_attachments_without_required_metadata() ) {
+		$nodata_join  = Imagify_DB::get_required_wp_metadata_join_clause('p.ID', true, true,
+			"AND p.post_mime_type IN ( $mime_types )
 			AND p.post_type = 'attachment'
 			AND p.post_status IN ( $statuses )");
-	$nodata_where = Imagify_DB::get_required_wp_metadata_where_clause();
+		$nodata_where = Imagify_DB::get_required_wp_metadata_where_clause();
+	}
 	$count        = (int) $wpdb->get_var( // WPCS: unprepared SQL ok.
 		"
 		SELECT COUNT( p.ID )
@@ -91,8 +95,12 @@ function imagify_count_error_attachments() {
 
 	$mime_types   = Imagify_DB::get_mime_types();
 	$statuses     = Imagify_DB::get_post_statuses();
-	$nodata_join  = Imagify_DB::get_required_wp_metadata_join_clause();
-	$nodata_where = Imagify_DB::get_required_wp_metadata_where_clause();
+	$nodata_join  = '';
+	$nodata_where = '';
+	if ( ! imagify_has_attachments_without_required_metadata() ) {
+		$nodata_join = Imagify_DB::get_required_wp_metadata_join_clause();
+		$nodata_where = Imagify_DB::get_required_wp_metadata_where_clause();
+	}
 	$count        = (int) $wpdb->get_var( // WPCS: unprepared SQL ok.
 		"
 		SELECT COUNT(*)
@@ -145,8 +153,13 @@ function imagify_count_optimized_attachments() {
 
 	$mime_types   = Imagify_DB::get_mime_types();
 	$statuses     = Imagify_DB::get_post_statuses();
-	$nodata_join  = Imagify_DB::get_required_wp_metadata_join_clause();
-	$nodata_where = Imagify_DB::get_required_wp_metadata_where_clause();
+	$nodata_join  = '';
+	$nodata_where = '';
+	if ( ! imagify_has_attachments_without_required_metadata() ) {
+		$nodata_join  = Imagify_DB::get_required_wp_metadata_join_clause();
+		$nodata_where = Imagify_DB::get_required_wp_metadata_where_clause();
+	}
+
 	$count        = (int) $wpdb->get_var( // WPCS: unprepared SQL ok.
 		"
 		SELECT COUNT( DISTINCT p.ID )