Some minor and some major improvements

Former-commit-id: 6ce7a47

Author: joncrlsn

column.go

@@ -6,9 +6,10 @@ import "strconv"
 import "strings"
 import "database/sql"
 import "github.com/joncrlsn/pgutil"
+import "github.com/joncrlsn/misc"
 
 // ==================================
-// ColumnRows definition
+// ColumnRows definition (a sortable slice of string maps)
 // ==================================
 type ColumnRows []map[string]string
 
@@ -17,15 +18,13 @@ func (slice ColumnRows) Len() int {
 }
 
 func (slice ColumnRows) Less(i, j int) bool {
-	//fmt.Printf("--Less %s:%s with %s:%s", slice[i]["table_name"], slice[i]["column_name"], slice[j]["table_name"], slice[j]["column_name"])
-	if slice[i]["table_name"] == slice[j]["table_name"] {
-		return slice[i]["column_name"] < slice[j]["column_name"]
+	if slice[i]["table_name"] != slice[j]["table_name"] {
+		return slice[i]["table_name"] < slice[j]["table_name"]
 	}
-	return slice[i]["table_name"] < slice[j]["table_name"]
+	return slice[i]["column_name"] < slice[j]["column_name"]
 }
 
 func (slice ColumnRows) Swap(i, j int) {
-	fmt.Printf("--Swapping %d/%s:%s with %d/%s:%s \n", i, slice[i]["table_name"], slice[i]["column_name"], j, slice[j]["table_name"], slice[j]["column_name"])
 	slice[i], slice[j] = slice[j], slice[i]
 }
 
@@ -63,17 +62,17 @@ func (c *ColumnSchema) NextRow() bool {
 func (c *ColumnSchema) Compare(obj interface{}) int {
 	c2, ok := obj.(*ColumnSchema)
 	if !ok {
-		fmt.Println("Error!!!, change needs a ColumnSchema instance", c2)
+		fmt.Println("Error!!!, Compare needs a ColumnSchema instance", c2)
 	}
 
-	val := _compareString(c.get("table_name"), c2.get("table_name"))
+	val := misc.CompareStrings(c.get("table_name"), c2.get("table_name"))
 	if val != 0 {
 		// Table name differed so return that value
 		return val
 	}
 
 	// Table name was the same so compare column name
-	val = _compareString(c.get("column_name"), c2.get("column_name"))
+	val = misc.CompareStrings(c.get("column_name"), c2.get("column_name"))
 	return val
 }
 
@@ -132,7 +131,7 @@ func (c *ColumnSchema) Change(obj interface{}) {
 		}
 	}
 
-	// TODO: Code and test a column change from integer to bigint
+	// Code and test a column change from integer to bigint
 	if c.get("data_type") != c2.get("data_type") {
 		fmt.Printf("-- WARNING: This type change may not work well: (%s to %s).\n", c2.get("data_type"), c.get("data_type"))
 		if strings.HasPrefix(c.get("data_type"), "character") {
@@ -155,7 +154,7 @@ func (c *ColumnSchema) Change(obj interface{}) {
 		fmt.Printf("ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s;\n", c.get("table_name"), c.get("column_name"), c.get("column_default"))
 	}
 
-	// TODO Detect not-null and nullable change
+	// Detect not-null and nullable change
 	if c.get("is_nullable") != c2.get("is_nullable") {
 		if c.get("is_nullable") == "YES" {
 			fmt.Printf("ALTER TABLE %s ALTER COLUMN %s DROP NOT NULL;\n", c.get("table_name"), c.get("column_name"))

foreignkey.go

@@ -4,6 +4,7 @@ import "sort"
 import "fmt"
 import "database/sql"
 import "github.com/joncrlsn/pgutil"
+import "github.com/joncrlsn/misc"
 
 // ==================================
 // ForeignKeyRows definition
@@ -15,15 +16,16 @@ func (slice ForeignKeyRows) Len() int {
 }
 
 func (slice ForeignKeyRows) Less(i, j int) bool {
-	//fmt.Printf("--Less %s:%s with %s:%s", slice[i]["table_name"], slice[i]["column_name"], slice[j]["table_name"], slice[j]["column_name"])
-	if slice[i]["table_name"] == slice[j]["table_name"] {
+	if slice[i]["table_name"] != slice[j]["table_name"] {
+		return slice[i]["table_name"] < slice[j]["table_name"]
+	}
+	if slice[i]["constraint_def"] != slice[j]["constraint_def"] {
 		return slice[i]["constraint_def"] < slice[j]["constraint_def"]
 	}
 	return slice[i]["table_name"] < slice[j]["table_name"]
 }
 
 func (slice ForeignKeyRows) Swap(i, j int) {
-	//fmt.Printf("--Swapping %d/%s:%s with %d/%s:%s \n", i, slice[i]["table_name"], slice[i]["index_name"], j, slice[j]["table_name"], slice[j]["index_name"])
 	slice[i], slice[j] = slice[j], slice[i]
 }
 
@@ -69,17 +71,17 @@ func (c *ForeignKeySchema) NextRow() bool {
 func (c *ForeignKeySchema) Compare(obj interface{}) int {
 	c2, ok := obj.(*ForeignKeySchema)
 	if !ok {
-		fmt.Println("Error!!!, Change(...) needs a ForeignKeySchema instance", c2)
+		fmt.Println("Error!!!, Compare(obj) needs a ForeignKeySchema instance", c2)
 		return +999
 	}
 
 	//fmt.Printf("Comparing %s with %s", c.get("table_name"), c2.get("table_name"))
-	val := _compareString(c.get("table_name"), c2.get("table_name"))
+	val := misc.CompareStrings(c.get("table_name"), c2.get("table_name"))
 	if val != 0 {
 		return val
 	}
 
-	val = _compareString(c.get("constraint_def"), c2.get("constraint_def"))
+	val = misc.CompareStrings(c.get("constraint_def"), c2.get("constraint_def"))
 	return val
 }
 
@@ -97,7 +99,7 @@ func (c ForeignKeySchema) Drop() {
 func (c *ForeignKeySchema) Change(obj interface{}) {
 	c2, ok := obj.(*ForeignKeySchema)
 	if !ok {
-		fmt.Println("Error!!!, change needs a ForeignKeySchema instance", c2)
+		fmt.Println("Error!!!, Change(obj) needs a ForeignKeySchema instance", c2)
 	}
 	// There is no "changing" a foreign key.  It either gets created or dropped (or left as-is).
 }

grant.go

@@ -25,44 +25,6 @@ var permMap map[string]string = map[string]string{
 	"T": "TEMPORARY",
 }
 
-// ==================================
-// Functions
-// ==================================
-
-//
-// RoleAcls (a sortable slice of RoleAcl instances)
-//
-type RoleAcls []RoleAcl
-
-func (slice RoleAcls) Len() int {
-	return len(slice)
-}
-
-func (slice RoleAcls) Less(i, j int) bool {
-	return slice[i].role < slice[j].role
-}
-
-func (slice RoleAcls) Swap(i, j int) {
-	slice[i], slice[j] = slice[j], slice[i]
-}
-
-func (slice RoleAcls) get(role string) RoleAcl {
-	for _, roleAcl := range slice {
-		if roleAcl.role == role {
-			return roleAcl
-		}
-	}
-	return RoleAcl{role: "", grants: []string{}}
-}
-
-//
-// RoleAcl
-//
-type RoleAcl struct {
-	role   string
-	grants []string
-}
-
 /*
 parseGrants converts an ACL (access control list) line into a role and a slice of permission strings
 
@@ -106,7 +68,8 @@ func parseGrants(acl string) (string, []string) {
 	return role, permWords
 }
 
-// parseAcl parses an ACL (access control list) string (e.g. 'c42=aur/postgres')  into a role and some permissions
+// parseAcl parses an ACL (access control list) string (e.g. 'c42=aur/postgres') into a role and
+// a string made up of one-character permissions
 func parseAcl(acl string) (role string, perms string) {
 	role, perms = "", ""
 	matches := aclRegex.FindStringSubmatch(acl)

owner.go

@@ -4,6 +4,7 @@ import "fmt"
 import "database/sql"
 import "sort"
 import "github.com/joncrlsn/pgutil"
+import "github.com/joncrlsn/misc"
 
 // ==================================
 // OwnerRows definition (an array of string maps)
@@ -68,7 +69,7 @@ func (c *OwnerSchema) Compare(obj interface{}) int {
 		return +999
 	}
 
-	val := _compareString(c.get("relationship_name"), c2.get("relationship_name"))
+	val := misc.CompareStrings(c.get("relationship_name"), c2.get("relationship_name"))
 	return val
 }