Changeset: 3d776f91ae10 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3d776f91ae10
Modified Files:
        sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.test
Branch: balanced_union
Log Message:

Rewrites mtest query to be readable


diffs (212 lines):

diff --git 
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.test 
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.test
--- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.test
+++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.test
@@ -6,79 +6,135 @@ create table test (
 )
 
 query TTTTTIIITT rowsort
-SELECT * FROM ( SELECT 'demo' AS "TABLE_CAT",
-"schemas"."name" AS "TABLE_SCHEM", "tables"."name" AS
-"TABLE_NAME", 'SYSTEM TABLE' AS "TABLE_TYPE", '' AS
-"REMARKS", null AS "TYPE_CAT", null AS "TYPE_SCHEM",
-null AS "TYPE_NAME", 'rowid' AS
-"SELF_REFERENCING_COL_NAME", 'SYSTEM' AS
-"REF_GENERATION" FROM "tables", "schemas" WHERE
-"tables"."schema_id" = "schemas"."id" AND
-"tables"."system" = true AND "tables"."type" = 0
-UNION ALL SELECT 'demo' AS "TABLE_CAT",
-"schemas"."name" AS "TABLE_SCHEM", "tables"."name" AS
-"TABLE_NAME", 'TABLE' AS "TABLE_TYPE", '' AS "REMARKS",
-null AS "TYPE_CAT", null AS "TYPE_SCHEM", null AS
-"TYPE_NAME", 'rowid' AS "SELF_REFERENCING_COL_NAME",
-'SYSTEM' AS "REF_GENERATION" FROM "tables", "schemas"
-WHERE "tables"."schema_id" = "schemas"."id" AND
-"tables"."system" = false AND "tables".name = 'test'
-AND "tables"."type" = 0 UNION ALL SELECT 'demo' AS "TABLE_CAT",
-"schemas"."name" AS "TABLE_SCHEM", "tables"."name" AS
-"TABLE_NAME", 'SYSTEM VIEW' AS "TABLE_TYPE", '' AS
-"REMARKS", null AS "TYPE_CAT", null AS "TYPE_SCHEM",
-null AS "TYPE_NAME", 'rowid' AS
-"SELF_REFERENCING_COL_NAME", 'SYSTEM' AS
-"REF_GENERATION" FROM "tables", "schemas" WHERE
-"tables"."schema_id" = "schemas"."id" AND
-"tables"."system" = true AND "tables"."type" = 1
-UNION ALL SELECT 'demo' AS "TABLE_CAT",
-"schemas"."name" AS "TABLE_SCHEM", "tables"."name" AS
-"TABLE_NAME", 'VIEW' AS "TABLE_TYPE", '' AS "REMARKS",
-null AS "TYPE_CAT", null AS "TYPE_SCHEM", null AS
-"TYPE_NAME", 'rowid' AS "SELF_REFERENCING_COL_NAME",
-'SYSTEM' AS "REF_GENERATION" FROM "tables", "schemas"
-WHERE "tables"."schema_id" = "schemas"."id" AND
-"tables"."system" = false AND "tables".name = 'test'
-AND "tables"."type" = 1 UNION ALL SELECT 'demo' AS "TABLE_CAT",
-"schemas"."name" AS "TABLE_SCHEM", "tables"."name" AS
-"TABLE_NAME", 'SYSTEM SESSION TABLE' AS "TABLE_TYPE",
-'' AS "REMARKS", null AS "TYPE_CAT", null AS
-"TYPE_SCHEM", null AS "TYPE_NAME", 'rowid' AS
-"SELF_REFERENCING_COL_NAME", 'SYSTEM' AS
-"REF_GENERATION" FROM tmp."_tables" AS "tables",
-"schemas" WHERE "tables"."schema_id" = "schemas"."id"
-AND "tables"."system" = true AND "tables"."type" =
-0 UNION ALL SELECT 'demo' AS "TABLE_CAT",
-"schemas"."name" AS "TABLE_SCHEM", "tables"."name" AS
-"TABLE_NAME", 'SESSION TABLE' AS "TABLE_TYPE", '' AS
-"REMARKS", null AS "TYPE_CAT", null AS "TYPE_SCHEM",
-null AS "TYPE_NAME", 'rowid' AS
-"SELF_REFERENCING_COL_NAME", 'SYSTEM' AS
-"REF_GENERATION" FROM tmp."_tables" AS "tables",
-"schemas" WHERE "tables"."schema_id" = "schemas"."id"
-AND "tables"."system" = false AND "tables".name = 'test'
-AND "tables"."type" = 0 UNION ALL SELECT 'demo' AS "TABLE_CAT",
-"schemas"."name" AS "TABLE_SCHEM", "tables"."name" AS
-"TABLE_NAME", 'SYSTEM SESSION VIEW' AS "TABLE_TYPE", ''
-AS "REMARKS", null AS "TYPE_CAT", null AS "TYPE_SCHEM",
-null AS "TYPE_NAME", 'rowid' AS
-"SELF_REFERENCING_COL_NAME", 'SYSTEM' AS
-"REF_GENERATION" FROM tmp."_tables" AS "tables",
-"schemas" WHERE "tables"."schema_id" = "schemas"."id"
-AND "tables"."system" = true AND "tables"."type" =
-1 UNION ALL SELECT 'demo' AS "TABLE_CAT",
-"schemas"."name" AS "TABLE_SCHEM", "tables"."name" AS
-"TABLE_NAME", 'SESSION VIEW' AS "TABLE_TYPE", '' AS
-"REMARKS", null AS "TYPE_CAT", null AS "TYPE_SCHEM",
-null AS "TYPE_NAME", 'rowid' AS
-"SELF_REFERENCING_COL_NAME", 'SYSTEM' AS
-"REF_GENERATION" FROM tmp."_tables" AS "tables",
-"schemas" WHERE "tables"."schema_id" = "schemas"."id"
-AND "tables"."system" = false AND "tables".name = 'test'
-AND "tables"."type" = 1 ) AS "tables" WHERE 1 = 1 AND ("TABLE_TYPE" LIKE
-'TABLE' OR "TABLE_TYPE" LIKE 'VIEW') ORDER BY
-"TABLE_TYPE", "TABLE_SCHEM", "TABLE_NAME"
+SELECT * FROM ( 
+    SELECT 'demo' AS "TABLE_CAT",
+        "schemas"."name" AS "TABLE_SCHEM",
+               "tables"."name" AS "TABLE_NAME",
+               'SYSTEM TABLE' AS "TABLE_TYPE",
+               '' AS "REMARKS",
+               null AS "TYPE_CAT",
+               null AS "TYPE_SCHEM",
+        null AS "TYPE_NAME",
+               'rowid' AS "SELF_REFERENCING_COL_NAME",
+               'SYSTEM' AS "REF_GENERATION" 
+       FROM "tables", "schemas" 
+       WHERE "tables"."schema_id" = "schemas"."id" AND
+          "tables"."system" = true AND
+          "tables"."type" = 0
+    UNION ALL 
+    SELECT 'demo' AS "TABLE_CAT",
+        "schemas"."name" AS "TABLE_SCHEM",
+               "tables"."name" AS "TABLE_NAME",
+               'TABLE' AS "TABLE_TYPE",
+               '' AS "REMARKS",
+        null AS "TYPE_CAT",
+               null AS "TYPE_SCHEM",
+               null AS "TYPE_NAME",
+               'rowid' AS "SELF_REFERENCING_COL_NAME",
+        'SYSTEM' AS "REF_GENERATION" 
+       FROM "tables", "schemas"
+       WHERE "tables"."schema_id" = "schemas"."id" AND
+          "tables"."system" = false AND 
+          "tables".name = 'test' AND
+          "tables"."type" = 0 
+    UNION ALL 
+    SELECT 'demo' AS "TABLE_CAT",
+        "schemas"."name" AS "TABLE_SCHEM",
+               "tables"."name" AS "TABLE_NAME",
+               'SYSTEM VIEW' AS "TABLE_TYPE",
+               '' AS "REMARKS",
+               null AS "TYPE_CAT",
+               null AS "TYPE_SCHEM",
+        null AS "TYPE_NAME",
+               'rowid' AS "SELF_REFERENCING_COL_NAME",
+               'SYSTEM' AS "REF_GENERATION" 
+       FROM "tables", "schemas" 
+       WHERE "tables"."schema_id" = "schemas"."id" AND
+          "tables"."system" = true AND 
+          "tables"."type" = 1
+    UNION ALL 
+    SELECT 'demo' AS "TABLE_CAT",
+        "schemas"."name" AS "TABLE_SCHEM",
+               "tables"."name" AS "TABLE_NAME",
+               'VIEW' AS "TABLE_TYPE",
+               '' AS "REMARKS",
+        null AS "TYPE_CAT",
+               null AS "TYPE_SCHEM",
+               null AS "TYPE_NAME",
+               'rowid' AS "SELF_REFERENCING_COL_NAME",
+        'SYSTEM' AS "REF_GENERATION" 
+       FROM "tables", "schemas"
+       WHERE "tables"."schema_id" = "schemas"."id" AND
+          "tables"."system" = false AND 
+          "tables".name = 'test' AND
+          "tables"."type" = 1 
+    UNION ALL 
+    SELECT 'demo' AS "TABLE_CAT",
+        "schemas"."name" AS "TABLE_SCHEM",
+               "tables"."name" AS "TABLE_NAME",
+               'SYSTEM SESSION TABLE' AS "TABLE_TYPE",
+        '' AS "REMARKS",
+               null AS "TYPE_CAT",
+               null AS "TYPE_SCHEM",
+               null AS "TYPE_NAME",
+               'rowid' AS "SELF_REFERENCING_COL_NAME",
+               'SYSTEM' AS "REF_GENERATION" 
+       FROM tmp."_tables" AS "tables", "schemas" 
+       WHERE "tables"."schema_id" = "schemas"."id" AND 
+             "tables"."system" = true AND 
+             "tables"."type" = 0 
+    UNION ALL 
+    SELECT 'demo' AS "TABLE_CAT",
+        "schemas"."name" AS "TABLE_SCHEM",
+               "tables"."name" AS "TABLE_NAME",
+               'SESSION TABLE' AS "TABLE_TYPE",
+               '' AS "REMARKS",
+               null AS "TYPE_CAT",
+               null AS "TYPE_SCHEM",
+        null AS "TYPE_NAME",
+               'rowid' AS "SELF_REFERENCING_COL_NAME",
+               'SYSTEM' AS "REF_GENERATION" 
+       FROM tmp."_tables" AS "tables", "schemas" 
+       WHERE "tables"."schema_id" = "schemas"."id" AND 
+             "tables"."system" = false AND 
+             "tables".name = 'test' AND
+             "tables"."type" = 0 
+    UNION ALL 
+    SELECT 'demo' AS "TABLE_CAT",
+        "schemas"."name" AS "TABLE_SCHEM",
+               "tables"."name" AS
+        "TABLE_NAME",
+               'SYSTEM SESSION VIEW' AS "TABLE_TYPE",
+               '' AS "REMARKS",
+               null AS "TYPE_CAT",
+               null AS "TYPE_SCHEM",
+        null AS "TYPE_NAME",
+               'rowid' AS "SELF_REFERENCING_COL_NAME",
+               'SYSTEM' AS "REF_GENERATION" 
+       FROM tmp."_tables" AS "tables", "schemas" 
+       WHERE "tables"."schema_id" = "schemas"."id" AND
+             "tables"."system" = true AND
+             "tables"."type" = 1 
+    UNION ALL 
+    SELECT 'demo' AS "TABLE_CAT",
+        "schemas"."name" AS "TABLE_SCHEM",
+               "tables"."name" AS "TABLE_NAME",
+               'SESSION VIEW' AS "TABLE_TYPE",
+               '' AS "REMARKS",
+               null AS "TYPE_CAT",
+               null AS "TYPE_SCHEM",
+        null AS "TYPE_NAME",
+               'rowid' AS "SELF_REFERENCING_COL_NAME",
+               'SYSTEM' AS "REF_GENERATION" 
+       FROM tmp."_tables" AS "tables", "schemas" 
+    WHERE "tables"."schema_id" = "schemas"."id" AND 
+          "tables"."system" = false AND 
+          "tables".name = 'test' AND 
+          "tables"."type" = 1 
+) AS "tables" 
+WHERE 1 = 1 AND 
+     ("TABLE_TYPE" LIKE 'TABLE' OR "TABLE_TYPE" LIKE 'VIEW')
+ORDER BY "TABLE_TYPE", "TABLE_SCHEM", "TABLE_NAME"
 ----
 demo
 sys
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to