← All changes | database/Migrations/ConversationsMigrator.php +15 -14 1.10.3 → 2.4.5 View file →

		@@ -12,9 +12,9 @@
12	12
13	13	$charsetCollate = $wpdb->get_charset_collate();
14	14	$table = $wpdb->prefix . static::$tableName;
15	15
16		- if ($wpdb->get_var("SHOW TABLES LIKE '$table'") != $table) {
	16	+ if ($wpdb->get_var($wpdb->prepare("SHOW TABLES LIKE %s", $table)) != $table) {
17	17	$sql = "CREATE TABLE $table (
18	18	`id` BIGINT(20) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
19	19	`serial` INT(11) UNSIGNED DEFAULT 1,
20	20	`ticket_id` BIGINT(20) UNSIGNED NOT NULL,
		@@ -28,9 +28,10 @@
28	28	`created_at` TIMESTAMP NULL,
29	29	`updated_at` TIMESTAMP NULL,
30	30	INDEX `idx_ticket_id` (`ticket_id`),
31	31	INDEX `idx_person_id` (`person_id`),
32		- INDEX `idx_created_at` (`created_at`)
	32	+ INDEX `idx_created_at` (`created_at`),
	33	+ INDEX `idx_person_id_created_at` (`person_id`, `created_at`)
33	34	) $charsetCollate;";
34	35	$created = dbDelta($sql);
35	36	return $created;
36	37	} else {
		@@ -39,9 +40,9 @@
39	40
40	41	return false;
41	42	}
42	43
43		- public static function alterTable($table)
	44	+ public static function alterTable($table)
44	45	{
45	46	static::addMissingIndexes($table);
46	47	}
47	48
		@@ -48,13 +49,12 @@
48	49	public static function addMissingIndexes($table)
49	50	{
50	51	global $wpdb;
51	52
52		- // Escape table name
	53	+ // Our own table name, not user input. esc_sql() because %i needs WP 6.2+.
53	54	$table = esc_sql($table);
54	55
55		- // Get existing indexes
56		- $existing_indexes = $wpdb->get_results("SHOW INDEX FROM `$table`");
	56	+ $existing_indexes = $wpdb->get_results("SHOW INDEX FROM `{$table}`"); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
57	57	$existing_index_names = [];
58	58
59	59	foreach ($existing_indexes as $index) {
60	60	$existing_index_names[] = $index->Key_name;
		@@ -59,20 +59,21 @@
59	59	foreach ($existing_indexes as $index) {
60	60	$existing_index_names[] = $index->Key_name;
61	61	}
62	62
63		- // Desired indexes
	63	+ // idx_person_id_created_at serves Advanced Reports' agent + date range queries.
	64	+ // Without it MySQL scans the agent's whole history via idx_person_id.
64	65	$indexes = [
65		- 'idx_ticket_id' => 'ticket_id',
66		- 'idx_person_id' => 'person_id',
67		- 'idx_created_at' => 'created_at',
	66	+ 'idx_ticket_id' => '`ticket_id`',
	67	+ 'idx_person_id' => '`person_id`',
	68	+ 'idx_created_at' => '`created_at`',
	69	+ 'idx_person_id_created_at' => '`person_id`, `created_at`',
68	70	];
69	71
70		- // Add missing indexes
71		- foreach ($indexes as $index_name => $column_name) {
	72	+ foreach ($indexes as $index_name => $columns) {
72	73	if (!in_array($index_name, $existing_index_names)) {
73		- $sql = "ALTER TABLE `$table` ADD INDEX `$index_name` (`$column_name`)";
74		- $wpdb->query($sql);
	74	+ // phpcs:ignore PluginCheck.Security.DirectDB.UnescapedDBParameter,WordPress.DB.PreparedSQL.NotPrepared -- all identifiers are either esc_sql()'d or hardcoded literals.
	75	+ $wpdb->query("ALTER TABLE `{$table}` ADD INDEX `{$index_name}` ({$columns})");
75	76	}
76	77	}
77	78	}
78	79	}