#9 Handle variant character sets.

Author: OllieJones

changelog.txt

@@ -0,0 +1,63 @@
+= 1.0.2 August 5, 2024 =
+
+* Load the meta_names cache during activation; don't let it expire.
+
+= 1.0.0 July 3, 2024 =
+
+* Allow searching on order number and transaction id fields.
+* Keep a cache of the meta_names for order custom fields to avoid repeating a very slow query.
+
+= 0.5.0 July 1, 2024 =
+
+* Improved compatibility with WooCommerce 9.0.0+.
+
+* Add advice to readme.txt suggesting a new key on `wp_wc_orders_meta` for very large sites.
+
+= 0.4.1 June 15, 2024 =
+
+* Make the patch for slow order-page viewing compatible with WooCommerce 8.9.3.
+* Fix a presentation defect in the table-generation notify message.
+
+= 0.4.0 May 10, 2024 =
+
+Patch the query to look up distinct public meta_key values.
+
+= 0.3.0 April 25, 2024 =
+
+Use JOINs rather than IN to get better performance. Shorten the table and column names.
+
+= 0.2.6 April 15, 2024 =
+
+Notice, localization, phpcs:ignore
+
+= 0.2.5 April 13, 2024 =
+
+Background loading. Correct handling of HPOS variant queries (from the dropdown).
+
+= 0.2.4 April 6, 2024 =
+
+Ingest wp_wc_order_addresses info when creating trigram table, and handle pre-HPOS sites correctly.
+
+= 0.2.2 April 1, 2024 =
+
+Perform trigram inserts in batches.
+
+= 0.2.1 March 26, 2024 =
+
+Keep up with changes to orders.
+
+= 0.1.4 March 23, 2024
+
+Use trigrams, support both traditional and HPOS orders.
+
+= 0.1.3 March 21, 2024
+
+Build a text index table and use it.
+
+= 0.1.2 November 24, 2023
+
+Add support for speeding Subscriptions searches.
+
+= 0.1.1 November 19, 2023
+
+Birthday of Fast Woo Order Lookup. And, the birthday (in 1988) of the author's daughter Catharine.

code/class-textdex.php

@@ -402,30 +402,31 @@ private function get_order_metadata( $first, $last = null ) {
 		$orders     = $wpdb->prefix . 'wc_orders';
 		$orderitems = $wpdb->prefix . 'woocommerce_order_items';
 		$addresses  = $wpdb->prefix . 'wc_order_addresses';
+		$charset    = $wpdb->charset;
 		$collation  = $wpdb->collate;
 
 
 		$query = <<<QUERY
 				SELECT id, value
 				FROM (
-				SELECT post_id id, meta_value COLLATE $collation value
+				SELECT post_id id, CONVERT( meta_value USING $charset) COLLATE $collation value
 				  FROM $postmeta
 				 WHERE meta_key IN ('_billing_address_index','_shipping_address_index','_billing_last_name','_billing_email','_billing_phone','_order_number','_order_number_formatted')
 				   AND post_id >= %d and post_id < %d
 
 				UNION ALL
-				SELECT order_id id, meta_value COLLATE $collation value
+				SELECT order_id id, CONVERT( meta_value USING $charset) COLLATE $collation value
 				  FROM $ordersmeta
 				 WHERE meta_key IN ('_billing_address_index','_shipping_address_index','_order_number','_order_number_formatted')
 				   AND order_id >= %d and order_id < %d
 
 				UNION ALL
-				SELECT order_id id, order_item_name COLLATE $collation value
+				SELECT order_id id, CONVERT( order_item_name USING $charset) COLLATE $collation value
 				  FROM $orderitems
 				 WHERE order_id >= %d and order_id < %d
 
 				UNION ALL
-				SELECT id, billing_email COLLATE $collation value
+				SELECT id, CONVERT( billing_email USING $charset) COLLATE $collation value
 				  FROM $orders
 				 WHERE id >= %d and id < %d
 				
@@ -435,27 +436,27 @@ private function get_order_metadata( $first, $last = null ) {
 				 WHERE id >= %d and id < %d
 				
 				UNION ALL
-				SELECT id, transaction_id COLLATE $collation value
+				SELECT id, CONVERT( transaction_id USING $charset) COLLATE $collation value
 				  FROM $orders
 				 WHERE id >= %d and id < %d AND transaction_id IS NOT NULL
 				
 				UNION ALL
-				SELECT order_id id, CONCAT_WS (' ', first_name, last_name, company, address_1, address_2, city, state, postcode, country) COLLATE $collation value
+				SELECT order_id id, CONVERT( CONCAT_WS (' ', first_name, last_name, company, address_1, address_2, city, state, postcode, country) USING $charset) COLLATE $collation value
 				  FROM $addresses
 				 WHERE order_id >= %d and order_id < %d
 
 				UNION ALL
-				SELECT order_id id, email COLLATE $collation value
+				SELECT order_id id, CONVERT( email USING $charset) COLLATE $collation value
 				  FROM $addresses
 				 WHERE order_id >= %d and order_id < %d
 
 				UNION ALL
-				SELECT order_id id, phone COLLATE $collation value
+				SELECT order_id id, CONVERT( phone USING $charset) COLLATE $collation value
 				  FROM $addresses
 				 WHERE order_id >= %d and order_id < %d
 				) a
 			WHERE value IS NOT NULL
-			ORDER BY id;
+			ORDER BY id, value;
 QUERY;
 		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 		$query = $wpdb->prepare( $query,

fast-woo-order-lookup.php

@@ -12,8 +12,9 @@
  * Plugin URI:    https://plumislandmedia.net/wordpress-plugins/fast-woo-order-lookup/
  * Description:   Look up orders faster in large WooCommerce stores with many orders.
  * Version:       1.1.2
- * Requires at least: 5.8
  * Requires PHP: 5.6
+ * Requires at least: 5.8
+ * Tested up to: 6.7
  * WC requires at least: 4.0
  * WC tested up to: 9.1.4
  * Requires Plugins: woocommerce

languages/fast-woo-order-lookup.pot

@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-09-20T12:36:44+00:00\n"
+"POT-Creation-Date: 2024-10-07T13:02:07+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.9.0\n"
 "X-Domain: fast-woo-order-lookup\n"

readme.txt

@@ -5,7 +5,7 @@ Donate link:
 Contributors:  OllieJones
 Tags: woocommerce, search, orders, database, performance
 Requires at least: 5.9
-Tested up to: 6.6.1
+Tested up to: 6.7
 Requires PHP: 5.6
 WC requires at least: 4.0
 WC tested up to: 9.1.4
@@ -92,7 +92,9 @@ Support for WooCommerce Sequential Order Numbers Pro. Faster initial indexing. W
 
 == Changelog ==
 
-= 1.1.2 September 20, 2024 =
+= 1.1.2 October 7, 2024 =
+
+Handle tables and colums with character sets other than $wpdb->charset.
 
 = 1.1.1 August 12, 2024 =
 
@@ -101,67 +103,3 @@ Support for WooCommerce Sequential Order Numbers Pro. Faster initial indexing. W
 = 1.1.0 August 11, 2024 =
 
 * Some MariaDB / MySQL versions implicitly cast integers to latin1 strings causing problems. Explicit casting fixes the issue.
-
-= 1.0.2 August 5, 2024 =
-
-* Load the meta_names cache during activation; don't let it expire.
-
-= 1.0.0 July 3, 2024 =
-
-* Allow searching on order number and transaction id fields.
-* Keep a cache of the meta_names for order custom fields to avoid repeating a very slow query.
-
-= 0.5.0 July 1, 2024 =
-
-* Improved compatibility with WooCommerce 9.0.0+.
-
-* Add advice to readme.txt suggesting a new key on `wp_wc_orders_meta` for very large sites.
-
-= 0.4.1 June 15, 2024 =
-
-* Make the patch for slow order-page viewing compatible with WooCommerce 8.9.3.
-* Fix a presentation defect in the table-generation notify message.
-
-= 0.4.0 May 10, 2024 =
-
-Patch the query to look up distinct public meta_key values.
-
-= 0.3.0 April 25, 2024 =
-
-Use JOINs rather than IN to get better performance. Shorten the table and column names.
-
-= 0.2.6 April 15, 2024 =
-
-Notice, localization, phpcs:ignore
-
-= 0.2.5 April 13, 2024 =
-
-Background loading. Correct handling of HPOS variant queries (from the dropdown).
-
-= 0.2.4 April 6, 2024 =
-
-Ingest wp_wc_order_addresses info when creating trigram table, and handle pre-HPOS sites correctly.
-
-= 0.2.2 April 1, 2024 =
-
-Perform trigram inserts in batches.
-
-= 0.2.1 March 26, 2024 =
-
-Keep up with changes to orders.
-
-= 0.1.4 March 23, 2024
-
-Use trigrams, support both traditional and HPOS orders.
-
-= 0.1.3 March 21, 2024
-
-Build a text index table and use it.
-
-= 0.1.2 November 24, 2023
-
-Add support for speeding Subscriptions searches.
-
-= 0.1.1 November 19, 2023
-
-Birthday of Fast Woo Order Lookup. And, the birthday (in 1988) of the author's daughter Catharine.