Changeset: 919fcb27bd36 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/919fcb27bd36
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/scripts/21_dependency_views.sql
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.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.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.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.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.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.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.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.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.int128
Branch: ustr
Log Message:
Added USTR dependency type to sys.dependency_types table.
diffs (truncated from 425 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
@@ -5525,6 +5525,30 @@ sql_update_default(Client c, mvc *sql, s
}
}
res_table_destroy(output);
+ if (err != MAL_SUCCEED)
+ return err;
+
+ if ((err = SQLstatementIntern(c, "select dependency_type_id from
sys.dependency_types where dependency_type_name = 'USTR';\n", "update", true,
false, &output)))
+ return err;
+ if ((b = BBPquickdesc(output->cols[0].b)) && BATcount(b) == 0) {
+ static const char query1[] =
+ "ALTER TABLE sys.dependency_types SET READ WRITE;\n"
+ "COMMIT;\n";
+ static const char query2[] =
+ "INSERT INTO sys.dependency_types VALUES (16,
'USTR');\n"
+ "COMMIT;\n";
+ static const char query3[] = "ALTER TABLE sys.dependency_types
SET READ ONLY;\n";
+ printf("Running database upgrade commands:\n%s%s%s\n", query1,
query2, query3);
+ fflush(stdout);
+ err = SQLstatementIntern(c, query1, "update", true, false,
NULL);
+ if (err == MAL_SUCCEED) {
+ err = SQLstatementIntern(c, query2, "update", true,
false, NULL);
+ if (err == MAL_SUCCEED) {
+ err = SQLstatementIntern(c, query3, "update",
true, false, NULL);
+ }
+ }
+ }
+ res_table_destroy(output);
return err;
}
diff --git a/sql/scripts/21_dependency_views.sql
b/sql/scripts/21_dependency_views.sql
--- a/sql/scripts/21_dependency_views.sql
+++ b/sql/scripts/21_dependency_views.sql
@@ -39,7 +39,7 @@ CREATE TABLE sys.dependency_types (
dependency_type_id SMALLINT NOT NULL PRIMARY KEY,
dependency_type_name VARCHAR(15) NOT NULL UNIQUE);
--- Values taken from sql/include/sql_catalog.h see: #define SCHEMA_DEPENDENCY
1, TABLE_DEPENDENCY 2, ..., TYPE_DEPENDENCY 15.
+-- Values taken from sql/include/sql_catalog.h see: #define SCHEMA_DEPENDENCY
1, TABLE_DEPENDENCY 2, ..., USTR_DEPENDENCY 16.
INSERT INTO sys.dependency_types (dependency_type_id, dependency_type_name)
VALUES
(1, 'SCHEMA'),
(2, 'TABLE'),
@@ -55,7 +55,8 @@ INSERT INTO sys.dependency_types (depend
(12, 'SEQUENCE'),
(13, 'PROCEDURE'),
(14, 'BE_DROPPED'),
- (15, 'TYPE');
+ (15, 'TYPE'),
+ (16, 'USTR');
ALTER TABLE sys.dependency_types SET READ ONLY;
GRANT SELECT ON sys.dependency_types TO PUBLIC;
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
@@ -375,3 +375,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
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
@@ -375,3 +375,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -460,3 +460,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
diff --git
a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -377,3 +377,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
@@ -377,3 +377,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -460,3 +460,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
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
@@ -92,3 +92,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
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
@@ -92,3 +92,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -177,3 +177,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -92,3 +92,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -92,3 +92,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
@@ -177,3 +177,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -5632,6 +5632,7 @@ select 'null in fkeys.delete_action', de
[ "sys.dependency_types", 13, "PROCEDURE" ]
[ "sys.dependency_types", 14, "BE_DROPPED" ]
[ "sys.dependency_types", 15, "TYPE" ]
+[ "sys.dependency_types", 16, "USTR" ]
% .%2, sys.%1, sys.schemas # table_name
% %2, %1, id # name
% varchar, bigint, int # type
diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit
b/sql/test/emptydb/Tests/check.stable.out.32bit
--- a/sql/test/emptydb/Tests/check.stable.out.32bit
+++ b/sql/test/emptydb/Tests/check.stable.out.32bit
@@ -5632,6 +5632,7 @@ select 'null in fkeys.delete_action', de
[ "sys.dependency_types", 13, "PROCEDURE" ]
[ "sys.dependency_types", 14, "BE_DROPPED" ]
[ "sys.dependency_types", 15, "TYPE" ]
+[ "sys.dependency_types", 16, "USTR" ]
% .%2, sys.%1, sys.schemas # table_name
% %2, %1, id # name
% varchar, bigint, int # type
diff --git a/sql/test/emptydb/Tests/check.stable.out.int128
b/sql/test/emptydb/Tests/check.stable.out.int128
--- a/sql/test/emptydb/Tests/check.stable.out.int128
+++ b/sql/test/emptydb/Tests/check.stable.out.int128
@@ -5775,6 +5775,7 @@ select 'null in fkeys.delete_action', de
[ "sys.dependency_types", 13, "PROCEDURE" ]
[ "sys.dependency_types", 14, "BE_DROPPED" ]
[ "sys.dependency_types", 15, "TYPE" ]
+[ "sys.dependency_types", 16, "USTR" ]
% .%2, sys.%1, sys.schemas # table_name
% %2, %1, id # name
% varchar, bigint, int # type
diff --git
a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -375,3 +375,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -375,3 +375,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
diff --git
a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -460,3 +460,10 @@ INSERT INTO sys.function_types VALUES (8
COMMIT;
ALTER TABLE sys.function_types SET READ ONLY;
+Running database upgrade commands:
+ALTER TABLE sys.dependency_types SET READ WRITE;
+COMMIT;
+INSERT INTO sys.dependency_types VALUES (16, 'USTR');
+COMMIT;
+ALTER TABLE sys.dependency_types SET READ ONLY;
+
diff --git
a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
