Fixes column adjacency for Update statement

Same fix for Sqlite
sqldelight · Mar 20, 2024 · 51f9fbd · 51f9fbd
1 parent be82f84
commit 51f9fbd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...n/kotlin/app/cash/sqldelight/dialects/postgresql/grammar/mixins/UpdateStmtLimitedMixin.kt b/...n/kotlin/app/cash/sqldelight/dialects/postgresql/grammar/mixins/UpdateStmtLimitedMixin.kt
@@ -18,9 +18,9 @@ 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/postgresql/src/testFixtures/resources/fixtures_postgresql/update-set-from/1.s b/dialects/postgresql/src/testFixtures/resources/fixtures_postgresql/update-set-from/1.s
@@ -1,9 +1,11 @@
 CREATE TABLE test(
-  id SERIAL PRIMARY KEY
+  id SERIAL PRIMARY KEY,
+  id2 INTEGER
 );
 
 CREATE TABLE test2(
-  id2 SERIAL PRIMARY KEY
+  id2 SERIAL PRIMARY KEY,
+  other TEXT
 );
 
 UPDATE test
@@ -40,4 +42,8 @@ FROM (
   ON otherTest.id = test2.id2
 );
 
+UPDATE test
+SET id2 = t2.id2
+FROM test2 t2
+WHERE other = 'x';