Fix multiple columns with same name error for JOIN USING (#573)

sqldelight · Nov 5, 2023 · 9f41ad0 · 9f41ad0
1 parent 114fb05
commit 9f41ad0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/core/src/main/kotlin/com/alecstrong/sql/psi/core/psi/mixins/JoinClauseMixin.kt b/core/src/main/kotlin/com/alecstrong/sql/psi/core/psi/mixins/JoinClauseMixin.kt
@@ -35,7 +35,8 @@ internal abstract class JoinClauseMixin(
                       column is PsiNamedElement && column.name!! in subquery.queryExposed()
                         .flatMap { it.columns }
                         .mapNotNull { (it.element as? PsiNamedElement)?.name }
-                    },
+                    }
+                    .distinctBy { (it.element as? PsiNamedElement)?.name ?: it },
                 ),
               )
             }

diff --git a/core/src/testFixtures/resources/fixtures/adjacent-columns/Test.s b/core/src/testFixtures/resources/fixtures/adjacent-columns/Test.s
@@ -15,4 +15,9 @@ WHERE id IN (
     SELECT foo.id FROM foo
     LEFT JOIN bar ON foo.id = bar.id
     LEFT JOIN baz ON foo.id = baz.id
-);
+);
+
+SELECT *
+FROM foo
+JOIN bar USING (id)
+JOIN baz USING (id);