Changeset: aaff1f5ba68f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aaff1f5ba68f
Modified Files:
clients/Tests/All
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
sql/test/Tests/All
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/leaks/Tests/All
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
Branch: Jun2016
Log Message:
Change conditions to require SHP extension.
diffs (truncated from 1206 to 300 lines):
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,4 +1,4 @@
exports
-HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&!HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&!HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures
-!BITS32&!BITS64OID32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&!HAVE_SHP&HAVE_SAMTOOLS?SQL-dump
+HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&!HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures
+!BITS32&!BITS64OID32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SHP&HAVE_SAMTOOLS?SQL-dump
MERCURIAL?malcheck
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -239,6 +239,8 @@ Ready.
\dSf sys."setmasklen"
\dSf sys."setsession"
\dSf sys."settimeout"
+\dSf sys."shpattach"
+\dSf sys."shpload"
\dSf sys."shrink"
\dSf sys."shutdown"
\dSf sys."st_area"
@@ -632,6 +634,8 @@ SYSTEM FUNCTION sys.sessions
SYSTEM FUNCTION sys.setmasklen
SYSTEM FUNCTION sys.setsession
SYSTEM FUNCTION sys.settimeout
+SYSTEM FUNCTION sys.shpattach
+SYSTEM FUNCTION sys.shpload
SYSTEM FUNCTION sys.shrink
SYSTEM FUNCTION sys.shutdown
SYSTEM FUNCTION sys.sign
@@ -1005,6 +1009,9 @@ create function "setmasklen" (p inet, ma
create procedure sys.setsession("timeout" bigint) external name sql.setsession;
create procedure sys.settimeout("query" bigint) external name sql.settimeout;
create procedure sys.settimeout("query" bigint, "session" bigint) external
name sql.settimeout;
+create procedure shpattach(fname string) external name shp.attach;
+create procedure shpload(fid integer) external name shp.load;
+create procedure shpload(fid integer, filter geometry) external name
shp.import;
create procedure shrink(sys string, tab string) external name sql.shrink;
create procedure sys.shutdown(delay tinyint) external name sql.shutdown;
create procedure sys.shutdown(delay tinyint, force bool) external name
sql.shutdown;
@@ -2858,6 +2865,9 @@ drop function pcre_replace(string, strin
[ "sys", "setsession", "create procedure sys.setsession(\"timeout\"
bigint) external name sql.setsession;", "sql", 1, 2, true,
false, false ]
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name sql.settimeout;", "sql", 1, 2, true,
false, false ]
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name sql.settimeout;", "sql", 1, 2,
true, false, false ]
+[ "sys", "shpattach", "create procedure shpattach(fname string)
external name shp.attach;", "shp", 1, 2, true, false, false ]
+[ "sys", "shpload", "create procedure shpload(fid integer) external
name shp.load;", "shp", 1, 2, true, false, false ]
+[ "sys", "shpload", "create procedure shpload(fid integer, filter
geometry) external name shp.import;", "shp", 1, 2, true,
false, false ]
[ "sys", "shrink", "create procedure shrink(sys string, tab
string) external name sql.shrink;", "sql", 1, 2, true, false,
false ]
[ "sys", "shutdown", "create procedure sys.shutdown(delay tinyint)
external name sql.shutdown;", "sql", 1, 2, true, false, false
]
[ "sys", "shutdown", "create procedure sys.shutdown(delay tinyint,
force bool) external name sql.shutdown;", "sql", 1, 2, true,
false, false ]
@@ -4494,6 +4504,9 @@ drop function pcre_replace(string, strin
[ "sys", "setsession", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "settimeout", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "settimeout", "session", "bigint", 64, 0,
1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
+[ "sys", "shpattach", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
+[ "sys", "shpload", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
+[ "sys", "shpload", "filter", "geometry", 0, 0,
1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
[ "sys", "shrink", "tab", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "shutdown", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "shutdown", "force", "boolean", 1, 0,
1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
@@ -5021,54 +5034,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"
]
@@ -5239,7 +5210,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" ]
@@ -5250,13 +5220,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
@@ -6646,6 +6610,9 @@ drop function pcre_replace(string, strin
[ "setstream" ]
[ "settimeout" ]
[ "settimeout" ]
+[ "shpattach" ]
+[ "shpload" ]
+[ "shpload" ]
[ "shrink" ]
[ "shutdown" ]
[ "shutdown" ]
diff --git a/clients/Tests/SQL-dump.stable.out.int128
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -235,6 +235,8 @@ Ready.
\dSf sys."setmasklen"
\dSf sys."setsession"
\dSf sys."settimeout"
+\dSf sys."shpattach"
+\dSf sys."shpload"
\dSf sys."shrink"
\dSf sys."shutdown"
\dSf sys."st_area"
@@ -628,6 +630,8 @@ SYSTEM FUNCTION sys.sessions
SYSTEM FUNCTION sys.setmasklen
SYSTEM FUNCTION sys.setsession
SYSTEM FUNCTION sys.settimeout
+SYSTEM FUNCTION sys.shpattach
+SYSTEM FUNCTION sys.shpload
SYSTEM FUNCTION sys.shrink
SYSTEM FUNCTION sys.shutdown
SYSTEM FUNCTION sys.sign
@@ -1007,6 +1011,9 @@ create function "setmasklen" (p inet, ma
create procedure sys.setsession("timeout" bigint) external name sql.setsession;
create procedure sys.settimeout("query" bigint) external name sql.settimeout;
create procedure sys.settimeout("query" bigint, "session" bigint) external
name sql.settimeout;
+create procedure shpattach(fname string) external name shp.attach;
+create procedure shpload(fid integer) external name shp.load;
+create procedure shpload(fid integer, filter geometry) external name
shp.import;
create procedure shrink(sys string, tab string) external name sql.shrink;
create procedure sys.shutdown(delay tinyint) external name sql.shutdown;
create procedure sys.shutdown(delay tinyint, force bool) external name
sql.shutdown;
@@ -2990,6 +2997,9 @@ drop function pcre_replace(string, strin
[ "sys", "setsession", "create procedure sys.setsession(\"timeout\"
bigint) external name sql.setsession;", "sql", 1, 2, true,
false, false ]
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name sql.settimeout;", "sql", 1, 2, true,
false, false ]
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name sql.settimeout;", "sql", 1, 2,
true, false, false ]
+[ "sys", "shpattach", "create procedure shpattach(fname string)
external name shp.attach;", "shp", 1, 2, true, false, false ]
+[ "sys", "shpload", "create procedure shpload(fid integer) external
name shp.load;", "shp", 1, 2, true, false, false ]
+[ "sys", "shpload", "create procedure shpload(fid integer, filter
geometry) external name shp.import;", "shp", 1, 2, true,
false, false ]
[ "sys", "shrink", "create procedure shrink(sys string, tab
string) external name sql.shrink;", "sql", 1, 2, true, false,
false ]
[ "sys", "shutdown", "create procedure sys.shutdown(delay tinyint)
external name sql.shutdown;", "sql", 1, 2, true, false, false
]
[ "sys", "shutdown", "create procedure sys.shutdown(delay tinyint,
force bool) external name sql.shutdown;", "sql", 1, 2, true,
false, false ]
@@ -4814,6 +4824,9 @@ drop function pcre_replace(string, strin
[ "sys", "setsession", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "settimeout", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "settimeout", "session", "bigint", 64, 0,
1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
+[ "sys", "shpattach", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
+[ "sys", "shpload", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
+[ "sys", "shpload", "filter", "geometry", 0, 0,
1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
[ "sys", "shrink", "tab", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "shutdown", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "shutdown", "force", "boolean", 1, 0,
1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
@@ -5403,55 +5416,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"
]
@@ -5622,8 +5592,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" ]
@@ -5634,14 +5602,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
@@ -7158,6 +7119,9 @@ drop function pcre_replace(string, strin
[ "setstream" ]
[ "settimeout" ]
[ "settimeout" ]
+[ "shpattach" ]
+[ "shpload" ]
+[ "shpload" ]
[ "shrink" ]
[ "shutdown" ]
[ "shutdown" ]
diff --git a/sql/test/Tests/All b/sql/test/Tests/All
--- a/sql/test/Tests/All
+++ b/sql/test/Tests/All
@@ -1,4 +1,4 @@
-HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&!HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?systemfunctions
+HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?systemfunctions
example
example-queries
example-drop
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list