Changeset: 390850340c7c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/390850340c7c
Modified Files:
        
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
        sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
        sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
        sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
        
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
        sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
        sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit
        sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
        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/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
        sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
        sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.32bit
        sql/test/testdb-previous-upgrade/Tests/upgrade.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:

Approve upgrade.


diffs (truncated from 3724 to 300 lines):

diff --git 
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- 
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ 
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -4088,6 +4088,8 @@ update sys.functions set system = true w
 
 Running database upgrade commands:
 drop function sys.dump_database(boolean);
+drop procedure sys.dump_table_data();
+drop procedure sys.dump_table_data(string, string);
 drop view sys.dump_partition_tables;
 drop view sys.describe_partition_tables;
 drop view sys.dump_sequences;
@@ -4183,14 +4185,65 @@ CREATE VIEW sys.dump_start_sequences AS
     sch schema_name,
     seq sequence_name
     FROM sys.describe_sequences;
+CREATE PROCEDURE sys.dump_table_data(sch STRING, tbl STRING)
+BEGIN
+  DECLARE tid INT;
+  SET tid = (SELECT MIN(t.id) FROM sys.tables t, sys.schemas s WHERE t.name = 
tbl AND t.schema_id = s.id AND s.name = sch);
+  IF tid IS NOT NULL THEN
+    DECLARE k INT;
+    DECLARE m INT;
+    SET k = (SELECT MIN(c.id) FROM sys.columns c WHERE c.table_id = tid);
+    SET m = (SELECT MAX(c.id) FROM sys.columns c WHERE c.table_id = tid);
+    IF k IS NOT NULL AND m IS NOT NULL THEN
+      DECLARE cname STRING;
+      DECLARE ctype STRING;
+      DECLARE _cnt INT;
+      SET cname = (SELECT c.name FROM sys.columns c WHERE c.id = k);
+      SET ctype = (SELECT c.type FROM sys.columns c WHERE c.id = k);
+      SET _cnt = (SELECT count FROM sys.storage(sch, tbl, cname));
+      IF _cnt > 0 THEN
+        DECLARE COPY_INTO_STMT STRING;
+        DECLARE SELECT_DATA_STMT STRING;
+        SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' || 
sys.FQN(sch, tbl) || '(' || sys.DQ(cname);
+        SET SELECT_DATA_STMT = 'SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(), ' || sys.prepare_esc(cname, ctype);
+        WHILE (k < m) DO
+          SET k = (SELECT MIN(c.id) FROM sys.columns c WHERE c.table_id = tid 
AND c.id > k);
+          SET cname = (SELECT c.name FROM sys.columns c WHERE c.id = k);
+          SET ctype = (SELECT c.type FROM sys.columns c WHERE c.id = k);
+          SET COPY_INTO_STMT = (COPY_INTO_STMT || ', ' || sys.DQ(cname));
+          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));
+        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;
+    END IF;
+  END IF;
+END;
+CREATE PROCEDURE sys.dump_table_data()
+BEGIN
+  DECLARE i INT;
+  SET i = (SELECT MIN(t.id) FROM sys.tables t, sys.table_types ts WHERE t.type 
= ts.table_type_id AND ts.table_type_name = 'TABLE' AND NOT t.system);
+  IF i IS NOT NULL THEN
+    DECLARE M INT;
+    SET M = (SELECT MAX(t.id) FROM sys.tables t, sys.table_types ts WHERE 
t.type = ts.table_type_id AND ts.table_type_name = 'TABLE' AND NOT t.system);
+    DECLARE sch STRING;
+    DECLARE tbl STRING;
+    WHILE i IS NOT NULL AND i <= M DO
+      SET sch = (SELECT s.name FROM sys.tables t, sys.schemas s WHERE s.id = 
t.schema_id AND t.id = i);
+      SET tbl = (SELECT t.name FROM sys.tables t, sys.schemas s WHERE s.id = 
t.schema_id AND t.id = i);
+      CALL sys.dump_table_data(sch, tbl);
+      SET i = (SELECT MIN(t.id) FROM sys.tables t, sys.table_types ts WHERE 
t.type = ts.table_type_id AND ts.table_type_name = 'TABLE' AND NOT t.system AND 
t.id > i);
+    END WHILE;
+  END IF;
+END;
 CREATE FUNCTION sys.dump_database(describe BOOLEAN) RETURNS TABLE(o int, stmt 
STRING)
 BEGIN
-
 SET SCHEMA sys;
 TRUNCATE sys.dump_statements;
-
 INSERT INTO sys.dump_statements VALUES (1, 'START TRANSACTION;');
-INSERT INTO sys.dump_statements VALUES ((SELECT COUNT(*) FROM 
sys.dump_statements) + 1, 'SET SCHEMA "sys";');
+INSERT INTO sys.dump_statements VALUES (2, 'SET SCHEMA "sys";');
 INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_create_roles;
 INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_create_users;
 INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_create_schemas;
@@ -4203,7 +4256,7 @@ INSERT INTO sys.dump_statements SELECT (
 INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(ORDER BY stmts.o), stmts.s
                                        FROM (
                                        SELECT f.o, f.stmt FROM 
sys.dump_functions f
-                                       UNION
+                                       UNION ALL
                                        SELECT t.o, t.stmt FROM sys.dump_tables 
t
                                        ) AS stmts(o, s);
 
@@ -4233,6 +4286,7 @@ INSERT INTO sys.dump_statements VALUES (
 RETURN sys.dump_statements;
 END;
 update sys._tables set system = true where name in 
('describe_partition_tables', 'dump_partition_tables', 'dump_sequences', 
'dump_start_sequences') AND schema_id = 2000;
+update sys.functions set system = true where system <> true and name in 
('dump_table_data') and schema_id = 2000 and type = 2;
 update sys.functions set system = true where system <> true and name in 
('dump_database') and schema_id = 2000 and type = 5;
 CREATE function sys.url_extract_host(url string, no_www bool) RETURNS STRING
 EXTERNAL NAME url."extractURLHost";
diff --git 
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
 
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
--- 
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
+++ 
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
@@ -4088,6 +4088,8 @@ update sys.functions set system = true w
 
 Running database upgrade commands:
 drop function sys.dump_database(boolean);
+drop procedure sys.dump_table_data();
+drop procedure sys.dump_table_data(string, string);
 drop view sys.dump_partition_tables;
 drop view sys.describe_partition_tables;
 drop view sys.dump_sequences;
@@ -4183,14 +4185,65 @@ CREATE VIEW sys.dump_start_sequences AS
     sch schema_name,
     seq sequence_name
     FROM sys.describe_sequences;
+CREATE PROCEDURE sys.dump_table_data(sch STRING, tbl STRING)
+BEGIN
+  DECLARE tid INT;
+  SET tid = (SELECT MIN(t.id) FROM sys.tables t, sys.schemas s WHERE t.name = 
tbl AND t.schema_id = s.id AND s.name = sch);
+  IF tid IS NOT NULL THEN
+    DECLARE k INT;
+    DECLARE m INT;
+    SET k = (SELECT MIN(c.id) FROM sys.columns c WHERE c.table_id = tid);
+    SET m = (SELECT MAX(c.id) FROM sys.columns c WHERE c.table_id = tid);
+    IF k IS NOT NULL AND m IS NOT NULL THEN
+      DECLARE cname STRING;
+      DECLARE ctype STRING;
+      DECLARE _cnt INT;
+      SET cname = (SELECT c.name FROM sys.columns c WHERE c.id = k);
+      SET ctype = (SELECT c.type FROM sys.columns c WHERE c.id = k);
+      SET _cnt = (SELECT count FROM sys.storage(sch, tbl, cname));
+      IF _cnt > 0 THEN
+        DECLARE COPY_INTO_STMT STRING;
+        DECLARE SELECT_DATA_STMT STRING;
+        SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' || 
sys.FQN(sch, tbl) || '(' || sys.DQ(cname);
+        SET SELECT_DATA_STMT = 'SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(), ' || sys.prepare_esc(cname, ctype);
+        WHILE (k < m) DO
+          SET k = (SELECT MIN(c.id) FROM sys.columns c WHERE c.table_id = tid 
AND c.id > k);
+          SET cname = (SELECT c.name FROM sys.columns c WHERE c.id = k);
+          SET ctype = (SELECT c.type FROM sys.columns c WHERE c.id = k);
+          SET COPY_INTO_STMT = (COPY_INTO_STMT || ', ' || sys.DQ(cname));
+          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));
+        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;
+    END IF;
+  END IF;
+END;
+CREATE PROCEDURE sys.dump_table_data()
+BEGIN
+  DECLARE i INT;
+  SET i = (SELECT MIN(t.id) FROM sys.tables t, sys.table_types ts WHERE t.type 
= ts.table_type_id AND ts.table_type_name = 'TABLE' AND NOT t.system);
+  IF i IS NOT NULL THEN
+    DECLARE M INT;
+    SET M = (SELECT MAX(t.id) FROM sys.tables t, sys.table_types ts WHERE 
t.type = ts.table_type_id AND ts.table_type_name = 'TABLE' AND NOT t.system);
+    DECLARE sch STRING;
+    DECLARE tbl STRING;
+    WHILE i IS NOT NULL AND i <= M DO
+      SET sch = (SELECT s.name FROM sys.tables t, sys.schemas s WHERE s.id = 
t.schema_id AND t.id = i);
+      SET tbl = (SELECT t.name FROM sys.tables t, sys.schemas s WHERE s.id = 
t.schema_id AND t.id = i);
+      CALL sys.dump_table_data(sch, tbl);
+      SET i = (SELECT MIN(t.id) FROM sys.tables t, sys.table_types ts WHERE 
t.type = ts.table_type_id AND ts.table_type_name = 'TABLE' AND NOT t.system AND 
t.id > i);
+    END WHILE;
+  END IF;
+END;
 CREATE FUNCTION sys.dump_database(describe BOOLEAN) RETURNS TABLE(o int, stmt 
STRING)
 BEGIN
-
 SET SCHEMA sys;
 TRUNCATE sys.dump_statements;
-
 INSERT INTO sys.dump_statements VALUES (1, 'START TRANSACTION;');
-INSERT INTO sys.dump_statements VALUES ((SELECT COUNT(*) FROM 
sys.dump_statements) + 1, 'SET SCHEMA "sys";');
+INSERT INTO sys.dump_statements VALUES (2, 'SET SCHEMA "sys";');
 INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_create_roles;
 INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_create_users;
 INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_create_schemas;
@@ -4203,7 +4256,7 @@ INSERT INTO sys.dump_statements SELECT (
 INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(ORDER BY stmts.o), stmts.s
                                        FROM (
                                        SELECT f.o, f.stmt FROM 
sys.dump_functions f
-                                       UNION
+                                       UNION ALL
                                        SELECT t.o, t.stmt FROM sys.dump_tables 
t
                                        ) AS stmts(o, s);
 
@@ -4233,6 +4286,7 @@ INSERT INTO sys.dump_statements VALUES (
 RETURN sys.dump_statements;
 END;
 update sys._tables set system = true where name in 
('describe_partition_tables', 'dump_partition_tables', 'dump_sequences', 
'dump_start_sequences') AND schema_id = 2000;
+update sys.functions set system = true where system <> true and name in 
('dump_table_data') and schema_id = 2000 and type = 2;
 update sys.functions set system = true where system <> true and name in 
('dump_database') and schema_id = 2000 and type = 5;
 CREATE function sys.url_extract_host(url string, no_www bool) RETURNS STRING
 EXTERNAL NAME url."extractURLHost";
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out 
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -3741,6 +3741,8 @@ update sys.functions set system = true w
 
 Running database upgrade commands:
 drop function sys.dump_database(boolean);
+drop procedure sys.dump_table_data();
+drop procedure sys.dump_table_data(string, string);
 drop view sys.dump_partition_tables;
 drop view sys.describe_partition_tables;
 drop view sys.dump_sequences;
@@ -3836,14 +3838,65 @@ CREATE VIEW sys.dump_start_sequences AS
     sch schema_name,
     seq sequence_name
     FROM sys.describe_sequences;
+CREATE PROCEDURE sys.dump_table_data(sch STRING, tbl STRING)
+BEGIN
+  DECLARE tid INT;
+  SET tid = (SELECT MIN(t.id) FROM sys.tables t, sys.schemas s WHERE t.name = 
tbl AND t.schema_id = s.id AND s.name = sch);
+  IF tid IS NOT NULL THEN
+    DECLARE k INT;
+    DECLARE m INT;
+    SET k = (SELECT MIN(c.id) FROM sys.columns c WHERE c.table_id = tid);
+    SET m = (SELECT MAX(c.id) FROM sys.columns c WHERE c.table_id = tid);
+    IF k IS NOT NULL AND m IS NOT NULL THEN
+      DECLARE cname STRING;
+      DECLARE ctype STRING;
+      DECLARE _cnt INT;
+      SET cname = (SELECT c.name FROM sys.columns c WHERE c.id = k);
+      SET ctype = (SELECT c.type FROM sys.columns c WHERE c.id = k);
+      SET _cnt = (SELECT count FROM sys.storage(sch, tbl, cname));
+      IF _cnt > 0 THEN
+        DECLARE COPY_INTO_STMT STRING;
+        DECLARE SELECT_DATA_STMT STRING;
+        SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' || 
sys.FQN(sch, tbl) || '(' || sys.DQ(cname);
+        SET SELECT_DATA_STMT = 'SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(), ' || sys.prepare_esc(cname, ctype);
+        WHILE (k < m) DO
+          SET k = (SELECT MIN(c.id) FROM sys.columns c WHERE c.table_id = tid 
AND c.id > k);
+          SET cname = (SELECT c.name FROM sys.columns c WHERE c.id = k);
+          SET ctype = (SELECT c.type FROM sys.columns c WHERE c.id = k);
+          SET COPY_INTO_STMT = (COPY_INTO_STMT || ', ' || sys.DQ(cname));
+          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));
+        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;
+    END IF;
+  END IF;
+END;
+CREATE PROCEDURE sys.dump_table_data()
+BEGIN
+  DECLARE i INT;
+  SET i = (SELECT MIN(t.id) FROM sys.tables t, sys.table_types ts WHERE t.type 
= ts.table_type_id AND ts.table_type_name = 'TABLE' AND NOT t.system);
+  IF i IS NOT NULL THEN
+    DECLARE M INT;
+    SET M = (SELECT MAX(t.id) FROM sys.tables t, sys.table_types ts WHERE 
t.type = ts.table_type_id AND ts.table_type_name = 'TABLE' AND NOT t.system);
+    DECLARE sch STRING;
+    DECLARE tbl STRING;
+    WHILE i IS NOT NULL AND i <= M DO
+      SET sch = (SELECT s.name FROM sys.tables t, sys.schemas s WHERE s.id = 
t.schema_id AND t.id = i);
+      SET tbl = (SELECT t.name FROM sys.tables t, sys.schemas s WHERE s.id = 
t.schema_id AND t.id = i);
+      CALL sys.dump_table_data(sch, tbl);
+      SET i = (SELECT MIN(t.id) FROM sys.tables t, sys.table_types ts WHERE 
t.type = ts.table_type_id AND ts.table_type_name = 'TABLE' AND NOT t.system AND 
t.id > i);
+    END WHILE;
+  END IF;
+END;
 CREATE FUNCTION sys.dump_database(describe BOOLEAN) RETURNS TABLE(o int, stmt 
STRING)
 BEGIN
-
 SET SCHEMA sys;
 TRUNCATE sys.dump_statements;
-
 INSERT INTO sys.dump_statements VALUES (1, 'START TRANSACTION;');
-INSERT INTO sys.dump_statements VALUES ((SELECT COUNT(*) FROM 
sys.dump_statements) + 1, 'SET SCHEMA "sys";');
+INSERT INTO sys.dump_statements VALUES (2, 'SET SCHEMA "sys";');
 INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_create_roles;
 INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_create_users;
 INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(), stmt FROM sys.dump_create_schemas;
@@ -3856,7 +3909,7 @@ INSERT INTO sys.dump_statements SELECT (
 INSERT INTO sys.dump_statements SELECT (SELECT COUNT(*) FROM 
sys.dump_statements) + RANK() OVER(ORDER BY stmts.o), stmts.s
                                        FROM (
                                        SELECT f.o, f.stmt FROM 
sys.dump_functions f
-                                       UNION
+                                       UNION ALL
                                        SELECT t.o, t.stmt FROM sys.dump_tables 
t
                                        ) AS stmts(o, s);
 
@@ -3886,6 +3939,7 @@ INSERT INTO sys.dump_statements VALUES (
 RETURN sys.dump_statements;
 END;
 update sys._tables set system = true where name in 
('describe_partition_tables', 'dump_partition_tables', 'dump_sequences', 
'dump_start_sequences') AND schema_id = 2000;
+update sys.functions set system = true where system <> true and name in 
('dump_table_data') and schema_id = 2000 and type = 2;
 update sys.functions set system = true where system <> true and name in 
('dump_database') and schema_id = 2000 and type = 5;
 CREATE function sys.url_extract_host(url string, no_www bool) RETURNS STRING
 EXTERNAL NAME url."extractURLHost";
diff --git 
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit 
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -3741,6 +3741,8 @@ update sys.functions set system = true w
 
 Running database upgrade commands:
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to