Skip to content

Commit 8185dc5

Browse files
committed
fix: deprecate defaultTable in resolve
1 parent 812960d commit 8185dc5

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

internal/compiler/resolve.go

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -239,16 +239,11 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
239239
c := comp.catalog
240240

241241
aliasMap := map[string]*ast.TableName{}
242-
// TODO: Deprecate defaultTable
243-
var defaultTable *ast.TableName
244242
var tables []*ast.TableName
245243

246244
typeMap := map[string]map[string]map[string]*catalog.Column{}
247245
indexTable := func(table catalog.Table) error {
248246
tables = append(tables, table.Rel)
249-
if defaultTable == nil {
250-
defaultTable = table.Rel
251-
}
252247
schema := table.Rel.Schema
253248
if schema == "" {
254249
schema = c.DefaultSchema
@@ -346,18 +341,16 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
346341

347342
addColumnParam := func(ref paramRef, key string, location int) error {
348343
var schema, rel string
349-
// TODO: Deprecate defaultTable
350-
if defaultTable != nil {
351-
schema = defaultTable.Schema
352-
rel = defaultTable.Name
353-
}
354344
if ref.rv != nil {
355345
fqn, err := ParseTableName(ref.rv)
356346
if err != nil {
357347
return err
358348
}
359349
schema = fqn.Schema
360350
rel = fqn.Name
351+
} else if len(tables) == 1 {
352+
schema = tables[0].Schema
353+
rel = tables[0].Name
361354
}
362355
if schema == "" {
363356
schema = c.DefaultSchema

0 commit comments

Comments
 (0)