Changeset: 9f4575cc8caa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9f4575cc8caa
Modified Files:
sql/backends/monet5/sql_upgrades.c
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: Jan2022-strimps-integration
Log Message:
Fix up strimps upgrade code.
diffs (truncated from 679 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
@@ -3323,6 +3323,32 @@ sql_update_jan2022(Client c, mvc *sql, c
sql_schema *s = mvc_bind_schema(sql, "sys");
sql_table *t;
+ /* this bit of code is to upgrade from a Jan2022 RC to the Jan2022
release */
+ sql_allocator *old_sa = sql->sa;
+ if ((sql->sa = sa_create(sql->pa)) != NULL) {
+ list *l;
+ if ((l = sa_list(sql->sa)) != NULL) {
+ sql_find_subtype(&tp, "varchar", 0, 0);
+ list_append(l, &tp);
+ list_append(l, &tp);
+ list_append(l, &tp);
+ if (sql_bind_func_(sql, s->base.name, "strimp_create",
l, F_PROC)) {
+ /* do the upgrade by removing the two functions
*/
+ const char *query =
+ "drop filter function
sys.strimp_filter(string, string);\n"
+ "drop procedure
sys.strimp_create(string, string, string);\n";
+ printf("Running database upgrade
commands:\n%s\n", query);
+ err = SQLstatementIntern(c, query, "update",
true, false, NULL);
+ }
+ sql->session->status = 0; /* if the function was not
found clean the error */
+ sql->errstr[0] = '\0';
+ }
+ sa_destroy(sql->sa);
+ if (err)
+ return err;
+ }
+ sql->sa = old_sa;
+
sql_find_subtype(&tp, "bigint", 0, 0);
if (!sql_bind_func(sql, s->base.name, "epoch", &tp, NULL, F_FUNC)) {
sql->session->status = 0; /* if the function was not found
clean the error */
@@ -3331,13 +3357,13 @@ sql_update_jan2022(Client c, mvc *sql, c
return NULL;
}
- if ((buf = GDKmalloc(bufsize)) == NULL)
- throw(SQL, __func__, SQLSTATE(HY013) MAL_MALLOC_FAIL);
-
if (!*systabfixed && (err = sql_fix_system_tables(c, sql, prev_schema))
!= NULL)
return err;
*systabfixed = true;
+ if ((buf = GDKmalloc(bufsize)) == NULL)
+ throw(SQL, __func__, SQLSTATE(HY013) MAL_MALLOC_FAIL);
+
pos = snprintf(buf, bufsize, "set schema \"sys\";\n");
/* sys.epoch_ms now returns a decimal(18,3) */
@@ -4200,17 +4226,6 @@ sql_update_jan2022(Client c, mvc *sql, c
pos += snprintf(buf + pos, bufsize - pos,
"update sys._tables set system = true
where name in ('fkey_actions', 'fkeys') AND schema_id = 2000;\n");
- /* 90_strimps.sql */
- pos += snprintf(buf + pos, bufsize - pos,
- "CREATE FILTER FUNCTION
sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME strimps.strimpfilter;\n"
- "GRANT EXECUTE ON FILTER FUNCTION
sys.strimp_filter TO PUBLIC;\n"
- "CREATE PROCEDURE sys.strimp_create(sch
string, tab string, col string)\n"
- " EXTERNAL NAME sql.createstrimps;\n");
- pos += snprintf(buf + pos, bufsize - pos,
- "update sys.functions set system = true
where system <> true and name = 'strimp_filter' and schema_id = 2000 and type =
%d;\n"
- "update sys.functions set system = true
where system <> true and name = 'strimp_create' and schema_id = 2000 and type =
%d;\n",
- F_FILT, F_PROC);
-
/* recreate SQL functions that just need to be recompiled since the
* MAL functions's "unsafe" property was changed */
sql_schema *lg = mvc_bind_schema(sql, "logging");
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
@@ -5866,12 +5866,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
-update sys.functions set system = true where system <> true and name =
'strimp_filter' and schema_id = 2000 and type = 4;
-update sys.functions set system = true where system <> true and name =
'strimp_create' and schema_id = 2000 and type = 2;
drop view logging.compinfo;
drop function logging.compinfo;
drop procedure sys.storagemodelinit();
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
@@ -5866,12 +5866,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
-update sys.functions set system = true where system <> true and name =
'strimp_filter' and schema_id = 2000 and type = 4;
-update sys.functions set system = true where system <> true and name =
'strimp_create' and schema_id = 2000 and type = 2;
drop view logging.compinfo;
drop function logging.compinfo;
drop procedure sys.storagemodelinit();
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
@@ -5271,12 +5271,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
-update sys.functions set system = true where system <> true and name =
'strimp_filter' and schema_id = 2000 and type = 4;
-update sys.functions set system = true where system <> true and name =
'strimp_create' and schema_id = 2000 and type = 2;
drop view logging.compinfo;
drop function logging.compinfo;
drop procedure sys.storagemodelinit();
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
@@ -5271,12 +5271,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
-update sys.functions set system = true where system <> true and name =
'strimp_filter' and schema_id = 2000 and type = 4;
-update sys.functions set system = true where system <> true and name =
'strimp_create' and schema_id = 2000 and type = 2;
drop view logging.compinfo;
drop function logging.compinfo;
drop procedure sys.storagemodelinit();
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
@@ -5937,12 +5937,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
-update sys.functions set system = true where system <> true and name =
'strimp_filter' and schema_id = 2000 and type = 4;
-update sys.functions set system = true where system <> true and name =
'strimp_create' and schema_id = 2000 and type = 2;
drop view logging.compinfo;
drop function logging.compinfo;
drop procedure sys.storagemodelinit();
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
@@ -5271,12 +5271,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
-update sys.functions set system = true where system <> true and name =
'strimp_filter' and schema_id = 2000 and type = 4;
-update sys.functions set system = true where system <> true and name =
'strimp_create' and schema_id = 2000 and type = 2;
drop view logging.compinfo;
drop function logging.compinfo;
drop procedure sys.storagemodelinit();
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
---
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
+++
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
@@ -5937,12 +5937,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
-update sys.functions set system = true where system <> true and name =
'strimp_filter' and schema_id = 2000 and type = 4;
-update sys.functions set system = true where system <> true and name =
'strimp_create' and schema_id = 2000 and type = 2;
drop view logging.compinfo;
drop function logging.compinfo;
drop procedure sys.storagemodelinit();
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
@@ -5866,12 +5866,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
-update sys.functions set system = true where system <> true and name =
'strimp_filter' and schema_id = 2000 and type = 4;
-update sys.functions set system = true where system <> true and name =
'strimp_create' and schema_id = 2000 and type = 2;
drop view logging.compinfo;
drop function logging.compinfo;
drop procedure sys.storagemodelinit();
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
@@ -5271,12 +5271,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
-update sys.functions set system = true where system <> true and name =
'strimp_filter' and schema_id = 2000 and type = 4;
-update sys.functions set system = true where system <> true and name =
'strimp_create' and schema_id = 2000 and type = 2;
drop view logging.compinfo;
drop function logging.compinfo;
drop procedure sys.storagemodelinit();
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit
@@ -5271,12 +5271,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
-update sys.functions set system = true where system <> true and name =
'strimp_filter' and schema_id = 2000 and type = 4;
-update sys.functions set system = true where system <> true and name =
'strimp_create' and schema_id = 2000 and type = 2;
drop view logging.compinfo;
drop function logging.compinfo;
drop procedure sys.storagemodelinit();
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
@@ -5937,12 +5937,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
-update sys.functions set system = true where system <> true and name =
'strimp_filter' and schema_id = 2000 and type = 4;
-update sys.functions set system = true where system <> true and name =
'strimp_create' and schema_id = 2000 and type = 2;
drop view logging.compinfo;
drop function logging.compinfo;
drop procedure sys.storagemodelinit();
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
@@ -4893,12 +4893,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
-update sys.functions set system = true where system <> true and name =
'strimp_filter' and schema_id = 2000 and type = 4;
-update sys.functions set system = true where system <> true and name =
'strimp_create' and schema_id = 2000 and type = 2;
drop view logging.compinfo;
drop function logging.compinfo;
drop procedure sys.storagemodelinit();
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
@@ -4893,12 +4893,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
-update sys.functions set system = true where system <> true and name =
'strimp_filter' and schema_id = 2000 and type = 4;
-update sys.functions set system = true where system <> true and name =
'strimp_create' and schema_id = 2000 and type = 2;
drop view logging.compinfo;
drop function logging.compinfo;
drop procedure sys.storagemodelinit();
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
@@ -4298,12 +4298,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
GRANT SELECT ON sys.fkeys TO PUBLIC;
update sys._tables set system = true where name in ('fkey_actions', 'fkeys')
AND schema_id = 2000;
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
-update sys.functions set system = true where system <> true and name =
'strimp_filter' and schema_id = 2000 and type = 4;
-update sys.functions set system = true where system <> true and name =
'strimp_create' and schema_id = 2000 and type = 2;
drop view logging.compinfo;
drop function logging.compinfo;
drop procedure sys.storagemodelinit();
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
@@ -4298,12 +4298,6 @@ JOIN sys.fkey_actions upd ON fks.update_
JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
