Changeset: 711ec3b13ce7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=711ec3b13ce7
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/shp/75_shp.sql
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/check.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.32bit
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.32bit
sql/test/emptydb/Tests/check.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: default
Log Message:
Fixed sys.SHPload to use correct MAL function.
diffs (truncated from 358 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
@@ -1248,6 +1248,9 @@ sql_update_default(Client c, mvc *sql)
size_t bufsize = 10000, pos = 0;
char *buf = GDKmalloc(bufsize), *err = NULL;
char *schema = stack_get_string(sql, "current_schema");
+ char *q1 = "select id from sys.functions where name = 'shpload' and
schema_id = (select id from sys.schemas where name = 'sys');\n";
+ res_table *output;
+ BAT *b;
pos += snprintf(buf + pos, bufsize - pos, "set schema \"sys\";\n");
@@ -1293,6 +1296,25 @@ sql_update_default(Client c, mvc *sql)
"(9, 'SELECT,DELETE'), (10, 'UPDATE,DELETE'), (11,
'SELECT,UPDATE,DELETE'), (12, 'INSERT,DELETE'),\n"
"(13, 'SELECT,INSERT,DELETE'), (14,
'INSERT,UPDATE,DELETE'), (15, 'SELECT,INSERT,UPDATE,DELETE');\n"
"update sys._tables set system = true where name in
('function_languages', 'function_types', 'index_types', 'key_types',
'privilege_codes') and schema_id = (select id from sys.schemas where name =
'sys');\n");
+
+ /* 75_shp.sql, if shp extension available */
+ err = SQLstatementIntern(c, &q1, "update", 1, 0, &output);
+ if (err) {
+ GDKfree(buf);
+ return err;
+ }
+ b = BATdescriptor(output->cols[0].b);
+ if (b) {
+ if (BATcount(b) > 0) {
+ pos += snprintf(buf + pos, bufsize - pos,
+ "drop procedure SHPload(integer);\n"
+ "create procedure SHPload(fid integer)
external name shp.import;\n"
+ "insert into sys.systemfunctions
(select id from sys.functions where name = 'shpload' and schema_id = (select id
from sys.schemas where name = 'sys') and id not in (select function_id from
sys.systemfunctions));\n");
+ }
+ BBPunfix(b->batCacheid);
+ }
+ res_tables_destroy(output);
+
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
diff --git a/sql/backends/monet5/vaults/shp/75_shp.sql
b/sql/backends/monet5/vaults/shp/75_shp.sql
--- a/sql/backends/monet5/vaults/shp/75_shp.sql
+++ b/sql/backends/monet5/vaults/shp/75_shp.sql
@@ -5,5 +5,5 @@
-- Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V.
create procedure SHPattach(fname string) external name shp.attach;
-create procedure SHPload(fid integer) external name shp.load;
+create procedure SHPload(fid integer) external name shp.import;
create procedure SHPload(fid integer, filter geometry) external name
shp.import;
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
@@ -1000,7 +1000,7 @@ create procedure sys.setsession("timeout
create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
-create procedure shpload(fid integer) external name shp.load;
+create procedure shpload(fid integer) external name shp.import;
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;
@@ -2923,7 +2923,7 @@ drop function pcre_replace(string, strin
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name clients.settimeout;", "clients", 1, 2,
true, false, false ]
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name clients.settimeout;", "clients",
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) external
name shp.import;", "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
]
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
@@ -990,7 +990,7 @@ create procedure sys.setsession("timeout
create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
-create procedure shpload(fid integer) external name shp.load;
+create procedure shpload(fid integer) external name shp.import;
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;
@@ -2786,7 +2786,7 @@ drop function pcre_replace(string, strin
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name clients.settimeout;", "clients", 1, 2,
true, false, false ]
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name clients.settimeout;", "clients",
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) external
name shp.import;", "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
]
diff --git a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
@@ -994,7 +994,7 @@ create procedure sys.setsession("timeout
create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
-create procedure shpload(fid integer) external name shp.load;
+create procedure shpload(fid integer) external name shp.import;
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;
@@ -2790,7 +2790,7 @@ drop function pcre_replace(string, strin
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name clients.settimeout;", "clients", 1, 2,
true, false, false ]
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name clients.settimeout;", "clients",
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) external
name shp.import;", "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
]
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
@@ -1000,7 +1000,7 @@ create procedure sys.setsession("timeout
create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
-create procedure shpload(fid integer) external name shp.load;
+create procedure shpload(fid integer) external name shp.import;
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;
@@ -2923,7 +2923,7 @@ drop function pcre_replace(string, strin
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name clients.settimeout;", "clients", 1, 2,
true, false, false ]
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name clients.settimeout;", "clients",
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) external
name shp.import;", "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
]
diff --git a/sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
@@ -1000,7 +1000,7 @@ create procedure sys.setsession("timeout
create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
-create procedure shpload(fid integer) external name shp.load;
+create procedure shpload(fid integer) external name shp.import;
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;
@@ -2923,7 +2923,7 @@ drop function pcre_replace(string, strin
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name clients.settimeout;", "clients", 1, 2,
true, false, false ]
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name clients.settimeout;", "clients",
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) external
name shp.import;", "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
]
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
@@ -61,6 +61,9 @@ INSERT INTO sys.privilege_codes (privile
(9, 'SELECT,DELETE'), (10, 'UPDATE,DELETE'), (11, 'SELECT,UPDATE,DELETE'),
(12, 'INSERT,DELETE'),
(13, 'SELECT,INSERT,DELETE'), (14, 'INSERT,UPDATE,DELETE'), (15,
'SELECT,INSERT,UPDATE,DELETE');
update sys._tables set system = true where name in ('function_languages',
'function_types', 'index_types', 'key_types', 'privilege_codes') and schema_id
= (select id from sys.schemas where name = 'sys');
+drop procedure SHPload(integer);
+create procedure SHPload(fid integer) external name shp.import;
+insert into sys.systemfunctions (select id from sys.functions where name =
'shpload' and schema_id = (select id from sys.schemas where name = 'sys') and
id not in (select function_id from sys.systemfunctions));
set schema "sys";
# 15:26:18 >
diff --git a/sql/test/emptydb-upgrade/Tests/check.stable.out
b/sql/test/emptydb-upgrade/Tests/check.stable.out
--- a/sql/test/emptydb-upgrade/Tests/check.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/check.stable.out
@@ -990,7 +990,7 @@ create procedure sys.setsession("timeout
create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
-create procedure shpload(fid integer) external name shp.load;
+create procedure shpload(fid integer) external name shp.import;
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;
@@ -2786,7 +2786,7 @@ drop function pcre_replace(string, strin
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name clients.settimeout;", "clients", 1, 2,
true, false, false ]
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name clients.settimeout;", "clients",
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) external
name shp.import;", "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
]
diff --git a/sql/test/emptydb-upgrade/Tests/check.stable.out.32bit
b/sql/test/emptydb-upgrade/Tests/check.stable.out.32bit
--- a/sql/test/emptydb-upgrade/Tests/check.stable.out.32bit
+++ b/sql/test/emptydb-upgrade/Tests/check.stable.out.32bit
@@ -994,7 +994,7 @@ create procedure sys.setsession("timeout
create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
-create procedure shpload(fid integer) external name shp.load;
+create procedure shpload(fid integer) external name shp.import;
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;
@@ -2790,7 +2790,7 @@ drop function pcre_replace(string, strin
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name clients.settimeout;", "clients", 1, 2,
true, false, false ]
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name clients.settimeout;", "clients",
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) external
name shp.import;", "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
]
diff --git a/sql/test/emptydb-upgrade/Tests/check.stable.out.int128
b/sql/test/emptydb-upgrade/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/check.stable.out.int128
@@ -1000,7 +1000,7 @@ create procedure sys.setsession("timeout
create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
-create procedure shpload(fid integer) external name shp.load;
+create procedure shpload(fid integer) external name shp.import;
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;
@@ -2923,7 +2923,7 @@ drop function pcre_replace(string, strin
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name clients.settimeout;", "clients", 1, 2,
true, false, false ]
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name clients.settimeout;", "clients",
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) external
name shp.import;", "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
]
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
@@ -61,6 +61,9 @@ INSERT INTO sys.privilege_codes (privile
(9, 'SELECT,DELETE'), (10, 'UPDATE,DELETE'), (11, 'SELECT,UPDATE,DELETE'),
(12, 'INSERT,DELETE'),
(13, 'SELECT,INSERT,DELETE'), (14, 'INSERT,UPDATE,DELETE'), (15,
'SELECT,INSERT,UPDATE,DELETE');
update sys._tables set system = true where name in ('function_languages',
'function_types', 'index_types', 'key_types', 'privilege_codes') and schema_id
= (select id from sys.schemas where name = 'sys');
+drop procedure SHPload(integer);
+create procedure SHPload(fid integer) external name shp.import;
+insert into sys.systemfunctions (select id from sys.functions where name =
'shpload' and schema_id = (select id from sys.schemas where name = 'sys') and
id not in (select function_id from sys.systemfunctions));
set schema "sys";
# 15:41:18 >
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
@@ -105,6 +105,9 @@ INSERT INTO sys.privilege_codes (privile
(9, 'SELECT,DELETE'), (10, 'UPDATE,DELETE'), (11, 'SELECT,UPDATE,DELETE'),
(12, 'INSERT,DELETE'),
(13, 'SELECT,INSERT,DELETE'), (14, 'INSERT,UPDATE,DELETE'), (15,
'SELECT,INSERT,UPDATE,DELETE');
update sys._tables set system = true where name in ('function_languages',
'function_types', 'index_types', 'key_types', 'privilege_codes') and schema_id
= (select id from sys.schemas where name = 'sys');
+drop procedure SHPload(integer);
+create procedure SHPload(fid integer) external name shp.import;
+insert into sys.systemfunctions (select id from sys.functions where name =
'shpload' and schema_id = (select id from sys.schemas where name = 'sys') and
id not in (select function_id from sys.systemfunctions));
set schema "sys";
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
@@ -990,7 +990,7 @@ create procedure sys.setsession("timeout
create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
-create procedure shpload(fid integer) external name shp.load;
+create procedure shpload(fid integer) external name shp.import;
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;
@@ -2786,7 +2786,7 @@ drop function pcre_replace(string, strin
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name clients.settimeout;", "clients", 1, 2,
true, false, false ]
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name clients.settimeout;", "clients",
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) external
name shp.import;", "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
]
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
@@ -994,7 +994,7 @@ create procedure sys.setsession("timeout
create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
-create procedure shpload(fid integer) external name shp.load;
+create procedure shpload(fid integer) external name shp.import;
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;
@@ -2790,7 +2790,7 @@ drop function pcre_replace(string, strin
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name clients.settimeout;", "clients", 1, 2,
true, false, false ]
[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name clients.settimeout;", "clients",
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) external
name shp.import;", "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
]
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
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
