Minor cleanup and output improvements

joncrlsn · joncrlsn · commit 4524cd46f875 · 2014-11-27T23:33:11.000-06:00
Former-commit-id: 436f011
diff --git a/grant-attribute.go b/grant-attribute.go
@@ -112,16 +112,14 @@ func (c *GrantAttributeSchema) Compare(obj interface{}) int {
 
 // Add prints SQL to add the column
 func (c *GrantAttributeSchema) Add() {
-	fmt.Println("--Add")
 	role, grants := parseGrants(c.get("attribute_acl"))
-	fmt.Printf("GRANT %s (%s) ON %s TO %s;\n", strings.Join(grants, ", "), c.get("attribute_name"), c.get("relationship_name"), role)
+	fmt.Printf("GRANT %s (%s) ON %s TO %s; -- Add\n", strings.Join(grants, ", "), c.get("attribute_name"), c.get("relationship_name"), role)
 }
 
 // Drop prints SQL to drop the column
 func (c *GrantAttributeSchema) Drop() {
-	fmt.Println("--Drop")
 	role, grants := parseGrants(c.get("attribute_acl"))
-	fmt.Printf("REVOKE %s (%s) ON %s FROM %s;\n", strings.Join(grants, ", "), c.get("attribute_name"), c.get("relationship_name"), role)
+	fmt.Printf("REVOKE %s (%s) ON %s FROM %s; -- Drop\n", strings.Join(grants, ", "), c.get("attribute_name"), c.get("relationship_name"), role)
 }
 
 // Change handles the case where the relationship and column match, but the details do not
@@ -130,7 +128,6 @@ func (c *GrantAttributeSchema) Change(obj interface{}) {
 	if !ok {
 		fmt.Println("-- Error!!!, Change needs a GrantAttributeSchema instance", c2)
 	}
-	fmt.Println("--Change")
 
 	role, grants1 := parseGrants(c.get("attribute_acl"))
 	_, grants2 := parseGrants(c2.get("attribute_acl"))
@@ -144,7 +141,7 @@ func (c *GrantAttributeSchema) Change(obj interface{}) {
 		}
 	}
 	if len(grantList) > 0 {
-		fmt.Printf("GRANT %s (%s) ON %s TO %s;\n", strings.Join(grantList, ", "), c.get("attribute_name"), c.get("relationship_name"), role)
+		fmt.Printf("GRANT %s (%s) ON %s TO %s; -- Change\n", strings.Join(grantList, ", "), c.get("attribute_name"), c.get("relationship_name"), role)
 	}
 
 	// Find grants in the second db that are not in the first
@@ -156,7 +153,7 @@ func (c *GrantAttributeSchema) Change(obj interface{}) {
 		}
 	}
 	if len(revokeList) > 0 {
-		fmt.Printf("REVOKE %s (%s) ON %s FROM %s;\n", strings.Join(grantList, ", "), c.get("attribute_name"), c.get("relationship_name"), role)
+		fmt.Printf("REVOKE %s (%s) ON %s FROM %s; -- Change\n", strings.Join(grantList, ", "), c.get("attribute_name"), c.get("relationship_name"), role)
 	}
 
 	//	fmt.Printf("--1 rel:%s, relAcl:%s, col:%s, colAcl:%s\n", c.get("attribute_name"), c.get("attribute_acl"), c.get("attribute_name"), c.get("attribute_acl"))
diff --git a/grant-relationship.go b/grant-relationship.go
@@ -105,16 +105,14 @@ func (c *GrantRelationshipSchema) Compare(obj interface{}) int {
 
 // Add prints SQL to add the column
 func (c *GrantRelationshipSchema) Add() {
-	fmt.Println("--Add")
 	role, grants := parseGrants(c.get("relationship_acl"))
-	fmt.Printf("GRANT %s ON %s TO %s;\n", strings.Join(grants, ", "), c.get("relationship_name"), role)
+	fmt.Printf("GRANT %s ON %s TO %s; -- Add\n", strings.Join(grants, ", "), c.get("relationship_name"), role)
 }
 
 // Drop prints SQL to drop the column
 func (c *GrantRelationshipSchema) Drop() {
-	fmt.Println("--Drop")
 	role, grants := parseGrants(c.get("relationship_acl"))
-	fmt.Printf("REVOKE %s ON %s FROM %s;\n", strings.Join(grants, ", "), c.get("relationship_name"), role)
+	fmt.Printf("REVOKE %s ON %s FROM %s; -- Drop\n", strings.Join(grants, ", "), c.get("relationship_name"), role)
 }
 
 // Change handles the case where the relationship and column match, but the details do not
@@ -123,7 +121,6 @@ func (c *GrantRelationshipSchema) Change(obj interface{}) {
 	if !ok {
 		fmt.Println("-- Error!!!, change needs a GrantRelationshipSchema instance", c2)
 	}
-	fmt.Println("--Change")
 
 	role, grants1 := parseGrants(c.get("relationship_acl"))
 	_, grants2 := parseGrants(c2.get("relationship_acl"))
@@ -137,7 +134,7 @@ func (c *GrantRelationshipSchema) Change(obj interface{}) {
 		}
 	}
 	if len(grantList) > 0 {
-		fmt.Printf("GRANT %s ON %s TO %s;\n", strings.Join(grantList, ", "), c.get("relationship_name"), role)
+		fmt.Printf("GRANT %s ON %s TO %s; -- Change\n", strings.Join(grantList, ", "), c.get("relationship_name"), role)
 	}
 
 	// Find grants in the second db that are not in the first
@@ -149,7 +146,7 @@ func (c *GrantRelationshipSchema) Change(obj interface{}) {
 		}
 	}
 	if len(revokeList) > 0 {
-		fmt.Printf("REVOKE %s ON %s FROM %s;\n", strings.Join(revokeList, ", "), c.get("relationship_name"), role)
+		fmt.Printf("REVOKE %s ON %s FROM %s; -- Change\n", strings.Join(revokeList, ", "), c.get("relationship_name"), role)
 	}
 
 	//	fmt.Printf("--1 rel:%s, relAcl:%s, col:%s, colAcl:%s\n", c.get("relationship_name"), c.get("relationship_acl"), c.get("column_name"), c.get("column_acl"))
diff --git a/grant_test.go b/grant_test.go
@@ -27,28 +27,28 @@ func Test_parseAcls(t *testing.T) {
 
 // Note that these must be sorted for this to work
 var relationship1 = []map[string]string{
-	{"schema": "public", "type": "TABLE", "relationship_name": "table1", "relationship_acl": "c42=rwa/postgres" },
-	{"schema": "public", "type": "TABLE", "relationship_name": "table1", "relationship_acl": "o42=xdwra/postgres" },
-	{"schema": "public", "type": "TABLE", "relationship_name": "table2", "relationship_acl": "c42=rwa/postgres" },
+	{"schema": "public", "type": "TABLE", "relationship_name": "table1", "relationship_acl": "c42=rwa/postgres"},
+	{"schema": "public", "type": "TABLE", "relationship_name": "table1", "relationship_acl": "o42=xdwra/postgres"},
+	{"schema": "public", "type": "TABLE", "relationship_name": "table2", "relationship_acl": "c42=rwa/postgres"},
 }
 
 // Note that these must be sorted for this to work
 var relationship2 = []map[string]string{
-	{"schema": "public", "relationship_name": "table1", "type": "TABLE", "relationship_acl": "c42=r/postgres" },
+	{"schema": "public", "relationship_name": "table1", "type": "TABLE", "relationship_acl": "c42=r/postgres"},
 	{"schema": "public", "relationship_name": "table2", "type": "TABLE", "relationship_acl": "c42=rwad/postgres"},
 }
 
 // Note that these must be sorted for this to work
 var attribute1 = []map[string]string{
-	{"schema": "public", "type": "TABLE", "relationship_name": "table1", "attribute_name": "column1", "attribute_acl": "c42ro=r/postgres" },
-	{"schema": "public", "type": "TABLE", "relationship_name": "table1", "attribute_name": "column1", "attribute_acl": "o42ro=rwa/postgres" },
-	{"schema": "public", "type": "TABLE", "relationship_name": "table2", "attribute_name": "column2", "attribute_acl": "c42ro=r/postgres" },
+	{"schema": "public", "type": "TABLE", "relationship_name": "table1", "attribute_name": "column1", "attribute_acl": "c42ro=r/postgres"},
+	{"schema": "public", "type": "TABLE", "relationship_name": "table1", "attribute_name": "column1", "attribute_acl": "o42ro=rwa/postgres"},
+	{"schema": "public", "type": "TABLE", "relationship_name": "table2", "attribute_name": "column2", "attribute_acl": "c42ro=r/postgres"},
 }
 
 // Note that these must be sorted for this to work
 var attribute2 = []map[string]string{
-	{"schema": "public", "type": "TABLE", "relationship_name": "table1", "attribute_name": "column1", "attribute_acl": "c42ro=r/postgres" },
-	{"schema": "public", "type": "TABLE", "relationship_name": "table1", "attribute_name": "column1", "attribute_acl": "o42ro=r/postgres" },
+	{"schema": "public", "type": "TABLE", "relationship_name": "table1", "attribute_name": "column1", "attribute_acl": "c42ro=r/postgres"},
+	{"schema": "public", "type": "TABLE", "relationship_name": "table1", "attribute_name": "column1", "attribute_acl": "o42ro=r/postgres"},
 }
 
 func Test_diffGrants(t *testing.T) {
diff --git a/pgdiff.go b/pgdiff.go
@@ -42,7 +42,7 @@ func main() {
 	// Remaining args:
 	args = flag.Args()
 	if len(args) == 0 {
-		fmt.Println("The required first argument is SchemaType: ROLE, SEQUENCE, TABLE, COLUMN, INDEX, FOREIGN_KEY, OWNER, GRANT_RELATIONSHIPS, GRANT_ATTRIBUTES")
+		fmt.Println("The required first argument is SchemaType: ROLE, SEQUENCE, TABLE, COLUMN, INDEX, FOREIGN_KEY, OWNER, GRANT_RELATIONSHIP, GRANT_ATTRIBUTE")
 		os.Exit(1)
 	}
 	schemaType = strings.ToUpper(args[0])
@@ -80,9 +80,9 @@ func main() {
 		compareForeignKeys(conn1, conn2)
 	} else if schemaType == "OWNER" {
 		compareOwners(conn1, conn2)
-	} else if schemaType == "GRANT_RELATIONSHIPS" {
+	} else if schemaType == "GRANT_RELATIONSHIP" {
 		compareGrantRelationships(conn1, conn2)
-	} else if schemaType == "GRANT_ATTRIBUTES" {
+	} else if schemaType == "GRANT_ATTRIBUTE" {
 		compareGrantAttributes(conn1, conn2)
 	} else {
 		fmt.Println("Not yet handled:", schemaType)
diff --git a/pgdiff.sh b/pgdiff.sh
@@ -35,6 +35,7 @@ function rundiff() {
 #rundiff COLUMN
 #rundiff INDEX
 #rundiff FOREIGN_KEY
-#rundiff GRANT
-rundiff OWNER
+#rundiff OWNER
+rundiff GRANT_RELATIONSHIP
+rundiff GRANT_ATTRIBUTE
 

Original file line number	Diff line number	Diff line change
`@@ -112,16 +112,14 @@ func (c *GrantAttributeSchema) Compare(obj interface{}) int {`
`112`	`112`
`113`	`113`	`// Add prints SQL to add the column`
`114`	`114`	`func (c *GrantAttributeSchema) Add() {`
`115`		`- fmt.Println("--Add")`
`116`	`115`	`role, grants := parseGrants(c.get("attribute_acl"))`
`117`		`- fmt.Printf("GRANT %s (%s) ON %s TO %s;\n", strings.Join(grants, ", "), c.get("attribute_name"), c.get("relationship_name"), role)`
	`116`	`+ fmt.Printf("GRANT %s (%s) ON %s TO %s; -- Add\n", strings.Join(grants, ", "), c.get("attribute_name"), c.get("relationship_name"), role)`
`118`	`117`	`}`
`119`	`118`
`120`	`119`	`// Drop prints SQL to drop the column`
`121`	`120`	`func (c *GrantAttributeSchema) Drop() {`
`122`		`- fmt.Println("--Drop")`
`123`	`121`	`role, grants := parseGrants(c.get("attribute_acl"))`
`124`		`- fmt.Printf("REVOKE %s (%s) ON %s FROM %s;\n", strings.Join(grants, ", "), c.get("attribute_name"), c.get("relationship_name"), role)`
	`122`	`+ fmt.Printf("REVOKE %s (%s) ON %s FROM %s; -- Drop\n", strings.Join(grants, ", "), c.get("attribute_name"), c.get("relationship_name"), role)`
`125`	`123`	`}`
`126`	`124`
`127`	`125`	`// Change handles the case where the relationship and column match, but the details do not`
`@@ -130,7 +128,6 @@ func (c *GrantAttributeSchema) Change(obj interface{}) {`
`130`	`128`	`if !ok {`
`131`	`129`	`fmt.Println("-- Error!!!, Change needs a GrantAttributeSchema instance", c2)`
`132`	`130`	`}`
`133`		`- fmt.Println("--Change")`
`134`	`131`
`135`	`132`	`role, grants1 := parseGrants(c.get("attribute_acl"))`
`136`	`133`	`_, grants2 := parseGrants(c2.get("attribute_acl"))`
`@@ -144,7 +141,7 @@ func (c *GrantAttributeSchema) Change(obj interface{}) {`
`144`	`141`	`}`
`145`	`142`	`}`
`146`	`143`	`if len(grantList) > 0 {`
`147`		`- fmt.Printf("GRANT %s (%s) ON %s TO %s;\n", strings.Join(grantList, ", "), c.get("attribute_name"), c.get("relationship_name"), role)`
	`144`	`+ fmt.Printf("GRANT %s (%s) ON %s TO %s; -- Change\n", strings.Join(grantList, ", "), c.get("attribute_name"), c.get("relationship_name"), role)`
`148`	`145`	`}`
`149`	`146`
`150`	`147`	`// Find grants in the second db that are not in the first`
`@@ -156,7 +153,7 @@ func (c *GrantAttributeSchema) Change(obj interface{}) {`
`156`	`153`	`}`
`157`	`154`	`}`
`158`	`155`	`if len(revokeList) > 0 {`
`159`		`- fmt.Printf("REVOKE %s (%s) ON %s FROM %s;\n", strings.Join(grantList, ", "), c.get("attribute_name"), c.get("relationship_name"), role)`
	`156`	`+ fmt.Printf("REVOKE %s (%s) ON %s FROM %s; -- Change\n", strings.Join(grantList, ", "), c.get("attribute_name"), c.get("relationship_name"), role)`
`160`	`157`	`}`
`161`	`158`
`162`	`159`	`// fmt.Printf("--1 rel:%s, relAcl:%s, col:%s, colAcl:%s\n", c.get("attribute_name"), c.get("attribute_acl"), c.get("attribute_name"), c.get("attribute_acl"))`
Original file line number	Diff line number	Diff line change
`@@ -105,16 +105,14 @@ func (c *GrantRelationshipSchema) Compare(obj interface{}) int {`
`105`	`105`
`106`	`106`	`// Add prints SQL to add the column`
`107`	`107`	`func (c *GrantRelationshipSchema) Add() {`
`108`		`- fmt.Println("--Add")`
`109`	`108`	`role, grants := parseGrants(c.get("relationship_acl"))`
`110`		`- fmt.Printf("GRANT %s ON %s TO %s;\n", strings.Join(grants, ", "), c.get("relationship_name"), role)`
	`109`	`+ fmt.Printf("GRANT %s ON %s TO %s; -- Add\n", strings.Join(grants, ", "), c.get("relationship_name"), role)`
`111`	`110`	`}`
`112`	`111`
`113`	`112`	`// Drop prints SQL to drop the column`
`114`	`113`	`func (c *GrantRelationshipSchema) Drop() {`
`115`		`- fmt.Println("--Drop")`
`116`	`114`	`role, grants := parseGrants(c.get("relationship_acl"))`
`117`		`- fmt.Printf("REVOKE %s ON %s FROM %s;\n", strings.Join(grants, ", "), c.get("relationship_name"), role)`
	`115`	`+ fmt.Printf("REVOKE %s ON %s FROM %s; -- Drop\n", strings.Join(grants, ", "), c.get("relationship_name"), role)`
`118`	`116`	`}`
`119`	`117`
`120`	`118`	`// Change handles the case where the relationship and column match, but the details do not`
`@@ -123,7 +121,6 @@ func (c *GrantRelationshipSchema) Change(obj interface{}) {`
`123`	`121`	`if !ok {`
`124`	`122`	`fmt.Println("-- Error!!!, change needs a GrantRelationshipSchema instance", c2)`
`125`	`123`	`}`
`126`		`- fmt.Println("--Change")`
`127`	`124`
`128`	`125`	`role, grants1 := parseGrants(c.get("relationship_acl"))`
`129`	`126`	`_, grants2 := parseGrants(c2.get("relationship_acl"))`
`@@ -137,7 +134,7 @@ func (c *GrantRelationshipSchema) Change(obj interface{}) {`
`137`	`134`	`}`
`138`	`135`	`}`
`139`	`136`	`if len(grantList) > 0 {`
`140`		`- fmt.Printf("GRANT %s ON %s TO %s;\n", strings.Join(grantList, ", "), c.get("relationship_name"), role)`
	`137`	`+ fmt.Printf("GRANT %s ON %s TO %s; -- Change\n", strings.Join(grantList, ", "), c.get("relationship_name"), role)`
`141`	`138`	`}`
`142`	`139`
`143`	`140`	`// Find grants in the second db that are not in the first`
`@@ -149,7 +146,7 @@ func (c *GrantRelationshipSchema) Change(obj interface{}) {`
`149`	`146`	`}`
`150`	`147`	`}`
`151`	`148`	`if len(revokeList) > 0 {`
`152`		`- fmt.Printf("REVOKE %s ON %s FROM %s;\n", strings.Join(revokeList, ", "), c.get("relationship_name"), role)`
	`149`	`+ fmt.Printf("REVOKE %s ON %s FROM %s; -- Change\n", strings.Join(revokeList, ", "), c.get("relationship_name"), role)`
`153`	`150`	`}`
`154`	`151`
`155`	`152`	`// fmt.Printf("--1 rel:%s, relAcl:%s, col:%s, colAcl:%s\n", c.get("relationship_name"), c.get("relationship_acl"), c.get("column_name"), c.get("column_acl"))`