Support ORDER BY disambiguation also for parenthesised ORDER BY column names

Author: JanJakes

tests/WP_SQLite_Driver_Translation_Tests.php

@@ -1368,12 +1368,24 @@ public function testSelectOrderByAmbiguousColumnResolution(): void {
 			'SELECT (((t1.name))) FROM t1 JOIN t2 ON t2.id = t1.id ORDER BY name'
 		);
 
+		// When the ORDER BY item is nested in a simple parentheses expression, the disambiguation still works.
+		$this->assertQuery(
+			'SELECT `t1`.`name` FROM `t1` JOIN `t2` ON `t2`.`id` = `t1`.`id` ORDER BY `t1`.`name`',
+			'SELECT t1.name FROM t1 JOIN t2 ON t2.id = t1.id ORDER BY (((name)))'
+		);
+
 		// When the SELECT item is nested in a complex expression, the column is not disambiguated (like in MySQL).
 		$this->assertQuery(
 			"SELECT (`t1`.`name` || 'test') AS `CONCAT(t1.name, 'test')` FROM `t1` JOIN `t2` ON `t2`.`id` = `t1`.`id` ORDER BY `name`",
 			"SELECT CONCAT(t1.name, 'test') FROM t1 JOIN t2 ON t2.id = t1.id ORDER BY name"
 		);
 
+		// When the ORDER BY item is nested in a complex expression, the column is not disambiguated (like in MySQL).
+		$this->assertQuery(
+			"SELECT `t1`.`name` FROM `t1` JOIN `t2` ON `t2`.`id` = `t1`.`id` ORDER BY ( `name` || 'test' )",
+			"SELECT t1.name FROM t1 JOIN t2 ON t2.id = t1.id ORDER BY (name || 'test')"
+		);
+
 		// When the SELECT list item uses an alias, the column is not disambiguated (like in MySQL).
 		$this->assertQuery(
 			'SELECT `t1`.`name` AS `t1_name` FROM `t1` JOIN `t2` ON `t2`.`id` = `t1`.`id` ORDER BY `name` DESC',

wp-includes/sqlite-ast/class-wp-sqlite-driver.php

@@ -3016,6 +3016,9 @@ private function translate_query_expression( WP_Parser_Node $node ): string {
 					continue;
 				}
 
+				// Support also parenthesized ORDER BY column references (e.g. "(id)").
+				$order_expr = $this->unnest_parenthesized_expression( $order_expr );
+
 				// Consider only simple and parenthesized order column references.
 				$order_expr_value   = $this->translate( $order_expr );
 				$order_column_value = $this->translate( $order_column_ref );