Remove GlobalDiffFunctions, refactor it into standalone functions, an…

…d some general cleanup of that code
dbsteward · Apr 25, 2024 · 3d00aa3 · 3d00aa3
1 parent 841a805
commit 3d00aa3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/lib/format/pgsql8/diff.go b/lib/format/pgsql8/diff.go
@@ -174,7 +174,7 @@ func (self *Diff) updateStructure(stage1 output.OutputFileSegmenter, stage3 outp
 		for _, newSchema := range dbsteward.NewDatabase.Schemas {
 			oldSchema := dbsteward.OldDatabase.TryGetSchemaNamed(newSchema.Name)
 			GlobalDiffTypes.DiffTypes(stage1, oldSchema, newSchema)
-			GlobalDiffFunctions.DiffFunctions(stage1, stage3, oldSchema, newSchema)
+			diffFunctions(stage1, stage3, oldSchema, newSchema)
 			GlobalDiffSequences.DiffSequences(stage1, oldSchema, newSchema)
 			// remove old constraints before table constraints, so the sql statements succeed
 			dropConstraints(stage1, oldSchema, newSchema, sql99.ConstraintTypeConstraint)
@@ -205,7 +205,7 @@ func (self *Diff) updateStructure(stage1 output.OutputFileSegmenter, stage3 outp
 
 			if !processedSchemas[newSchema.Name] {
 				GlobalDiffTypes.DiffTypes(stage1, oldSchema, newSchema)
-				GlobalDiffFunctions.DiffFunctions(stage1, stage3, oldSchema, newSchema)
+				diffFunctions(stage1, stage3, oldSchema, newSchema)
 				processedSchemas[newSchema.Name] = true
 			}
 		}

diff --git a/lib/format/pgsql8/diff_functions.go b/lib/format/pgsql8/diff_functions.go
@@ -6,14 +6,7 @@ import (
 	"github.com/dbsteward/dbsteward/lib/output"
 )
 
-type DiffFunctions struct {
-}
-
-func NewDiffFunctions() *DiffFunctions {
-	return &DiffFunctions{}
-}
-
-func (self *DiffFunctions) DiffFunctions(stage1 output.OutputFileSegmenter, stage3 output.OutputFileSegmenter, oldSchema *ir.Schema, newSchema *ir.Schema) {
+func diffFunctions(stage1 output.OutputFileSegmenter, stage3 output.OutputFileSegmenter, oldSchema *ir.Schema, newSchema *ir.Schema) {
 	// drop functions that no longer exist in stage 3
 	if oldSchema != nil {
 		for _, oldFunction := range oldSchema.Functions {

diff --git a/lib/format/pgsql8/pgsql8.go b/lib/format/pgsql8/pgsql8.go
@@ -4,7 +4,6 @@ import "github.com/dbsteward/dbsteward/lib/format"
 
 var GlobalOperations = NewOperations()
 var GlobalSchema = NewSchema()
-var GlobalDiffFunctions = NewDiffFunctions()
 var GlobalDiffIndexes = NewDiffIndexes()
 var GlobalDiffLanguages = NewDiffLanguages()
 var GlobalDiffSequences = NewDiffSequences()