Fix star columns resolving to too many columns

simolus3 · Sep 26, 2023 · d0a3fee · d0a3fee
1 parent db6ee5d
commit d0a3fee
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/sqlparser/CHANGELOG.md b/sqlparser/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.31.3-dev
+
+- Fix star columns expanding to more columns than they should.
+
 ## 0.31.2
 
 - Add `CaseInsensitiveMap.of` to wrap existing maps.

diff --git a/sqlparser/lib/src/analysis/steps/column_resolver.dart b/sqlparser/lib/src/analysis/steps/column_resolver.dart
@@ -386,7 +386,8 @@ class ColumnResolver extends RecursiveVisitor<ColumnResolverContext, void> {
  } else {
  // we have a * column without a table, that resolves to every column
  // available
- visibleColumnsForStar = columnsForStar ?? availableColumns;
+ visibleColumnsForStar =
+ columnsForStar ?? scope.expansionOfStarColumn ?? const [];
 
  // Star columns can't be used without a table (e.g. `SELECT *` is
  // not allowed)

diff --git a/sqlparser/test/analysis/column_resolver_test.dart b/sqlparser/test/analysis/column_resolver_test.dart
@@ -339,4 +339,14 @@ SELECT * FROM cars
 ''');
  query.expectNoError();
  });
+
+ test('expands star columns', () {
+ final engine = SqlEngine()
+ ..registerTableFromSql('CREATE TABLE foo (bar INTEGER);');
+
+ final result = engine.analyze("SELECT 'client' literal, * FROM foo;");
+ final select = result.root as SelectStatement;
+
+ expect(select.resolvedColumns?.map((e) => e.name), ['literal', 'bar']);
+ });
 }