Changeset: 7f1736750cd6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7f1736750cd6
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/scripts/76_dump.sql
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
When dumping CREATE USER, also specify SCHEMA PATH.
diffs (truncated from 1100 to 300 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -3859,9 +3859,9 @@ sql_update_default(Client c, mvc *sql, c
" AND grantor <> 0;\n"
"CREATE VIEW sys.dump_create_users AS\n"
" SELECT\n"
- " 'CREATE USER ' || sys.dq(ui.name)
|| ' WITH ENCRYPTED PASSWORD ' ||\n"
+ " 'CREATE USER ' || sys.dq(ui.name)
|| ' WITH ENCRYPTED PASSWORD ' ||\n"
"
sys.sq(sys.password_hash(ui.name)) ||\n"
- " ' NAME ' || sys.sq(ui.fullname)
|| ' SCHEMA sys;' stmt,\n"
+ " ' NAME ' || sys.sq(ui.fullname)
|| ' SCHEMA sys' || ifthenelse(ui.schema_path = '\"sys\"', '', ' SCHEMA PATH '
|| sys.sq(ui.schema_path)) || ';' stmt,\n"
" ui.name user_name\n"
" FROM sys.db_user_info ui,
sys.schemas s\n"
" WHERE ui.default_schema = s.id\n"
@@ -3869,7 +3869,7 @@ sql_update_default(Client c, mvc *sql, c
" AND ui.name <> '.snapshot';\n"
"CREATE VIEW sys.dump_create_schemas
AS\n"
" SELECT\n"
- " 'CREATE SCHEMA ' ||
sys.dq(s.name) || ifthenelse(a.name <> 'sysadmin', ' AUTHORIZATION ' ||
sys.dq(a.name), ' ') || ';' stmt,\n"
+ " 'CREATE SCHEMA ' || sys.dq(s.name)
|| ifthenelse(a.name <> 'sysadmin', ' AUTHORIZATION ' || sys.dq(a.name), ' ')
|| ';' stmt,\n"
" s.name schema_name\n"
" FROM sys.schemas s, sys.auths a\n"
" WHERE s.authorization = a.id AND
s.system = FALSE;\n"
@@ -4029,7 +4029,7 @@ sql_update_default(Client c, mvc *sql, c
" FROM sys.describe_sequences;\n"
"CREATE VIEW sys.dump_start_sequences
AS\n"
" SELECT\n"
- " 'UPDATE sys.sequences seq SET
start = ' || s ||\n"
+ " 'UPDATE sys.sequences seq SET
start = ' || s ||\n"
" ' WHERE name = ' || sys.SQ(seq)
||\n"
" ' AND schema_id = (SELECT s.id
FROM sys.schemas s WHERE s.name = ' || sys.SQ(sch) || ');' stmt,\n"
" sch schema_name,\n"
@@ -4089,7 +4089,7 @@ sql_update_default(Client c, mvc *sql, c
" DECLARE _cnt INT;\n"
" SET _cnt = (SELECT count FROM
sys.storage(sch, tbl, cname));\n"
" IF _cnt > 0 THEN\n"
- " SET COPY_INTO_STMT = 'COPY ' ||
_cnt || ' RECORDS INTO ' || sys.FQN(sch, tbl) || '(' || sys.DQ(cname);\n"
+ " SET COPY_INTO_STMT = 'COPY ' ||
_cnt || ' RECORDS INTO ' || sys.FQN(sch, tbl) || '(' || sys.DQ(cname);\n"
" DECLARE SELECT_DATA_STMT
STRING;\n"
" SET SELECT_DATA_STMT = 'SELECT
(SELECT COUNT(*) FROM sys.dump_statements) + RANK() OVER(), ' ||
sys.prepare_esc(cname, ctype);\n"
" DECLARE M INT;\n"
@@ -4102,7 +4102,7 @@ sql_update_default(Client c, mvc *sql, c
" SET SELECT_DATA_STMT =
SELECT_DATA_STMT || '|| ''|'' || ' || sys.prepare_esc(cname, ctype);\n"
" END WHILE;\n"
" SET COPY_INTO_STMT =
(COPY_INTO_STMT || ') FROM STDIN USING DELIMITERS ''|'',E''\\\\n'',''\"'';');\n"
- " SET SELECT_DATA_STMT =
SELECT_DATA_STMT || ' FROM ' || sys.FQN(sch, tbl);\n"
+ " SET SELECT_DATA_STMT =
SELECT_DATA_STMT || ' FROM ' || sys.FQN(sch, tbl);\n"
" insert into sys.dump_statements
VALUES ((SELECT COUNT(*) FROM sys.dump_statements) + 1, COPY_INTO_STMT);\n"
" CALL sys.EVAL('INSERT INTO
sys.dump_statements ' || SELECT_DATA_STMT || ';');\n"
" END IF;\n"
diff --git a/sql/scripts/76_dump.sql b/sql/scripts/76_dump.sql
--- a/sql/scripts/76_dump.sql
+++ b/sql/scripts/76_dump.sql
@@ -14,9 +14,9 @@ CREATE VIEW sys.dump_create_roles AS
CREATE VIEW sys.dump_create_users AS
SELECT
- 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED PASSWORD ' ||
+ 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED PASSWORD ' ||
sys.sq(sys.password_hash(ui.name)) ||
- ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys;' stmt,
+ ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys' ||
ifthenelse(ui.schema_path = '"sys"', '', ' SCHEMA PATH ' ||
sys.sq(ui.schema_path)) || ';' stmt,
ui.name user_name
FROM sys.db_user_info ui, sys.schemas s
WHERE ui.default_schema = s.id
@@ -25,7 +25,7 @@ CREATE VIEW sys.dump_create_users AS
CREATE VIEW sys.dump_create_schemas AS
SELECT
- 'CREATE SCHEMA ' || sys.dq(s.name) || ifthenelse(a.name <> 'sysadmin', '
AUTHORIZATION ' || sys.dq(a.name), ' ') || ';' stmt,
+ 'CREATE SCHEMA ' || sys.dq(s.name) || ifthenelse(a.name <> 'sysadmin', '
AUTHORIZATION ' || sys.dq(a.name), ' ') || ';' stmt,
s.name schema_name
FROM sys.schemas s, sys.auths a
WHERE s.authorization = a.id AND s.system = FALSE;
@@ -197,7 +197,7 @@ CREATE VIEW sys.dump_sequences AS
CREATE VIEW sys.dump_start_sequences AS
SELECT
- 'UPDATE sys.sequences seq SET start = ' || s ||
+ 'UPDATE sys.sequences seq SET start = ' || s ||
' WHERE name = ' || sys.SQ(seq) ||
' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = ' ||
sys.SQ(sch) || ');' stmt,
sch schema_name,
@@ -278,7 +278,7 @@ BEGIN
SET _cnt = (SELECT count FROM sys.storage(sch, tbl, cname));
IF _cnt > 0 THEN
- SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' ||
sys.FQN(sch, tbl) || '(' || sys.DQ(cname);
+ SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' || sys.FQN(sch,
tbl) || '(' || sys.DQ(cname);
DECLARE SELECT_DATA_STMT STRING;
SET SELECT_DATA_STMT = 'SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), ' || sys.prepare_esc(cname, ctype);
@@ -295,7 +295,7 @@ BEGIN
END WHILE;
SET COPY_INTO_STMT = (COPY_INTO_STMT || ') FROM STDIN USING DELIMITERS
''|'',E''\\n'',''"'';');
- SET SELECT_DATA_STMT = SELECT_DATA_STMT || ' FROM ' || sys.FQN(sch,
tbl);
+ SET SELECT_DATA_STMT = SELECT_DATA_STMT || ' FROM ' || sys.FQN(sch, tbl);
insert into sys.dump_statements VALUES ((SELECT COUNT(*) FROM
sys.dump_statements) + 1, COPY_INTO_STMT);
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -288,9 +288,9 @@ CREATE VIEW sys.dump_create_roles AS
AND grantor <> 0;
CREATE VIEW sys.dump_create_users AS
SELECT
- 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED PASSWORD ' ||
+ 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED PASSWORD ' ||
sys.sq(sys.password_hash(ui.name)) ||
- ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys;' stmt,
+ ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys' ||
ifthenelse(ui.schema_path = '"sys"', '', ' SCHEMA PATH ' ||
sys.sq(ui.schema_path)) || ';' stmt,
ui.name user_name
FROM sys.db_user_info ui, sys.schemas s
WHERE ui.default_schema = s.id
@@ -298,7 +298,7 @@ CREATE VIEW sys.dump_create_users AS
AND ui.name <> '.snapshot';
CREATE VIEW sys.dump_create_schemas AS
SELECT
- 'CREATE SCHEMA ' || sys.dq(s.name) || ifthenelse(a.name <> 'sysadmin', '
AUTHORIZATION ' || sys.dq(a.name), ' ') || ';' stmt,
+ 'CREATE SCHEMA ' || sys.dq(s.name) || ifthenelse(a.name <> 'sysadmin', '
AUTHORIZATION ' || sys.dq(a.name), ' ') || ';' stmt,
s.name schema_name
FROM sys.schemas s, sys.auths a
WHERE s.authorization = a.id AND s.system = FALSE;
@@ -458,7 +458,7 @@ CREATE VIEW sys.dump_sequences AS
FROM sys.describe_sequences;
CREATE VIEW sys.dump_start_sequences AS
SELECT
- 'UPDATE sys.sequences seq SET start = ' || s ||
+ 'UPDATE sys.sequences seq SET start = ' || s ||
' WHERE name = ' || sys.SQ(seq) ||
' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = ' ||
sys.SQ(sch) || ');' stmt,
sch schema_name,
@@ -518,7 +518,7 @@ BEGIN
DECLARE _cnt INT;
SET _cnt = (SELECT count FROM sys.storage(sch, tbl, cname));
IF _cnt > 0 THEN
- SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' ||
sys.FQN(sch, tbl) || '(' || sys.DQ(cname);
+ SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' || sys.FQN(sch,
tbl) || '(' || sys.DQ(cname);
DECLARE SELECT_DATA_STMT STRING;
SET SELECT_DATA_STMT = 'SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), ' || sys.prepare_esc(cname, ctype);
DECLARE M INT;
@@ -531,7 +531,7 @@ BEGIN
SET SELECT_DATA_STMT = SELECT_DATA_STMT || '|| ''|'' || ' ||
sys.prepare_esc(cname, ctype);
END WHILE;
SET COPY_INTO_STMT = (COPY_INTO_STMT || ') FROM STDIN USING DELIMITERS
''|'',E''\\n'',''"'';');
- SET SELECT_DATA_STMT = SELECT_DATA_STMT || ' FROM ' || sys.FQN(sch,
tbl);
+ SET SELECT_DATA_STMT = SELECT_DATA_STMT || ' FROM ' || sys.FQN(sch, tbl);
insert into sys.dump_statements VALUES ((SELECT COUNT(*) FROM
sys.dump_statements) + 1, COPY_INTO_STMT);
CALL sys.EVAL('INSERT INTO sys.dump_statements ' || SELECT_DATA_STMT ||
';');
END IF;
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
@@ -288,9 +288,9 @@ CREATE VIEW sys.dump_create_roles AS
AND grantor <> 0;
CREATE VIEW sys.dump_create_users AS
SELECT
- 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED PASSWORD ' ||
+ 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED PASSWORD ' ||
sys.sq(sys.password_hash(ui.name)) ||
- ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys;' stmt,
+ ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys' ||
ifthenelse(ui.schema_path = '"sys"', '', ' SCHEMA PATH ' ||
sys.sq(ui.schema_path)) || ';' stmt,
ui.name user_name
FROM sys.db_user_info ui, sys.schemas s
WHERE ui.default_schema = s.id
@@ -298,7 +298,7 @@ CREATE VIEW sys.dump_create_users AS
AND ui.name <> '.snapshot';
CREATE VIEW sys.dump_create_schemas AS
SELECT
- 'CREATE SCHEMA ' || sys.dq(s.name) || ifthenelse(a.name <> 'sysadmin', '
AUTHORIZATION ' || sys.dq(a.name), ' ') || ';' stmt,
+ 'CREATE SCHEMA ' || sys.dq(s.name) || ifthenelse(a.name <> 'sysadmin', '
AUTHORIZATION ' || sys.dq(a.name), ' ') || ';' stmt,
s.name schema_name
FROM sys.schemas s, sys.auths a
WHERE s.authorization = a.id AND s.system = FALSE;
@@ -458,7 +458,7 @@ CREATE VIEW sys.dump_sequences AS
FROM sys.describe_sequences;
CREATE VIEW sys.dump_start_sequences AS
SELECT
- 'UPDATE sys.sequences seq SET start = ' || s ||
+ 'UPDATE sys.sequences seq SET start = ' || s ||
' WHERE name = ' || sys.SQ(seq) ||
' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = ' ||
sys.SQ(sch) || ');' stmt,
sch schema_name,
@@ -518,7 +518,7 @@ BEGIN
DECLARE _cnt INT;
SET _cnt = (SELECT count FROM sys.storage(sch, tbl, cname));
IF _cnt > 0 THEN
- SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' ||
sys.FQN(sch, tbl) || '(' || sys.DQ(cname);
+ SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' || sys.FQN(sch,
tbl) || '(' || sys.DQ(cname);
DECLARE SELECT_DATA_STMT STRING;
SET SELECT_DATA_STMT = 'SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), ' || sys.prepare_esc(cname, ctype);
DECLARE M INT;
@@ -531,7 +531,7 @@ BEGIN
SET SELECT_DATA_STMT = SELECT_DATA_STMT || '|| ''|'' || ' ||
sys.prepare_esc(cname, ctype);
END WHILE;
SET COPY_INTO_STMT = (COPY_INTO_STMT || ') FROM STDIN USING DELIMITERS
''|'',E''\\n'',''"'';');
- SET SELECT_DATA_STMT = SELECT_DATA_STMT || ' FROM ' || sys.FQN(sch,
tbl);
+ SET SELECT_DATA_STMT = SELECT_DATA_STMT || ' FROM ' || sys.FQN(sch, tbl);
insert into sys.dump_statements VALUES ((SELECT COUNT(*) FROM
sys.dump_statements) + 1, COPY_INTO_STMT);
CALL sys.EVAL('INSERT INTO sys.dump_statements ' || SELECT_DATA_STMT ||
';');
END IF;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -288,9 +288,9 @@ CREATE VIEW sys.dump_create_roles AS
AND grantor <> 0;
CREATE VIEW sys.dump_create_users AS
SELECT
- 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED PASSWORD ' ||
+ 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED PASSWORD ' ||
sys.sq(sys.password_hash(ui.name)) ||
- ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys;' stmt,
+ ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys' ||
ifthenelse(ui.schema_path = '"sys"', '', ' SCHEMA PATH ' ||
sys.sq(ui.schema_path)) || ';' stmt,
ui.name user_name
FROM sys.db_user_info ui, sys.schemas s
WHERE ui.default_schema = s.id
@@ -298,7 +298,7 @@ CREATE VIEW sys.dump_create_users AS
AND ui.name <> '.snapshot';
CREATE VIEW sys.dump_create_schemas AS
SELECT
- 'CREATE SCHEMA ' || sys.dq(s.name) || ifthenelse(a.name <> 'sysadmin', '
AUTHORIZATION ' || sys.dq(a.name), ' ') || ';' stmt,
+ 'CREATE SCHEMA ' || sys.dq(s.name) || ifthenelse(a.name <> 'sysadmin', '
AUTHORIZATION ' || sys.dq(a.name), ' ') || ';' stmt,
s.name schema_name
FROM sys.schemas s, sys.auths a
WHERE s.authorization = a.id AND s.system = FALSE;
@@ -458,7 +458,7 @@ CREATE VIEW sys.dump_sequences AS
FROM sys.describe_sequences;
CREATE VIEW sys.dump_start_sequences AS
SELECT
- 'UPDATE sys.sequences seq SET start = ' || s ||
+ 'UPDATE sys.sequences seq SET start = ' || s ||
' WHERE name = ' || sys.SQ(seq) ||
' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = ' ||
sys.SQ(sch) || ');' stmt,
sch schema_name,
@@ -518,7 +518,7 @@ BEGIN
DECLARE _cnt INT;
SET _cnt = (SELECT count FROM sys.storage(sch, tbl, cname));
IF _cnt > 0 THEN
- SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' ||
sys.FQN(sch, tbl) || '(' || sys.DQ(cname);
+ SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' || sys.FQN(sch,
tbl) || '(' || sys.DQ(cname);
DECLARE SELECT_DATA_STMT STRING;
SET SELECT_DATA_STMT = 'SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), ' || sys.prepare_esc(cname, ctype);
DECLARE M INT;
@@ -531,7 +531,7 @@ BEGIN
SET SELECT_DATA_STMT = SELECT_DATA_STMT || '|| ''|'' || ' ||
sys.prepare_esc(cname, ctype);
END WHILE;
SET COPY_INTO_STMT = (COPY_INTO_STMT || ') FROM STDIN USING DELIMITERS
''|'',E''\\n'',''"'';');
- SET SELECT_DATA_STMT = SELECT_DATA_STMT || ' FROM ' || sys.FQN(sch,
tbl);
+ SET SELECT_DATA_STMT = SELECT_DATA_STMT || ' FROM ' || sys.FQN(sch, tbl);
insert into sys.dump_statements VALUES ((SELECT COUNT(*) FROM
sys.dump_statements) + 1, COPY_INTO_STMT);
CALL sys.EVAL('INSERT INTO sys.dump_statements ' || SELECT_DATA_STMT ||
';');
END IF;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -288,9 +288,9 @@ CREATE VIEW sys.dump_create_roles AS
AND grantor <> 0;
CREATE VIEW sys.dump_create_users AS
SELECT
- 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED PASSWORD ' ||
+ 'CREATE USER ' || sys.dq(ui.name) || ' WITH ENCRYPTED PASSWORD ' ||
sys.sq(sys.password_hash(ui.name)) ||
- ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys;' stmt,
+ ' NAME ' || sys.sq(ui.fullname) || ' SCHEMA sys' ||
ifthenelse(ui.schema_path = '"sys"', '', ' SCHEMA PATH ' ||
sys.sq(ui.schema_path)) || ';' stmt,
ui.name user_name
FROM sys.db_user_info ui, sys.schemas s
WHERE ui.default_schema = s.id
@@ -298,7 +298,7 @@ CREATE VIEW sys.dump_create_users AS
AND ui.name <> '.snapshot';
CREATE VIEW sys.dump_create_schemas AS
SELECT
- 'CREATE SCHEMA ' || sys.dq(s.name) || ifthenelse(a.name <> 'sysadmin', '
AUTHORIZATION ' || sys.dq(a.name), ' ') || ';' stmt,
+ 'CREATE SCHEMA ' || sys.dq(s.name) || ifthenelse(a.name <> 'sysadmin', '
AUTHORIZATION ' || sys.dq(a.name), ' ') || ';' stmt,
s.name schema_name
FROM sys.schemas s, sys.auths a
WHERE s.authorization = a.id AND s.system = FALSE;
@@ -458,7 +458,7 @@ CREATE VIEW sys.dump_sequences AS
FROM sys.describe_sequences;
CREATE VIEW sys.dump_start_sequences AS
SELECT
- 'UPDATE sys.sequences seq SET start = ' || s ||
+ 'UPDATE sys.sequences seq SET start = ' || s ||
' WHERE name = ' || sys.SQ(seq) ||
' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = ' ||
sys.SQ(sch) || ');' stmt,
sch schema_name,
@@ -518,7 +518,7 @@ BEGIN
DECLARE _cnt INT;
SET _cnt = (SELECT count FROM sys.storage(sch, tbl, cname));
IF _cnt > 0 THEN
- SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' ||
sys.FQN(sch, tbl) || '(' || sys.DQ(cname);
+ SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' || sys.FQN(sch,
tbl) || '(' || sys.DQ(cname);
DECLARE SELECT_DATA_STMT STRING;
SET SELECT_DATA_STMT = 'SELECT (SELECT COUNT(*) FROM
sys.dump_statements) + RANK() OVER(), ' || sys.prepare_esc(cname, ctype);
DECLARE M INT;
@@ -531,7 +531,7 @@ BEGIN
SET SELECT_DATA_STMT = SELECT_DATA_STMT || '|| ''|'' || ' ||
sys.prepare_esc(cname, ctype);
END WHILE;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
