Factor away GlobalSqlParser

dbsteward · May 1, 2024 · 14a4b5e · 14a4b5e
1 parent 233387b
commit 14a4b5e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 23 deletions.
diff --git a/lib/dbsteward.go b/lib/dbsteward.go
@@ -144,7 +144,7 @@ func (self *DBSteward) ArgParse() {
 	self.OnlySchemaSql = args.OnlySchemaSql
 	self.OnlyDataSql = args.OnlyDataSql
 	for _, onlyTable := range args.OnlyTables {
-		table := GlobalSqlParser.ParseQualifiedTableName(onlyTable)
+		table := ParseQualifiedTableName(onlyTable)
 		self.LimitToTables[table.Schema] = append(self.LimitToTables[table.Schema], table.Table)
 	}
 

diff --git a/lib/format/pgsql8/function.go b/lib/format/pgsql8/function.go
@@ -30,7 +30,7 @@ func functionDefinitionReferencesTable(definition *ir.FunctionDefinition) *lib.Q
 	if table == "" {
 		return nil
 	}
-	parsed := lib.GlobalSqlParser.ParseQualifiedTableName(table)
+	parsed := lib.ParseQualifiedTableName(table)
 	return &parsed
 }
 

diff --git a/lib/sql_parser.go b/lib/sql_parser.go
@@ -2,8 +2,6 @@ package lib
 
 import (
 	"strings"
-
-	"github.com/dbsteward/dbsteward/lib/ir"
 )
 
 // TODO(go,pgsql) move this to pgsql8/sql
@@ -13,29 +11,11 @@ type QualifiedTable struct {
 	Table  string
 }
 
-var GlobalSqlParser *SqlParser = NewSqlParser()
-
-type SqlParser struct {
-}
-
-func NewSqlParser() *SqlParser {
-	return &SqlParser{}
-}
-
-func (parser *SqlParser) ParseQualifiedTableName(table string) QualifiedTable {
+func ParseQualifiedTableName(table string) QualifiedTable {
 	// TODO(go,core) need to properly parse possible quoted names
 	if strings.Contains(table, ".") {
 		parts := strings.SplitN(table, ".", 2)
 		return QualifiedTable{parts[0], parts[1]}
 	}
 	return QualifiedTable{"public", table}
 }
-
-func (parser *SqlParser) GetSchemaName(name string) string {
-	return parser.ParseQualifiedTableName(name).Schema
-}
-
-func (parser *SqlParser) GetObjectName(name string, def *ir.Definition) string {
-	// TODO(go,core)
-	return ""
-}