Changeset: 4492cf280bf1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4492cf280bf1
Modified Files:
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/test/Dependencies/Tests/dependency_loop.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.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/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.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.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
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
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: Jun2016
Log Message:
Don't store dependencies on built-in functions in dependencies table.
Those functions *have* to be there and cannot be removed, so there is
no need to store these dependencies. Also, it make upgrading easier
since upgrades may change the ID of the internal functions.
diffs (truncated from 830 to 300 lines):
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -252,7 +252,7 @@ id_cmp(int *id1, int *id2)
static list *
cond_append(list *l, int *id)
{
- if (!list_find(l, id, (fcmp) &id_cmp))
+ if (*id >= 2000 && !list_find(l, id, (fcmp) &id_cmp))
list_append(l, id);
return l;
}
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
@@ -1168,6 +1168,7 @@ sql_update_jun2016(Client c, mvc *sql)
schema = strdup(schvar->val.sval);
pos += snprintf(buf + pos, bufsize - pos, "set schema \"sys\";\n");
+ pos += snprintf(buf + pos, bufsize - pos, "delete from sys.dependencies
where id < 2000;\n");
pos += snprintf(buf + pos, bufsize - pos, "delete from sys.types where
id < 2000;\n");
for (n = types->h; n; n = n->next) {
sql_type *t = n->data;
diff --git a/sql/test/Dependencies/Tests/dependency_loop.stable.out
b/sql/test/Dependencies/Tests/dependency_loop.stable.out
--- a/sql/test/Dependencies/Tests/dependency_loop.stable.out
+++ b/sql/test/Dependencies/Tests/dependency_loop.stable.out
@@ -119,7 +119,7 @@ Ready.
% L1 # name
% wrd # type
% 2 # length
-[ 91 ]
+[ 97 ]
# 10:37:19 >
# 10:37:19 > Done.
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
@@ -5215,55 +5215,12 @@ drop function pcre_replace(string, strin
% sys.s1, sys.f1, sys.s2, sys.f2, .dt # table_name
% name, name, name, name, name # name
% varchar, varchar, varchar, varchar, char # type
-% 3, 17, 3, 31, 20 # length
-[ "sys", "=", "sys", "columnsize", "FUNC_DEPENDENCY" ]
-[ "sys", "left_shift", "sys", "columnsize", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "columnsize", "FUNC_DEPENDENCY"
]
-[ "sys", "pi", "sys", "degrees", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_div", "sys", "degrees", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "degrees", "FUNC_DEPENDENCY"
]
-[ "sys", "=", "sys", "dependencies_columns_on_indexes",
"FUNC_DEPENDENCY" ]
-[ "sys", "hash", "sys", "dependencies_columns_on_indexes",
"FUNC_DEPENDENCY" ]
-[ "sys", "rotate_xor_hash", "sys",
"dependencies_columns_on_indexes", "FUNC_DEPENDENCY" ]
-[ "sys", "=", "sys", "dependencies_columns_on_keys",
"FUNC_DEPENDENCY" ]
-[ "sys", "hash", "sys", "dependencies_columns_on_keys",
"FUNC_DEPENDENCY" ]
-[ "sys", "rotate_xor_hash", "sys", "dependencies_columns_on_keys",
"FUNC_DEPENDENCY" ]
-[ "sys", "sql_neg", "sys", "dependencies_columns_on_keys",
"FUNC_DEPENDENCY" ]
-[ "sys", "zero_or_one", "sys", "getproj4", "FUNC_DEPENDENCY"
]
-[ "sys", "=", "sys", "hashsize", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_mul", "sys", "hashsize", "FUNC_DEPENDENCY"
]
-[ "sys", "<>", "sys", "heapsize", "FUNC_DEPENDENCY" ]
-[ "sys", "and", "sys", "heapsize", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_add", "sys", "heapsize", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "heapsize", "FUNC_DEPENDENCY"
]
-[ "sys", "=", "sys", "imprintsize", "FUNC_DEPENDENCY" ]
-[ "sys", "or", "sys", "imprintsize", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_mul", "sys", "imprintsize", "FUNC_DEPENDENCY"
]
-[ "sys", "=", "sys", "ms_round", "FUNC_DEPENDENCY" ]
-[ "sys", "isnull", "sys", "ms_round", "FUNC_DEPENDENCY"
]
+% 3, 17, 3, 13, 20 # length
[ "sys", "ms_trunc", "sys", "ms_round", "FUNC_DEPENDENCY"
]
-[ "sys", "not", "sys", "ms_round", "FUNC_DEPENDENCY" ]
-[ "sys", "or", "sys", "ms_round", "FUNC_DEPENDENCY" ]
-[ "sys", "round", "sys", "ms_round", "FUNC_DEPENDENCY"
]
-[ "sys", "<", "sys", "ms_stuff", "FUNC_DEPENDENCY" ]
-[ "sys", ">", "sys", "ms_stuff", "FUNC_DEPENDENCY" ]
-[ "sys", "concat", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "length", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "or", "sys", "ms_stuff", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_add", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_add", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_sub", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "substring", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "pi", "sys", "radians", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_div", "sys", "radians", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "radians", "FUNC_DEPENDENCY"
]
[ "sys", "st_numgeometries", "sys", "st_numpatches",
"FUNC_DEPENDENCY" ]
[ "sys", "st_geometryn", "sys", "st_patchn", "FUNC_DEPENDENCY"
]
[ "sys", "getproj4", "sys", "st_transform", "FUNC_DEPENDENCY"
]
[ "sys", "internaltransform", "sys", "st_transform",
"FUNC_DEPENDENCY" ]
-[ "sys", "isnull", "sys", "st_transform", "FUNC_DEPENDENCY"
]
-[ "sys", "not", "sys", "st_transform", "FUNC_DEPENDENCY" ]
-[ "sys", "or", "sys", "st_transform", "FUNC_DEPENDENCY" ]
[ "sys", "st_srid", "sys", "st_transform", "FUNC_DEPENDENCY"
]
[ "sys", "columnsize", "sys", "storagemodel", "FUNC_DEPENDENCY"
]
[ "sys", "hashsize", "sys", "storagemodel", "FUNC_DEPENDENCY"
]
@@ -5434,8 +5391,6 @@ drop function pcre_replace(string, strin
[ "sys", "get_type", "sys", "geometry_columns",
"VIEW_DEPENDENCY" ]
[ "sys", "has_m", "sys", "geometry_columns",
"VIEW_DEPENDENCY" ]
[ "sys", "has_z", "sys", "geometry_columns",
"VIEW_DEPENDENCY" ]
-[ "sys", "sql_add", "sys", "geometry_columns",
"VIEW_DEPENDENCY" ]
-[ "sys", "sql_add", "sys", "geometry_columns",
"VIEW_DEPENDENCY" ]
[ "sys", "optimizers", "sys", "optimizers", "VIEW_DEPENDENCY"
]
[ "sys", "querylog_calls", "sys", "querylog_calls",
"VIEW_DEPENDENCY" ]
[ "sys", "querylog_catalog", "sys", "querylog_catalog",
"VIEW_DEPENDENCY" ]
@@ -5446,14 +5401,7 @@ drop function pcre_replace(string, strin
[ "sys", "sessions", "sys", "sessions", "VIEW_DEPENDENCY"
]
[ "sys", "storage", "sys", "storage", "VIEW_DEPENDENCY"
]
[ "sys", "storagemodel", "sys", "storagemodel", "VIEW_DEPENDENCY"
]
-[ "sys", "=", "sys", "tablestoragemodel", "VIEW_DEPENDENCY"
]
-[ "sys", "ifthenelse", "sys", "tablestoragemodel",
"VIEW_DEPENDENCY" ]
-[ "sys", "isnull", "sys", "tablestoragemodel",
"VIEW_DEPENDENCY" ]
-[ "sys", "max", "sys", "tablestoragemodel", "VIEW_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "tablestoragemodel",
"VIEW_DEPENDENCY" ]
[ "sys", "storagemodel", "sys", "tablestoragemodel",
"VIEW_DEPENDENCY" ]
-[ "sys", "sum", "sys", "tablestoragemodel", "VIEW_DEPENDENCY"
]
-[ "sys", "sum", "sys", "tablestoragemodel", "VIEW_DEPENDENCY"
]
[ "sys", "tracelog", "sys", "tracelog", "VIEW_DEPENDENCY"
]
#select s1.name, t1.name, s2.name, t2.name, dt.name from (values (1,
'SCHEMA_DEPENDENCY'), (2, 'TABLE_DEPENDENCY'), (3, 'COLUMN_DEPENDENCY'), (4,
'KEY_DEPENDENCY'), (5, 'VIEW_DEPENDENCY'), (6, 'USER_DEPENDENCY'), (7,
'FUNC_DEPENDENCY'), (8, 'TRIGGER_DEPENDENCY'), (9, 'OWNER_DEPENDENCY'), (10,
'INDEX_DEPENDENCY'), (11, 'FKEY_DEPENDENCY'), (12, 'SEQ_DEPENDENCY'), (13,
'PROC_DEPENDENCY'), (14, 'BEDROPPED_DEPENDENCY'), (15, 'TYPE_DEPENDENCY')) as
dt (id, name), schemas s1, _tables t1, schemas s2, _tables t2, dependencies d
where d.depend_type = dt.id and d.id = t1.id and t1.schema_id = s1.id and
d.depend_id = t2.id and t2.schema_id = s2.id order by s2.name, t2.name,
s1.name, t1.name;
% sys.s1, sys.t1, sys.s2, sys.t2, .dt # table_name
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
@@ -26,6 +26,7 @@ stdout of test 'upgrade` in directory 's
Ready.
Running database upgrade commands:
set schema "sys";
+delete from sys.dependencies where id < 2000;
delete from sys.types where id < 2000;
insert into sys.types values (0, 'void', 'any', 0, 0, 0, 0, 2000);
insert into sys.types values (1, 'bat', 'table', 0, 0, 0, 1, 2000);
diff --git a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
@@ -4829,54 +4829,12 @@ drop function pcre_replace(string, strin
% sys.s1, sys.f1, sys.s2, sys.f2, .dt # table_name
% name, name, name, name, name # name
% varchar, varchar, varchar, varchar, char # type
-% 3, 17, 3, 31, 20 # length
-[ "sys", "=", "sys", "columnsize", "FUNC_DEPENDENCY" ]
-[ "sys", "left_shift", "sys", "columnsize", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "columnsize", "FUNC_DEPENDENCY"
]
-[ "sys", "pi", "sys", "degrees", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_div", "sys", "degrees", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "degrees", "FUNC_DEPENDENCY"
]
-[ "sys", "=", "sys", "dependencies_columns_on_indexes",
"FUNC_DEPENDENCY" ]
-[ "sys", "hash", "sys", "dependencies_columns_on_indexes",
"FUNC_DEPENDENCY" ]
-[ "sys", "rotate_xor_hash", "sys",
"dependencies_columns_on_indexes", "FUNC_DEPENDENCY" ]
-[ "sys", "=", "sys", "dependencies_columns_on_keys",
"FUNC_DEPENDENCY" ]
-[ "sys", "hash", "sys", "dependencies_columns_on_keys",
"FUNC_DEPENDENCY" ]
-[ "sys", "rotate_xor_hash", "sys", "dependencies_columns_on_keys",
"FUNC_DEPENDENCY" ]
-[ "sys", "sql_neg", "sys", "dependencies_columns_on_keys",
"FUNC_DEPENDENCY" ]
-[ "sys", "zero_or_one", "sys", "getproj4", "FUNC_DEPENDENCY"
]
-[ "sys", "=", "sys", "hashsize", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_mul", "sys", "hashsize", "FUNC_DEPENDENCY"
]
-[ "sys", "<>", "sys", "heapsize", "FUNC_DEPENDENCY" ]
-[ "sys", "and", "sys", "heapsize", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_add", "sys", "heapsize", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "heapsize", "FUNC_DEPENDENCY"
]
-[ "sys", "=", "sys", "imprintsize", "FUNC_DEPENDENCY" ]
-[ "sys", "or", "sys", "imprintsize", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_mul", "sys", "imprintsize", "FUNC_DEPENDENCY"
]
-[ "sys", "=", "sys", "ms_round", "FUNC_DEPENDENCY" ]
-[ "sys", "isnull", "sys", "ms_round", "FUNC_DEPENDENCY"
]
+% 3, 17, 3, 13, 20 # length
[ "sys", "ms_trunc", "sys", "ms_round", "FUNC_DEPENDENCY"
]
-[ "sys", "not", "sys", "ms_round", "FUNC_DEPENDENCY" ]
-[ "sys", "or", "sys", "ms_round", "FUNC_DEPENDENCY" ]
-[ "sys", "round", "sys", "ms_round", "FUNC_DEPENDENCY"
]
-[ "sys", "<", "sys", "ms_stuff", "FUNC_DEPENDENCY" ]
-[ "sys", ">", "sys", "ms_stuff", "FUNC_DEPENDENCY" ]
-[ "sys", "concat", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "length", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "or", "sys", "ms_stuff", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_add", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_sub", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "substring", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "pi", "sys", "radians", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_div", "sys", "radians", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "radians", "FUNC_DEPENDENCY"
]
[ "sys", "st_numgeometries", "sys", "st_numpatches",
"FUNC_DEPENDENCY" ]
[ "sys", "st_geometryn", "sys", "st_patchn", "FUNC_DEPENDENCY"
]
[ "sys", "getproj4", "sys", "st_transform", "FUNC_DEPENDENCY"
]
[ "sys", "internaltransform", "sys", "st_transform",
"FUNC_DEPENDENCY" ]
-[ "sys", "isnull", "sys", "st_transform", "FUNC_DEPENDENCY"
]
-[ "sys", "not", "sys", "st_transform", "FUNC_DEPENDENCY" ]
-[ "sys", "or", "sys", "st_transform", "FUNC_DEPENDENCY" ]
[ "sys", "st_srid", "sys", "st_transform", "FUNC_DEPENDENCY"
]
[ "sys", "columnsize", "sys", "storagemodel", "FUNC_DEPENDENCY"
]
[ "sys", "hashsize", "sys", "storagemodel", "FUNC_DEPENDENCY"
]
@@ -5047,7 +5005,6 @@ drop function pcre_replace(string, strin
[ "sys", "get_type", "sys", "geometry_columns",
"VIEW_DEPENDENCY" ]
[ "sys", "has_m", "sys", "geometry_columns",
"VIEW_DEPENDENCY" ]
[ "sys", "has_z", "sys", "geometry_columns",
"VIEW_DEPENDENCY" ]
-[ "sys", "sql_add", "sys", "geometry_columns",
"VIEW_DEPENDENCY" ]
[ "sys", "optimizers", "sys", "optimizers", "VIEW_DEPENDENCY"
]
[ "sys", "querylog_calls", "sys", "querylog_calls",
"VIEW_DEPENDENCY" ]
[ "sys", "querylog_catalog", "sys", "querylog_catalog",
"VIEW_DEPENDENCY" ]
@@ -5058,13 +5015,7 @@ drop function pcre_replace(string, strin
[ "sys", "sessions", "sys", "sessions", "VIEW_DEPENDENCY"
]
[ "sys", "storage", "sys", "storage", "VIEW_DEPENDENCY"
]
[ "sys", "storagemodel", "sys", "storagemodel", "VIEW_DEPENDENCY"
]
-[ "sys", "=", "sys", "tablestoragemodel", "VIEW_DEPENDENCY"
]
-[ "sys", "ifthenelse", "sys", "tablestoragemodel",
"VIEW_DEPENDENCY" ]
-[ "sys", "isnull", "sys", "tablestoragemodel",
"VIEW_DEPENDENCY" ]
-[ "sys", "max", "sys", "tablestoragemodel", "VIEW_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "tablestoragemodel",
"VIEW_DEPENDENCY" ]
[ "sys", "storagemodel", "sys", "tablestoragemodel",
"VIEW_DEPENDENCY" ]
-[ "sys", "sum", "sys", "tablestoragemodel", "VIEW_DEPENDENCY"
]
[ "sys", "tracelog", "sys", "tracelog", "VIEW_DEPENDENCY"
]
#select s1.name, t1.name, s2.name, t2.name, dt.name from (values (1,
'SCHEMA_DEPENDENCY'), (2, 'TABLE_DEPENDENCY'), (3, 'COLUMN_DEPENDENCY'), (4,
'KEY_DEPENDENCY'), (5, 'VIEW_DEPENDENCY'), (6, 'USER_DEPENDENCY'), (7,
'FUNC_DEPENDENCY'), (8, 'TRIGGER_DEPENDENCY'), (9, 'OWNER_DEPENDENCY'), (10,
'INDEX_DEPENDENCY'), (11, 'FKEY_DEPENDENCY'), (12, 'SEQ_DEPENDENCY'), (13,
'PROC_DEPENDENCY'), (14, 'BEDROPPED_DEPENDENCY'), (15, 'TYPE_DEPENDENCY')) as
dt (id, name), schemas s1, _tables t1, schemas s2, _tables t2, dependencies d
where d.depend_type = dt.id and d.id = t1.id and t1.schema_id = s1.id and
d.depend_id = t2.id and t2.schema_id = s2.id order by s2.name, t2.name,
s1.name, t1.name;
% sys.s1, sys.t1, sys.s2, sys.t2, .dt # table_name
diff --git a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
@@ -5215,55 +5215,12 @@ drop function pcre_replace(string, strin
% sys.s1, sys.f1, sys.s2, sys.f2, .dt # table_name
% name, name, name, name, name # name
% varchar, varchar, varchar, varchar, char # type
-% 3, 17, 3, 31, 20 # length
-[ "sys", "=", "sys", "columnsize", "FUNC_DEPENDENCY" ]
-[ "sys", "left_shift", "sys", "columnsize", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "columnsize", "FUNC_DEPENDENCY"
]
-[ "sys", "pi", "sys", "degrees", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_div", "sys", "degrees", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "degrees", "FUNC_DEPENDENCY"
]
-[ "sys", "=", "sys", "dependencies_columns_on_indexes",
"FUNC_DEPENDENCY" ]
-[ "sys", "hash", "sys", "dependencies_columns_on_indexes",
"FUNC_DEPENDENCY" ]
-[ "sys", "rotate_xor_hash", "sys",
"dependencies_columns_on_indexes", "FUNC_DEPENDENCY" ]
-[ "sys", "=", "sys", "dependencies_columns_on_keys",
"FUNC_DEPENDENCY" ]
-[ "sys", "hash", "sys", "dependencies_columns_on_keys",
"FUNC_DEPENDENCY" ]
-[ "sys", "rotate_xor_hash", "sys", "dependencies_columns_on_keys",
"FUNC_DEPENDENCY" ]
-[ "sys", "sql_neg", "sys", "dependencies_columns_on_keys",
"FUNC_DEPENDENCY" ]
-[ "sys", "zero_or_one", "sys", "getproj4", "FUNC_DEPENDENCY"
]
-[ "sys", "=", "sys", "hashsize", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_mul", "sys", "hashsize", "FUNC_DEPENDENCY"
]
-[ "sys", "<>", "sys", "heapsize", "FUNC_DEPENDENCY" ]
-[ "sys", "and", "sys", "heapsize", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_add", "sys", "heapsize", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "heapsize", "FUNC_DEPENDENCY"
]
-[ "sys", "=", "sys", "imprintsize", "FUNC_DEPENDENCY" ]
-[ "sys", "or", "sys", "imprintsize", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_mul", "sys", "imprintsize", "FUNC_DEPENDENCY"
]
-[ "sys", "=", "sys", "ms_round", "FUNC_DEPENDENCY" ]
-[ "sys", "isnull", "sys", "ms_round", "FUNC_DEPENDENCY"
]
+% 3, 17, 3, 13, 20 # length
[ "sys", "ms_trunc", "sys", "ms_round", "FUNC_DEPENDENCY"
]
-[ "sys", "not", "sys", "ms_round", "FUNC_DEPENDENCY" ]
-[ "sys", "or", "sys", "ms_round", "FUNC_DEPENDENCY" ]
-[ "sys", "round", "sys", "ms_round", "FUNC_DEPENDENCY"
]
-[ "sys", "<", "sys", "ms_stuff", "FUNC_DEPENDENCY" ]
-[ "sys", ">", "sys", "ms_stuff", "FUNC_DEPENDENCY" ]
-[ "sys", "concat", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "length", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "or", "sys", "ms_stuff", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_add", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_add", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_sub", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "substring", "sys", "ms_stuff", "FUNC_DEPENDENCY"
]
-[ "sys", "pi", "sys", "radians", "FUNC_DEPENDENCY" ]
-[ "sys", "sql_div", "sys", "radians", "FUNC_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "radians", "FUNC_DEPENDENCY"
]
[ "sys", "st_numgeometries", "sys", "st_numpatches",
"FUNC_DEPENDENCY" ]
[ "sys", "st_geometryn", "sys", "st_patchn", "FUNC_DEPENDENCY"
]
[ "sys", "getproj4", "sys", "st_transform", "FUNC_DEPENDENCY"
]
[ "sys", "internaltransform", "sys", "st_transform",
"FUNC_DEPENDENCY" ]
-[ "sys", "isnull", "sys", "st_transform", "FUNC_DEPENDENCY"
]
-[ "sys", "not", "sys", "st_transform", "FUNC_DEPENDENCY" ]
-[ "sys", "or", "sys", "st_transform", "FUNC_DEPENDENCY" ]
[ "sys", "st_srid", "sys", "st_transform", "FUNC_DEPENDENCY"
]
[ "sys", "columnsize", "sys", "storagemodel", "FUNC_DEPENDENCY"
]
[ "sys", "hashsize", "sys", "storagemodel", "FUNC_DEPENDENCY"
]
@@ -5434,8 +5391,6 @@ drop function pcre_replace(string, strin
[ "sys", "get_type", "sys", "geometry_columns",
"VIEW_DEPENDENCY" ]
[ "sys", "has_m", "sys", "geometry_columns",
"VIEW_DEPENDENCY" ]
[ "sys", "has_z", "sys", "geometry_columns",
"VIEW_DEPENDENCY" ]
-[ "sys", "sql_add", "sys", "geometry_columns",
"VIEW_DEPENDENCY" ]
-[ "sys", "sql_add", "sys", "geometry_columns",
"VIEW_DEPENDENCY" ]
[ "sys", "optimizers", "sys", "optimizers", "VIEW_DEPENDENCY"
]
[ "sys", "querylog_calls", "sys", "querylog_calls",
"VIEW_DEPENDENCY" ]
[ "sys", "querylog_catalog", "sys", "querylog_catalog",
"VIEW_DEPENDENCY" ]
@@ -5446,14 +5401,7 @@ drop function pcre_replace(string, strin
[ "sys", "sessions", "sys", "sessions", "VIEW_DEPENDENCY"
]
[ "sys", "storage", "sys", "storage", "VIEW_DEPENDENCY"
]
[ "sys", "storagemodel", "sys", "storagemodel", "VIEW_DEPENDENCY"
]
-[ "sys", "=", "sys", "tablestoragemodel", "VIEW_DEPENDENCY"
]
-[ "sys", "ifthenelse", "sys", "tablestoragemodel",
"VIEW_DEPENDENCY" ]
-[ "sys", "isnull", "sys", "tablestoragemodel",
"VIEW_DEPENDENCY" ]
-[ "sys", "max", "sys", "tablestoragemodel", "VIEW_DEPENDENCY"
]
-[ "sys", "sql_mul", "sys", "tablestoragemodel",
"VIEW_DEPENDENCY" ]
[ "sys", "storagemodel", "sys", "tablestoragemodel",
"VIEW_DEPENDENCY" ]
-[ "sys", "sum", "sys", "tablestoragemodel", "VIEW_DEPENDENCY"
]
-[ "sys", "sum", "sys", "tablestoragemodel", "VIEW_DEPENDENCY"
]
[ "sys", "tracelog", "sys", "tracelog", "VIEW_DEPENDENCY"
]
#select s1.name, t1.name, s2.name, t2.name, dt.name from (values (1,
'SCHEMA_DEPENDENCY'), (2, 'TABLE_DEPENDENCY'), (3, 'COLUMN_DEPENDENCY'), (4,
'KEY_DEPENDENCY'), (5, 'VIEW_DEPENDENCY'), (6, 'USER_DEPENDENCY'), (7,
'FUNC_DEPENDENCY'), (8, 'TRIGGER_DEPENDENCY'), (9, 'OWNER_DEPENDENCY'), (10,
'INDEX_DEPENDENCY'), (11, 'FKEY_DEPENDENCY'), (12, 'SEQ_DEPENDENCY'), (13,
'PROC_DEPENDENCY'), (14, 'BEDROPPED_DEPENDENCY'), (15, 'TYPE_DEPENDENCY')) as
dt (id, name), schemas s1, _tables t1, schemas s2, _tables t2, dependencies d
where d.depend_type = dt.id and d.id = t1.id and t1.schema_id = s1.id and
d.depend_id = t2.id and t2.schema_id = s2.id order by s2.name, t2.name,
s1.name, t1.name;
% sys.s1, sys.t1, sys.s2, sys.t2, .dt # table_name
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
@@ -26,6 +26,7 @@ stdout of test 'upgrade` in directory 's
Ready.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
