Fixing PG15 related bugs

Author: asif-sre

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/joncrlsn/misc v0.0.0-20160408024000-193a3fcec166
 	github.com/joncrlsn/pgutil v0.0.0-20171213024902-4c8aab9306b4
 	github.com/kr/pretty v0.2.1 // indirect
-	github.com/lib/pq v1.9.0
+	github.com/lib/pq v1.10.9
 	github.com/ogier/pflag v0.0.1
 	github.com/stvp/assert v0.0.0-20170616060220-4bc16443988b // indirect
 	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect

go.sum

@@ -11,6 +11,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lib/pq v1.9.0 h1:L8nSXQQzAYByakOFMTwpjRoHsMJklur4Gi59b6VivR8=
 github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/ogier/pflag v0.0.1 h1:RW6JSWSu/RkSatfcLtogGfFgpim5p7ARQ10ECk5O750=
 github.com/ogier/pflag v0.0.1/go.mod h1:zkFki7tvTa0tafRvTBIZTvzYyAu6kQhPZFnshFFPE+g=
 github.com/stvp/assert v0.0.0-20170616060220-4bc16443988b h1:GlTM/aMVIwU3luIuSN2SIVRuTqGPt1P97YxAi514ulw=

grant-attribute.go

@@ -27,7 +27,7 @@ func initGrantAttributeSqlTemplate() *template.Template {
 -- Attribute/Column ACL only
 SELECT
   n.nspname AS schema_name
-  , {{ if eq $.DbSchema "*" }}n.nspname || '.' || {{ end }}c.relkind || '.' || c.relname || '.' || a.attname AS compare_name
+  , {{ if eq $.DbSchema "*" }}n.nspname::text || '.' || {{ end }}c.relkind::text  || '.' || c.relname::text || '.' || a.attname AS compare_name
   , CASE c.relkind
     WHEN 'r' THEN 'TABLE'
     WHEN 'v' THEN 'VIEW'

grant-relationship.go

@@ -25,7 +25,7 @@ var (
 func initGrantRelationshipSqlTemplate() *template.Template {
 	sql := `
 SELECT n.nspname AS schema_name
-  , {{ if eq $.DbSchema "*" }}n.nspname || '.' || {{ end }}c.relkind || '.' || c.relname AS compare_name
+  , {{ if eq $.DbSchema "*" }}n.nspname::text  || '.' || {{ end }}c.relkind::text  || '.' || c.relname::text  AS compare_name
   , CASE c.relkind
     WHEN 'r' THEN 'TABLE'
     WHEN 'v' THEN 'VIEW'

grant.go

@@ -8,12 +8,14 @@
 
 package main
 
-import "sort"
-import "fmt"
-import "strings"
-import "regexp"
+import (
+		"sort"
+ 		"fmt"
+ 		"strings"
+ 		"regexp"
+)
 
-var aclRegex = regexp.MustCompile(`([a-zA-Z0-9]+)*=([rwadDxtXUCcT]+)/([a-zA-Z0-9]+)$`)
+var aclRegex = regexp.MustCompile(`([a-zA-Z0-9_]+)*=([rwadDxtXUCcT]+)/([a-zA-Z0-9_]+)$`)
 
 var permMap = map[string]string{
 	"a": "INSERT",

role.go

@@ -252,13 +252,13 @@ func (c RoleSchema) Change(obj interface{}) {
 		// TODO: Define INHERIT or not
 		for _, mo1 := range membersof1 {
 			if !misc.ContainsString(membersof2, mo1) {
-				fmt.Printf("GRANT %s TO %s;\n", mo1, c.get("rolename"))
+				fmt.Printf("GRANT %s TO %s;\n", mo1, c.get("rolname"))
 			}
 		}
 
 		for _, mo2 := range membersof2 {
 			if !misc.ContainsString(membersof1, mo2) {
-				fmt.Printf("REVOKE %s FROM %s;\n", mo2, c.get("rolename"))
+				fmt.Printf("REVOKE %s FROM %s;\n", mo2, c.get("rolname"))
 			}
 		}
 

view.go

@@ -6,11 +6,13 @@
 
 package main
 
-import "fmt"
-import "sort"
-import "database/sql"
-import "github.com/joncrlsn/pgutil"
-import "github.com/joncrlsn/misc"
+import (
+		"fmt"
+		"sort"
+		"database/sql"
+		"github.com/joncrlsn/pgutil"
+		"github.com/joncrlsn/misc"
+)
 
 // ==================================
 // ViewRows definition
@@ -99,7 +101,7 @@ func compareViews(conn1 *sql.DB, conn2 *sql.DB) {
 	SELECT schemaname || '.' || viewname AS viewname
 		, definition 
 	FROM pg_views 
-	WHERE schemaname NOT LIKE 'pg_%' 
+	WHERE schemaname NOT LIKE 'pg_%' AND schemaname!='infromation_schema'
 	ORDER BY viewname;
 	`