Deletion key renamed to '_deleted_from', and moved to constant.

This commit is contained in:
Nestor Soriano 2023-06-23 16:19:45 +02:00
parent f9e0705fc4
commit e83eb70599
No known key found for this signature in database
GPG Key ID: 08110F3518C12CAD
3 changed files with 8 additions and 7 deletions

View File

@ -30,6 +30,7 @@ class DataSynchronizer implements BatchProcessorInterface {
private const INITIAL_ORDERS_PENDING_SYNC_COUNT_OPTION = 'woocommerce_initial_orders_pending_sync_count'; private const INITIAL_ORDERS_PENDING_SYNC_COUNT_OPTION = 'woocommerce_initial_orders_pending_sync_count';
public const PENDING_SYNCHRONIZATION_FINISHED_ACTION = 'woocommerce_orders_sync_finished'; public const PENDING_SYNCHRONIZATION_FINISHED_ACTION = 'woocommerce_orders_sync_finished';
public const PLACEHOLDER_ORDER_POST_TYPE = 'shop_order_placehold'; public const PLACEHOLDER_ORDER_POST_TYPE = 'shop_order_placehold';
public const DELETED_RECORD_META_KEY = '_deleted_from';
private const ORDERS_SYNC_BATCH_SIZE = 250; private const ORDERS_SYNC_BATCH_SIZE = 250;
// Allowed values for $type in get_ids_of_orders_pending_sync method. // Allowed values for $type in get_ids_of_orders_pending_sync method.
@ -255,7 +256,7 @@ SELECT(
$deleted_count = $wpdb->get_var( $deleted_count = $wpdb->get_var(
$wpdb->prepare( $wpdb->prepare(
"SELECT count(1) FROM {$wpdb->prefix}wc_orders_meta WHERE meta_key=%s AND meta_value=%s", "SELECT count(1) FROM {$wpdb->prefix}wc_orders_meta WHERE meta_key=%s AND meta_value=%s",
array( 'deleted_from', $deleted_from_table ) array( self::DELETED_RECORD_META_KEY, $deleted_from_table )
) )
); );
$pending_count += $deleted_count; $pending_count += $deleted_count;
@ -370,7 +371,7 @@ ORDER BY orders.id ASC
// phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
$wpdb->prepare( $wpdb->prepare(
"SELECT DISTINCT(order_id) FROM {$wpdb->prefix}wc_orders_meta WHERE meta_key=%s AND meta_value=%s LIMIT {$limit}", "SELECT DISTINCT(order_id) FROM {$wpdb->prefix}wc_orders_meta WHERE meta_key=%s AND meta_value=%s LIMIT {$limit}",
array( 'deleted_from', $deleted_from_table ) array( self::DELETED_RECORD_META_KEY, $deleted_from_table )
) )
// phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared // phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
); );
@ -451,7 +452,7 @@ ORDER BY orders.id ASC
$deletion_data = $wpdb->get_results( $deletion_data = $wpdb->get_results(
$wpdb->prepare( $wpdb->prepare(
"SELECT id, order_id FROM {$wpdb->prefix}wc_orders_meta WHERE meta_key=%s AND meta_value=%s AND order_id IN $order_ids_as_sql_list ORDER BY order_id DESC", "SELECT id, order_id FROM {$wpdb->prefix}wc_orders_meta WHERE meta_key=%s AND meta_value=%s AND order_id IN $order_ids_as_sql_list ORDER BY order_id DESC",
'deleted_from', self::DELETED_RECORD_META_KEY,
$deleted_from_table_name $deleted_from_table_name
), ),
ARRAY_A ARRAY_A
@ -629,7 +630,7 @@ ORDER BY orders.id ASC
AND NOT EXISTS (SELECT order_id FROM {$this->data_store::get_meta_table_name()} WHERE order_id=%d AND meta_key=%s AND meta_value=%s)", AND NOT EXISTS (SELECT order_id FROM {$this->data_store::get_meta_table_name()} WHERE order_id=%d AND meta_key=%s AND meta_value=%s)",
$postid, $postid,
$postid, $postid,
'deleted_from', self::DELETED_RECORD_META_KEY,
$wpdb->posts $wpdb->posts
) )
) )
@ -638,7 +639,7 @@ ORDER BY orders.id ASC
$this->data_store::get_meta_table_name(), $this->data_store::get_meta_table_name(),
array( array(
'order_id' => $postid, 'order_id' => $postid,
'meta_key' => 'deleted_from', 'meta_key' => self::DELETED_RECORD_META_KEY,
'meta_value' => $wpdb->posts, 'meta_value' => $wpdb->posts,
) )
); );

View File

@ -1991,7 +1991,7 @@ FROM $order_meta_table
self::get_meta_table_name(), self::get_meta_table_name(),
array( array(
'order_id' => $id, 'order_id' => $id,
'meta_key' => 'deleted_from', 'meta_key' => DataSynchronizer::DELETED_RECORD_META_KEY,
'meta_value' => self::get_orders_table_name(), 'meta_value' => self::get_orders_table_name(),
) )
); );

View File

@ -58,7 +58,7 @@ class HposTestCase extends WC_Unit_Test_Case {
$wpdb->prepare( $wpdb->prepare(
"SELECT meta_value FROM $meta_table_name WHERE order_id = %d AND meta_key = %s", "SELECT meta_value FROM $meta_table_name WHERE order_id = %d AND meta_key = %s",
$order_id, $order_id,
'deleted_from' DataSynchronizer::DELETED_RECORD_META_KEY
), ),
ARRAY_A ARRAY_A
); );