fix false positive ambiguous column in ON DUPLICATE KEY with VALUE/S

schlndh · Aug 25, 2023 · 27c1dbb · 27c1dbb
1 parent ac8466d
commit 27c1dbb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/Analyser/AnalyserState.php b/src/Analyser/AnalyserState.php
@@ -1366,6 +1366,12 @@ private function resolveExprType(Expr\Expr $expr, ?AnalyserConditionTypeEnum $co
 					$this->hasAggregateFunctionCalls = true;
 				}
 
+				$bakFieldBehavior = $this->fieldBehavior;
+
+				if (in_array($normalizedFunctionName, ['VALUE', 'VALUES'], true)) {
+					$this->fieldBehavior = ColumnResolverFieldBehaviorEnum::ASSIGNMENT;
+				}
+
 				foreach ($arguments as $arg) {
 					$innerCondition = $innerConditions[$position] ?? null;
 					$position++;
@@ -1382,6 +1388,8 @@ private function resolveExprType(Expr\Expr $expr, ?AnalyserConditionTypeEnum $co
 					}
 				}
 
+				$this->fieldBehavior = $bakFieldBehavior;
+
 				if ($isAggregateFunction) {
 					$this->columnResolver->exitAggregateFunction();
 				}

diff --git a/tests/Analyser/AnalyserTest.php b/tests/Analyser/AnalyserTest.php
@@ -1154,6 +1154,22 @@ private function provideValidInsertTestData(): iterable
 			',
 		];
 
+		yield 'INSERT ... ON DUPLICATE KEY UPDATE - ambiguity resolved via VALUE' => [
+			'query' => '
+				INSERT INTO analyse_test_insert
+				SELECT * FROM analyse_test_insert
+				ON DUPLICATE KEY UPDATE id = VALUE(id);
+			',
+		];
+
+		yield 'INSERT ... ON DUPLICATE KEY UPDATE - ambiguity resolved via VALUES' => [
+			'query' => '
+				INSERT INTO analyse_test_insert
+				SELECT * FROM analyse_test_insert
+				ON DUPLICATE KEY UPDATE id = VALUES(id);
+			',
+		];
+
 		// TODO: DEFAULT expression
 	}