Fix: Handle RAND(seed) determinism and refine FOR UPDATE regex for trailing comments

Author: wp-fuse

integrations/plugin-compatibility/boot.php

@@ -30,9 +30,9 @@ function wp_sqlite_integration_plugin_compat( $query ) {
 
 	// 2. Global fallback for FOR UPDATE / SKIP LOCKED.
 	// This ensures the legacy driver natively ignores these locking constraints where SQLite faults.
-	// We use a strict end-of-query match to avoid destroying strings inside WHERE clauses.
+	// We use a non-destructive lookahead for whitespace, semicolon, or comments to avoid destroying strings.
 	if ( stripos( $query, 'FOR UPDATE' ) !== false ) {
-		$query = preg_replace( '/\s+FOR\s+UPDATE(?:\s+(?:SKIP\s+LOCKED|NOWAIT))?\s*(?:;+)?\s*$/i', '', $query );
+		$query = preg_replace( '/\s+FOR\s+UPDATE(?:\s+(?:SKIP\s+LOCKED|NOWAIT))?(?=\s*(?:;|\/\*|$))/i', '', $query );
 	}
 
 	// 3. Action Scheduler specific compatibility fixes.

tests/WP_SQLite_Driver_Tests.php

@@ -9068,24 +9068,23 @@ public function testColumnInfoForExpressions(): void {
 					'mysqli:type'      => 8,
 				),
 				array(
-					// TODO: Fix custom "RAND()" function to behave like in MySQL.
-					'native_type'      => 'LONGLONG',          // DOUBLE in MySQL.
-					'pdo_type'         => PDO::PARAM_INT,      // PARAM_STR in MySQL.
+					'native_type'      => 'DOUBLE',            // DOUBLE in MySQL.
+					'pdo_type'         => PDO::PARAM_STR,      // PARAM_STR in MySQL.
 					'flags'            => array( 'not_null' ),
 					'table'            => '',
 					'name'             => 'col_expr_19',
-					'len'              => 21,                  // 23 in MySQL.
-					'precision'        => 0,                   // 31 in MySQL.
+					'len'              => 23,                  // 23 in MySQL.
+					'precision'        => 31,                  // 31 in MySQL.
 					'sqlite:decl_type' => '',
-
-					// Additional MySQLi metadata.
-					'mysqli:orgname'   => 'col_expr_19',
-					'mysqli:orgtable'  => '',
-					'mysqli:db'        => 'wp',
-					'mysqli:charsetnr' => 63,
-					'mysqli:flags'     => 0, // 32769 in MySQL.
-					'mysqli:type'      => 8, // 5 in MySQL.
-				),
+ 
+ 					// Additional MySQLi metadata.
+ 					'mysqli:orgname'   => 'col_expr_19',
+ 					'mysqli:orgtable'  => '',
+ 					'mysqli:db'        => 'wp',
+ 					'mysqli:charsetnr' => 63,
+ 					'mysqli:flags'     => 0, // 32769 in MySQL.
+ 					'mysqli:type'      => 5, // 5 in MySQL.
+ 				),
 				array(
 					'native_type'      => 'LONGLONG',
 					'pdo_type'         => PDO::PARAM_INT,

wp-includes/sqlite-ast/class-wp-pdo-mysql-on-sqlite.php

@@ -4371,7 +4371,10 @@ private function translate_function_call( WP_Parser_Node $node ): string {
 
 		switch ( $name ) {
 			case 'RAND':
-				return '(ABS(RANDOM()) / 9223372036854775808.0)';
+				if ( empty( $args ) ) {
+					return '(ABS(RANDOM()) / 9223372036854775808.0)';
+				}
+				break;
 			case 'DATE_FORMAT':
 				list ( $date, $mysql_format ) = $args;