Factor away GlobalSlonik

dbsteward · May 1, 2024 · 0f7e5a0 · 0f7e5a0
1 parent 14a4b5e
commit 0f7e5a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/lib/dbsteward.go b/lib/dbsteward.go
@@ -639,7 +639,7 @@ func (self *DBSteward) doSqlDiff(oldSql, newSql []string, outputFile string) {
 }
 func (self *DBSteward) doSlonikConvert(file string, outputFile string) {
 	// TODO(go,nth) is there a nicer way to handle this output idiom?
-	output := GlobalSlonik.Convert(file)
+	output := NewSlonik().Convert(file)
 	if len(outputFile) > 0 {
 		err := util.WriteFile(output, outputFile)
 		self.FatalIfError(err, "Failed to save slonikconvert output to %s", outputFile)

diff --git a/lib/slonik.go b/lib/slonik.go
@@ -1,15 +1,12 @@
 package lib
 
-// TODO(go,3) no globals
-var GlobalSlonik *Slonik = NewSlonik()
-
 type Slonik struct{}
 
 func NewSlonik() *Slonik {
 	return &Slonik{}
 }
 
-func (self *Slonik) Convert(file string) string {
+func (slonik *Slonik) Convert(file string) string {
 	// TODO(go,core)
 	return ""
 }