Prefix schema ID column with collaboration per other WP tables.

Co-Authored-By: westonruter <[email protected]>

Author: peterwilsoncc

src/wp-admin/includes/schema.php

@@ -188,16 +188,16 @@ function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
 	KEY type_status_author (post_type,post_status,post_author)
 ) $charset_collate;
 CREATE TABLE $wpdb->collaboration (
-	id bigint(20) unsigned NOT NULL auto_increment,
+	collaboration_id bigint(20) unsigned NOT NULL auto_increment,
 	room varchar($max_index_length) NOT NULL default '',
 	type varchar(32) NOT NULL default '',
 	client_id varchar(32) NOT NULL default '',
 	user_id bigint(20) unsigned NOT NULL default '0',
 	data longtext NOT NULL,
 	date_gmt datetime NOT NULL default '0000-00-00 00:00:00',
-	PRIMARY KEY  (id),
+	PRIMARY KEY  (collaboration_id),
 	KEY type_client_id (type,client_id),
-	KEY room (room,id),
+	KEY room (room,collaboration_id),
 	KEY room_type_date (room,type,date_gmt),
 	KEY date_gmt (date_gmt)
 ) $charset_collate;\n";

src/wp-includes/collaboration/class-wp-collaboration-table-storage.php

@@ -192,7 +192,7 @@ public function get_updates_after_cursor( string $room, int $cursor ): array {
 		/* Snapshot the current max ID and total row count in a single query. */
 		$snapshot = $wpdb->get_row(
 			$wpdb->prepare(
-				"SELECT COALESCE( MAX( id ), 0 ) AS max_id, COUNT(*) AS total FROM {$wpdb->collaboration} WHERE room = %s AND type != 'awareness'",
+				"SELECT COALESCE( MAX( collaboration_id ), 0 ) AS max_id, COUNT(*) AS total FROM {$wpdb->collaboration} WHERE room = %s AND type != 'awareness'",
 				$room
 			)
 		);
@@ -223,7 +223,7 @@ public function get_updates_after_cursor( string $room, int $cursor ): array {
 		/* Fetch updates after the cursor up to the snapshot boundary. */
 		$rows = $wpdb->get_results(
 			$wpdb->prepare(
-				"SELECT data FROM {$wpdb->collaboration} WHERE room = %s AND type != 'awareness' AND id > %d AND id <= %d ORDER BY id ASC",
+				"SELECT data FROM {$wpdb->collaboration} WHERE room = %s AND type != 'awareness' AND collaboration_id > %d AND collaboration_id <= %d ORDER BY collaboration_id ASC",
 				$room,
 				$cursor,
 				$max_id
@@ -263,7 +263,7 @@ public function remove_updates_through_cursor( string $room, int $cursor ): bool
 		// "delete all, re-add some" pattern.
 		$result = $wpdb->query(
 			$wpdb->prepare(
-				"DELETE FROM {$wpdb->collaboration} WHERE room = %s AND type != 'awareness' AND id <= %d",
+				"DELETE FROM {$wpdb->collaboration} WHERE room = %s AND type != 'awareness' AND collaboration_id <= %d",
 				$room,
 				$cursor
 			)
@@ -316,7 +316,7 @@ public function set_awareness_state( string $room, string $client_id, array $sta
 		/* Check if a row already exists. */
 		$exists = $wpdb->get_row(
 			$wpdb->prepare(
-				"SELECT id, date_gmt FROM {$wpdb->collaboration} WHERE room = %s AND type = 'awareness' AND client_id = %s LIMIT 1",
+				"SELECT collaboration_id, date_gmt, data FROM {$wpdb->collaboration} WHERE room = %s AND type = 'awareness' AND client_id = %s  ORDER BY collaboration_id DESC LIMIT 1",
 				$room,
 				$client_id
 			)
@@ -335,7 +335,7 @@ public function set_awareness_state( string $room, string $client_id, array $sta
 					'data'     => $data,
 					'date_gmt' => $now,
 				),
-				array( 'id' => $exists->id )
+				array( 'collaboration_id' => $exists->collaboration_id )
 			);
 		} else {
 			$result = $wpdb->insert(

src/wp-includes/version.php

@@ -23,7 +23,7 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 61842;
+$wp_db_version = 61844;
 
 /**
  * Holds the TinyMCE version.

tests/phpunit/tests/rest-api/rest-collaboration-server.php

@@ -2986,7 +2986,7 @@ public function test_collaboration_cursor_ids_are_unique_and_ordered(): void {
 
 		$ids = $wpdb->get_col(
 			$wpdb->prepare(
-				"SELECT id FROM {$wpdb->collaboration} WHERE room = %s AND type != 'awareness' ORDER BY id ASC",
+				"SELECT collaboration_id FROM {$wpdb->collaboration} WHERE room = %s AND type != 'awareness' ORDER BY collaboration_id ASC",
 				$room
 			)
 		);