fix regexps

Author: rekby

tools/greenplum-to-pg-tests/cmd/check_pg_queries.go

@@ -474,10 +474,14 @@ type ReplacePair struct {
 	To   string
 }
 
-var schemaTableRegexp = regexp.MustCompile(`(?i)(CREATE TABLE|FROM|INSERT INTO|JOIN|UPDATE)\s+"?([^\s."]+)"?\."?([^\s."]+)"?`)
+var (
+	schemaTableRegexp = regexp.MustCompile(`(?is)(EXISTS|FROM|INSERT INTO|JOIN|\s+ON|ROOTPARTITION|TABLE|UPDATE)\s+"?([^\s."]+)"?\."?([^\s."]+)"?`)
+	schemaTableField  = regexp.MustCompile(`"?([^\s."]+)"?\."?([^\s."]+)"?\."?([^\s."]+)"?`)
+)
 
 func fixSchemaNames(queryText string) string {
 	queryText = schemaTableRegexp.ReplaceAllString(queryText, "${1} ${2}___${3}")
+	queryText = schemaTableField.ReplaceAllString(queryText, "${1}___${2}.${3}")
 	return queryText
 }
 

tools/greenplum-to-pg-tests/cmd/check_pg_queries_test.go

@@ -22,6 +22,22 @@ FROM asd___sss t
 USING "kkk" AS base
 WHERE`,
 		},
+		{
+			from:   `LOCK TABLE "asd"."ffa" IN EXCLUSIVE MODE`,
+			result: `LOCK TABLE asd___ffa IN EXCLUSIVE MODE`,
+		},
+		{
+			from:   `DROP TABLE IF EXISTS "aaa"."bbb"`,
+			result: `DROP TABLE IF EXISTS aaa___bbb`,
+		},
+		{
+			from:   `GRANT SELECT ON sss.tt to public`,
+			result: `GRANT SELECT ON sss___tt to public`,
+		},
+		{
+			from:   `SELECT s.t.f FROM s.t`,
+			result: `SELECT s___t.f FROM s___t`,
+		},
 	}
 
 	for i, test := range table {