Updated fingerprinting rules, see wiki.

pganalyze · Feb 8, 2016 · 11efb88 · 11efb88
1 parent ba96a0b
commit 11efb88
Showing 1 changed file with 59 additions and 47 deletions.
diff --git a/tests/fingerprint.json b/tests/fingerprint.json
@@ -1,25 +1,25 @@
 [
   {
     "input": "SELECT 1",
-    "expectedParts": ["SelectStmt", "targetList", "ResTarget", "val"],
-    "expectedHash": "8f5d8ea8f8204adf3ad2ab96a3422108adc94253"
+    "expectedParts": ["SelectStmt", "targetList", "ResTarget"],
+    "expectedHash": "8e1acac181c6d28f4a923392cf1c4eda49ee4cd2"
   },
   {
     "input": "SELECT 2",
-    "expectedParts": ["SelectStmt", "targetList", "ResTarget", "val"],
-    "expectedHash": "8f5d8ea8f8204adf3ad2ab96a3422108adc94253"
+    "expectedParts": ["SelectStmt", "targetList", "ResTarget"],
+    "expectedHash": "8e1acac181c6d28f4a923392cf1c4eda49ee4cd2"
   },
   {
     "input": "SELECT ?",
-    "expectedParts": ["SelectStmt", "targetList", "ResTarget", "val"],
-    "expectedHash": "8f5d8ea8f8204adf3ad2ab96a3422108adc94253"
+    "expectedParts": ["SelectStmt", "targetList", "ResTarget"],
+    "expectedHash": "8e1acac181c6d28f4a923392cf1c4eda49ee4cd2"
   },
   {
     "input": "SELECT 1; SELECT a FROM b",
-    "expectedParts": ["SelectStmt", "targetList", "ResTarget", "val", "SelectStmt",
+    "expectedParts": ["SelectStmt", "targetList", "ResTarget", "SelectStmt",
       "fromClause", "RangeVar", "inhOpt", "2", "relname", "b", "relpersistence",
       "p", "targetList", "ResTarget", "val", "ColumnRef", "fields", "String", "str", "a"],
-    "expectedHash": "d43354ffbd35153ff1523eb72136188f8ef26b7d"
+    "expectedHash": "c8ff78820feae5ed6d7ca580c598f51e25aa2dbe"
   },
   {
     "input": "SELECT COUNT(DISTINCT id), * FROM targets WHERE something IS NOT NULL AND elsewhere::interval < now()",
@@ -37,15 +37,15 @@
   },
   {
     "input": "INSERT INTO test (a, b) VALUES (?, ?)",
-		"expectedParts": ["InsertStmt", "cols", "ResTarget", "a", "ResTarget", "b", "relation", "RangeVar",
-      "inhOpt", "2", "relname", "test", "relpersistence", "p", "selectStmt", "SelectStmt", "valuesLists"],
-		"expectedHash": "a720ba2132271751e089950816287c20a7aa50dc"
+		"expectedParts": ["InsertStmt", "cols", "ResTarget", "name", "a", "ResTarget", "name", "b", "relation", "RangeVar",
+      "inhOpt", "2", "relname", "test", "relpersistence", "p", "selectStmt", "SelectStmt"],
+		"expectedHash": "7987d8bb26ed399b481728a6e8ca1b668f13d93e"
   },
   {
     "input": "INSERT INTO test (b, a) VALUES (?, ?)",
-		"expectedParts": ["InsertStmt", "cols", "ResTarget", "a", "ResTarget", "b", "relation", "RangeVar",
-      "inhOpt", "2", "relname", "test", "relpersistence", "p", "selectStmt", "SelectStmt", "valuesLists"],
-		"expectedHash": "a720ba2132271751e089950816287c20a7aa50dc"
+		"expectedParts": ["InsertStmt", "cols", "ResTarget", "name", "a", "ResTarget", "name", "b", "relation", "RangeVar",
+      "inhOpt", "2", "relname", "test", "relpersistence", "p", "selectStmt", "SelectStmt"],
+		"expectedHash": "7987d8bb26ed399b481728a6e8ca1b668f13d93e"
   },
   {
     "input": "SELECT b AS x, a AS y FROM z",
@@ -59,34 +59,34 @@
 		"expectedParts": ["SelectStmt", "fromClause", "RangeVar", "inhOpt", "2", "relname", "x",
       "relpersistence", "p", "targetList", "ResTarget", "val", "ColumnRef", "fields", "A_Star",
       "whereClause", "A_Expr", "kind", "9", "lexpr", "ColumnRef", "fields", "String", "str", "y",
-      "name", "String", "str", "=", "rexpr"],
-		"expectedHash": "373adca7f8e60fa7aee06d6d0b40883be096d7a7"
+      "name", "String", "str", "="],
+		"expectedHash": "68d00e0f1420c03fa1600ddf49455e068f6185c4"
   },
   {
     "input": "SELECT * FROM x WHERE y IN (?, ?, ?)",
 		"expectedParts": ["SelectStmt", "fromClause", "RangeVar", "inhOpt", "2", "relname", "x",
       "relpersistence", "p", "targetList", "ResTarget", "val", "ColumnRef", "fields", "A_Star",
       "whereClause", "A_Expr", "kind", "9", "lexpr", "ColumnRef", "fields", "String", "str", "y",
-      "name", "String", "str", "=", "rexpr"],
-		"expectedHash": "373adca7f8e60fa7aee06d6d0b40883be096d7a7"
+      "name", "String", "str", "="],
+		"expectedHash": "68d00e0f1420c03fa1600ddf49455e068f6185c4"
   },
   {
     "input": "SELECT * FROM x WHERE y IN ( ?::uuid )",
 		"expectedParts": ["SelectStmt", "fromClause", "RangeVar", "inhOpt", "2", "relname", "x",
       "relpersistence", "p", "targetList", "ResTarget", "val", "ColumnRef", "fields", "A_Star",
       "whereClause", "A_Expr", "kind", "9", "lexpr", "ColumnRef", "fields", "String", "str", "y",
-      "name", "String", "str", "=", "rexpr", "TypeCast", "arg", "typeName", "TypeName", "names",
+      "name", "String", "str", "=", "rexpr", "TypeCast", "typeName", "TypeName", "names",
       "String", "str", "uuid", "typemod", "-1"],
-		"expectedHash": "fdac8cf5c29c6c3222a69920a9d0cfebe43cb8ce"
+		"expectedHash": "949ab5b077dc2025b9bfc537fdcd678e42d042fd"
   },
   {
     "input": "SELECT * FROM x WHERE y IN ( ?::uuid, ?::uuid, ?::uuid )",
 		"expectedParts": ["SelectStmt", "fromClause", "RangeVar", "inhOpt", "2", "relname", "x",
       "relpersistence", "p", "targetList", "ResTarget", "val", "ColumnRef", "fields", "A_Star",
       "whereClause", "A_Expr", "kind", "9", "lexpr", "ColumnRef", "fields", "String", "str", "y",
-      "name", "String", "str", "=", "rexpr", "TypeCast", "arg", "typeName", "TypeName", "names",
+      "name", "String", "str", "=", "rexpr", "TypeCast", "typeName", "TypeName", "names",
       "String", "str", "uuid", "typemod", "-1"],
-		"expectedHash": "fdac8cf5c29c6c3222a69920a9d0cfebe43cb8ce"
+		"expectedHash": "949ab5b077dc2025b9bfc537fdcd678e42d042fd"
   },
   {
     "input": "PREPARE a123 AS SELECT a",
@@ -121,10 +121,10 @@
       "SelectStmt", "fromClause", "RangeVar", "inhOpt", "2", "relname", "x", "relpersistence",
       "p", "targetList", "ResTarget", "val", "ColumnRef", "fields", "A_Star", "whereClause",
       "A_Expr", "kind", "1", "lexpr", "A_Expr", "lexpr", "ColumnRef", "fields", "String",
-      "str", "x", "String", "str", "y", "name", "String", "str", "=", "rexpr", "rexpr",
+      "str", "x", "String", "str", "y", "name", "String", "str", "=", "rexpr",
       "A_Expr", "lexpr", "ColumnRef", "fields", "String", "str", "x", "String", "str",
-      "z", "name", "String", "str", "=", "rexpr"],
-    "expectedHash": "5c0899be8b243e8c62f43bcf18fb226fe1cfc09f"
+      "z", "name", "String", "str", "="],
+    "expectedHash": "fcf2500b7dcb8b030f3f00cb7c4f2dafd0dbca1c"
   },
   {
     "input": "CREATE TABLE types (a float(2), b float(49), c NUMERIC(2, 3), d character(4), e char(5), f varchar(6), g character varying(7))",
@@ -134,16 +134,16 @@
       "typemod", "-1", "ColumnDef", "colname", "b", "is_local", "true", "typeName", "TypeName",
       "names", "String", "str", "pg_catalog", "String", "str", "float8", "typemod", "-1",
       "ColumnDef", "colname", "c", "is_local", "true", "typeName", "TypeName", "names",
-      "String", "str", "pg_catalog", "String", "str", "numeric", "typemod", "-1", "typmods",
+      "String", "str", "pg_catalog", "String", "str", "numeric", "typemod", "-1",
       "ColumnDef", "colname", "d", "is_local", "true", "typeName", "TypeName", "names", "String",
-      "str", "pg_catalog", "String", "str", "bpchar", "typemod", "-1", "typmods", "ColumnDef",
+      "str", "pg_catalog", "String", "str", "bpchar", "typemod", "-1", "ColumnDef",
       "colname", "e", "is_local", "true", "typeName", "TypeName", "names", "String", "str",
-      "pg_catalog", "String", "str", "bpchar", "typemod", "-1", "typmods", "ColumnDef", "colname",
+      "pg_catalog", "String", "str", "bpchar", "typemod", "-1", "ColumnDef", "colname",
       "f", "is_local", "true", "typeName", "TypeName", "names", "String", "str", "pg_catalog",
-      "String", "str", "varchar", "typemod", "-1", "typmods", "ColumnDef", "colname", "g",
+      "String", "str", "varchar", "typemod", "-1", "ColumnDef", "colname", "g",
       "is_local", "true", "typeName", "TypeName", "names", "String", "str", "pg_catalog",
-      "String", "str", "varchar", "typemod", "-1", "typmods"],
-    "expectedHash": "3c5296afabd203b3eafdcea1508fc205ab8a39e6"
+      "String", "str", "varchar", "typemod", "-1"],
+    "expectedHash": "8b9c10a0987ccba4f8d8263f3fa7e9e8095d6c58"
   },
   {
     "input": "CREATE VIEW view_a (a, b) AS WITH RECURSIVE view_a (a, b) AS (SELECT * FROM a(1)) SELECT \"a\", \"b\" FROM \"view_a\"",
@@ -152,10 +152,10 @@
       "targetList", "ResTarget", "val", "ColumnRef", "fields", "String", "str", "a", "ResTarget", "val",
       "ColumnRef", "fields", "String", "str", "b", "withClause", "WithClause", "ctes", "CommonTableExpr",
       "aliascolnames", "String", "str", "a", "String", "str", "b", "ctename", "view_a", "ctequery",
-      "SelectStmt", "fromClause", "RangeFunction", "functions", "FuncCall", "args", "funcname",
+      "SelectStmt", "fromClause", "RangeFunction", "functions", "FuncCall", "funcname",
       "String", "str", "a", "targetList", "ResTarget", "val", "ColumnRef", "fields", "A_Star",
       "recursive", "true", "view", "RangeVar", "inhOpt", "2", "relname", "view_a", "relpersistence", "p"],
-    "expectedHash": "35ca3de196c25f4e47330285708d602b5971ac6b"
+    "expectedHash": "c1164d94a613858d257352dc6b7d3998d23cc27e"
   },
   {
     "input": "VACUUM FULL my_table",
@@ -166,17 +166,17 @@
   },
   {
     "input": "SELECT * FROM x AS a, y AS b",
-    "expectedParts": ["SelectStmt", "fromClause", "RangeVar", "alias", "inhOpt", "2",
-      "relname", "x", "relpersistence", "p", "RangeVar", "alias", "inhOpt", "2", "relname", "y",
+    "expectedParts": ["SelectStmt", "fromClause", "RangeVar", "inhOpt", "2",
+      "relname", "x", "relpersistence", "p", "RangeVar", "inhOpt", "2", "relname", "y",
       "relpersistence", "p", "targetList", "ResTarget", "val", "ColumnRef", "fields", "A_Star"],
-    "expectedHash": "2af177b9df9a89ecdf114e2c46ada4d21a436a71"
+    "expectedHash": "449b0e33058c2020cb901507428371e76dd1135c"
   },
   {
     "input": "SELECT * FROM y AS a, x AS b",
-    "expectedParts": ["SelectStmt", "fromClause", "RangeVar", "alias", "inhOpt", "2",
-      "relname", "x", "relpersistence", "p", "RangeVar", "alias", "inhOpt", "2", "relname", "y",
+    "expectedParts": ["SelectStmt", "fromClause", "RangeVar", "inhOpt", "2",
+      "relname", "x", "relpersistence", "p", "RangeVar", "inhOpt", "2", "relname", "y",
       "relpersistence", "p", "targetList", "ResTarget", "val", "ColumnRef", "fields", "A_Star"],
-    "expectedHash": "2af177b9df9a89ecdf114e2c46ada4d21a436a71"
+    "expectedHash": "449b0e33058c2020cb901507428371e76dd1135c"
   },
   {
     "input": "SELECT x AS a, y AS b FROM x",
@@ -208,16 +208,28 @@
   },
   {
     "input": "INSERT INTO films (code, title, did) VALUES ('UA502', 'Bananas', 105), ('T_601', 'Yojimbo', DEFAULT)",
-    "expectedParts": ["InsertStmt", "cols", "ResTarget", "code", "ResTarget", "did",
-      "ResTarget", "title", "relation", "RangeVar", "inhOpt", "2", "relname", "films",
-      "relpersistence", "p", "selectStmt", "SelectStmt", "valuesLists"],
-    "expectedHash": "87bc98d4899523db445a56b27ea155dbc68e2812"
+    "expectedParts": ["InsertStmt", "cols", "ResTarget", "name", "code", "ResTarget", "name", "did",
+      "ResTarget", "name", "title", "relation", "RangeVar", "inhOpt", "2", "relname", "films",
+      "relpersistence", "p", "selectStmt", "SelectStmt"],
+    "expectedHash": "8658f8f49178096f7dd87f81ed184208efe7ed56"
   },
   {
     "input": "INSERT INTO films (code, title, did) VALUES (?, ?, ?)",
-    "expectedParts": ["InsertStmt", "cols", "ResTarget", "code", "ResTarget", "did",
-      "ResTarget", "title", "relation", "RangeVar", "inhOpt", "2", "relname", "films",
-      "relpersistence", "p", "selectStmt", "SelectStmt", "valuesLists"],
-    "expectedHash": "87bc98d4899523db445a56b27ea155dbc68e2812"
+    "expectedParts": ["InsertStmt", "cols", "ResTarget", "name", "code", "ResTarget", "name", "did",
+      "ResTarget", "name", "title", "relation", "RangeVar", "inhOpt", "2", "relname", "films",
+      "relpersistence", "p", "selectStmt", "SelectStmt"],
+    "expectedHash": "8658f8f49178096f7dd87f81ed184208efe7ed56"
+  },
+  {
+    "input": "SELECT * FROM a",
+    "expectedParts": ["SelectStmt", "fromClause", "RangeVar", "inhOpt", "2", "relname", "a",
+      "relpersistence", "p", "targetList", "ResTarget", "val", "ColumnRef", "fields", "A_Star"],
+    "expectedHash": "1f3a0a714c4e3bbf38e9eab45104fe96f7746ab2"
+  },
+  {
+    "input": "SELECT * FROM a AS b",
+    "expectedParts": ["SelectStmt", "fromClause", "RangeVar", "inhOpt", "2", "relname", "a",
+      "relpersistence", "p", "targetList", "ResTarget", "val", "ColumnRef", "fields", "A_Star"],
+    "expectedHash": "1f3a0a714c4e3bbf38e9eab45104fe96f7746ab2"
   }
 ]