Update From false positive for multiple columns found with name

- Sqlite 3.33
cashapp · Nov 12, 2023 · 6afc5a0 · 6afc5a0
1 parent bdb0bd9
commit 6afc5a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.../kotlin/app/cash/sqldelight/dialects/sqlite_3_33/grammar/mixins/UpdateStmtLimitedMixin.kt b/.../kotlin/app/cash/sqldelight/dialects/sqlite_3_33/grammar/mixins/UpdateStmtLimitedMixin.kt
@@ -15,7 +15,8 @@ internal abstract class UpdateStmtLimitedMixin(
   FromQuery {
   override fun queryAvailable(child: PsiElement): Collection<QueryElement.QueryResult> {
     if (child != joinClause && joinClause != null) {
-      return super.queryAvailable(child) + joinClause!!.queryExposed()
+      return super.queryAvailable(child) +
+        joinClause!!.queryExposed().map { it.copy(adjacent = true) }
     }
 
     return super.queryAvailable(child)

diff --git a/dialects/sqlite-3-33/src/test/fixtures_sqlite_3_33/update-set-from/1.s b/dialects/sqlite-3-33/src/test/fixtures_sqlite_3_33/update-set-from/1.s
@@ -6,6 +6,11 @@ CREATE TABLE test2(
   id2 TEXT
 );
 
+CREATE TABLE test3(
+    id INTEGER NOT NULL,
+    data TEXT NOT NULL
+);
+
 UPDATE test
 SET id = id2
 FROM (
@@ -40,4 +45,7 @@ FROM (
   ON otherTest.id = test2.id2
 );
 
-
+UPDATE test3
+SET data = subquery.data
+FROM (SELECT id, data FROM test3) subquery
+WHERE subquery.id = test3.id;