Changeset: f9aabcf6553e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f9aabcf6553e
Modified Files:
clients/mapiclient/dump.c
sql/test/testdb-reload/Tests/reload.stable.out
sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb/Tests/dump-nogeom.stable.out
sql/test/testdb/Tests/dump.stable.out
Branch: Oct2020
Log Message:
Quote column name in PARTITION BY clause.
diffs (211 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -1346,7 +1346,11 @@ describe_table(Mapi mid, const char *sch
goto bailout;
while (mapi_fetch_row(hdl) != 0)
expr = mapi_fetch_field(hdl, 0);
- mnstr_printf(toConsole, " PARTITION BY %s %s
(%s)", phow, pusing, expr);
+ mnstr_printf(toConsole, " PARTITION BY %s %s
(", phow, pusing);
+ if (column)
+ dquoted_print(toConsole, expr, ")");
+ else
+ mnstr_printf(toConsole, "%s)", expr);
mapi_close_handle(hdl);
}
}
diff --git a/sql/test/testdb-reload/Tests/reload.stable.out
b/sql/test/testdb-reload/Tests/reload.stable.out
--- a/sql/test/testdb-reload/Tests/reload.stable.out
+++ b/sql/test/testdb-reload/Tests/reload.stable.out
@@ -101276,7 +101276,7 @@ 47
CREATE MERGE TABLE "testschema"."testme" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable1" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101300,7 +101300,7 @@ CREATE TABLE "testschema"."subtable3" (
CREATE MERGE TABLE "testschema"."testme2" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable4" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101312,7 +101312,7 @@ CREATE TABLE "testschema"."subtable5" (
CREATE MERGE TABLE "testschema"."testme3" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable6" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101320,7 +101320,7 @@ CREATE TABLE "testschema"."subtable6" (
CREATE MERGE TABLE "testschema"."testvaluespartitions" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY VALUES ON (a);
+) PARTITION BY VALUES ON ("a");
CREATE TABLE "testschema"."sublimits1" (
"a" INTEGER,
"b" VARCHAR(32)
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
--- a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
+++ b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
@@ -101299,7 +101299,7 @@ 47
CREATE MERGE TABLE "testschema"."testme" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable1" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101323,7 +101323,7 @@ CREATE TABLE "testschema"."subtable3" (
CREATE MERGE TABLE "testschema"."testme2" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable4" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101335,7 +101335,7 @@ CREATE TABLE "testschema"."subtable5" (
CREATE MERGE TABLE "testschema"."testme3" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable6" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101343,7 +101343,7 @@ CREATE TABLE "testschema"."subtable6" (
CREATE MERGE TABLE "testschema"."testvaluespartitions" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY VALUES ON (a);
+) PARTITION BY VALUES ON ("a");
CREATE TABLE "testschema"."sublimits1" (
"a" INTEGER,
"b" VARCHAR(32)
diff --git a/sql/test/testdb-upgrade/Tests/dump.stable.out
b/sql/test/testdb-upgrade/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade/Tests/dump.stable.out
@@ -101294,7 +101294,7 @@ 47
CREATE MERGE TABLE "testschema"."testme" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable1" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101318,7 +101318,7 @@ CREATE TABLE "testschema"."subtable3" (
CREATE MERGE TABLE "testschema"."testme2" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable4" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101330,7 +101330,7 @@ CREATE TABLE "testschema"."subtable5" (
CREATE MERGE TABLE "testschema"."testme3" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable6" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101338,7 +101338,7 @@ CREATE TABLE "testschema"."subtable6" (
CREATE MERGE TABLE "testschema"."testvaluespartitions" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY VALUES ON (a);
+) PARTITION BY VALUES ON ("a");
CREATE TABLE "testschema"."sublimits1" (
"a" INTEGER,
"b" VARCHAR(32)
diff --git a/sql/test/testdb/Tests/dump-nogeom.stable.out
b/sql/test/testdb/Tests/dump-nogeom.stable.out
--- a/sql/test/testdb/Tests/dump-nogeom.stable.out
+++ b/sql/test/testdb/Tests/dump-nogeom.stable.out
@@ -101294,7 +101294,7 @@ 47
CREATE MERGE TABLE "testschema"."testme" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable1" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101318,7 +101318,7 @@ CREATE TABLE "testschema"."subtable3" (
CREATE MERGE TABLE "testschema"."testme2" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable4" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101330,7 +101330,7 @@ CREATE TABLE "testschema"."subtable5" (
CREATE MERGE TABLE "testschema"."testme3" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable6" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101338,7 +101338,7 @@ CREATE TABLE "testschema"."subtable6" (
CREATE MERGE TABLE "testschema"."testvaluespartitions" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY VALUES ON (a);
+) PARTITION BY VALUES ON ("a");
CREATE TABLE "testschema"."sublimits1" (
"a" INTEGER,
"b" VARCHAR(32)
diff --git a/sql/test/testdb/Tests/dump.stable.out
b/sql/test/testdb/Tests/dump.stable.out
--- a/sql/test/testdb/Tests/dump.stable.out
+++ b/sql/test/testdb/Tests/dump.stable.out
@@ -101293,7 +101293,7 @@ 47
CREATE MERGE TABLE "testschema"."testme" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable1" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101317,7 +101317,7 @@ CREATE TABLE "testschema"."subtable3" (
CREATE MERGE TABLE "testschema"."testme2" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable4" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101329,7 +101329,7 @@ CREATE TABLE "testschema"."subtable5" (
CREATE MERGE TABLE "testschema"."testme3" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY RANGE ON (a);
+) PARTITION BY RANGE ON ("a");
CREATE TABLE "testschema"."subtable6" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101337,7 +101337,7 @@ CREATE TABLE "testschema"."subtable6" (
CREATE MERGE TABLE "testschema"."testvaluespartitions" (
"a" INTEGER,
"b" VARCHAR(32)
-) PARTITION BY VALUES ON (a);
+) PARTITION BY VALUES ON ("a");
CREATE TABLE "testschema"."sublimits1" (
"a" INTEGER,
"b" VARCHAR(32)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
