Changeset: 1b5b12b9c5e1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1b5b12b9c5e1
Modified Files:
sql/backends/monet5/sql_upgrades.c
Branch: Jun2023
Log Message:
Fix upgrade code for str and txtsim module.
diffs (72 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
@@ -5515,15 +5515,9 @@ sql_update_jun2023(Client c, mvc *sql, s
sql->session->status = 0; /* if the function was not found
clean the error */
sql->errstr[0] = '\0';
pos = snprintf(buf, bufsize,
- "create function sys.levenshtein(x
string, y string)\n"
- "returns int external name
txtsim.levenshtein;\n"
- "grant execute on function
levenshtein(string, string) to public;\n"
"create function sys.levenshtein(x
string, y string, insdel int, rep int)\n"
"returns int external name
txtsim.levenshtein;\n"
"grant execute on function
levenshtein(string, string, int, int) to public;\n"
- "create function sys.levenshtein(x
string, y string, insdel int, rep int, trans int)\n"
- "returns int external name
txtsim.levenshtein;\n"
- "grant execute on function
levenshtein(string, string, int, int, int) to public;\n"
"create filter function
sys.maxlevenshtein(x string, y string, k int)\n"
"external name
txtsim.maxlevenshtein;\n"
"grant execute on filter function
maxlevenshtein(string, string, int) to public;\n"
@@ -5543,25 +5537,6 @@ sql_update_jun2023(Client c, mvc *sql, s
"returns int external name
txtsim.dameraulevenshtein;\n"
"grant execute on function
dameraulevenshtein(string, string, int, int, int) to public;\n"
- "create function sys.editdistance(x
string, y string)\n"
- "returns int external name
txtsim.editdistance;\n"
- "grant execute on function
editdistance(string, string) to public;\n"
- "create function sys.editdistance2(x
string, y string)\n"
- "returns int external name
txtsim.editdistance2;\n"
- "grant execute on function
editdistance2(string, string) to public;\n"
- "create function sys.soundex(x
string)\n"
- "returns string external name
txtsim.soundex;\n"
- "grant execute on function
soundex(string) to public;\n"
- "create function sys.difference(x
string, y string)\n"
- "returns int external name
txtsim.stringdiff;\n"
- "grant execute on function
difference(string, string) to public;\n"
- "create function
sys.qgramnormalize(x string)\n"
- "returns string external name
txtsim.qgramnormalize;\n"
- "grant execute on function
qgramnormalize(string) to public;\n"
- "create function sys.similarity(x
string, y string)\n"
- "returns double external name
txtsim.similarity;\n"
- "grant execute on function
similarity(string, string) to public;\n"
-
"create function asciify(x string)\n"
"returns string external name
str.asciify;\n"
"grant execute on function
asciify(string) to public;\n"
@@ -5581,9 +5556,9 @@ sql_update_jun2023(Client c, mvc *sql, s
"create function sys.endswith(x
string, y string, icase boolean)\n"
"returns boolean external name
str.endswith;\n"
"grant execute on function
endswith(string, string, boolean) to public;\n"
- "create filter function
sys.endswith(s1 string, s2 string)\n"
+ "create filter function
sys.endswith(x string, y string)\n"
"external name str.endswith;\n"
- "create filter function
sys.endswith(s1 string, s2 string, icase boolean)\n"
+ "create filter function
sys.endswith(x string, y string, icase boolean)\n"
"external name str.endswith;\n"
"create function sys.contains(x
string, y string)\n"
"returns boolean external name
str.contains;\n"
@@ -5593,10 +5568,12 @@ sql_update_jun2023(Client c, mvc *sql, s
"grant execute on function
contains(string, string, boolean) to public;\n"
"create filter function
sys.contains(x string, y string)\n"
"external name str.contains;\n"
+ "grant execute on filter function
contains(string, string) to public;\n"
"create filter function
sys.contains(x string, y string, icase boolean)\n"
"external name str.contains;\n"
-
- "update sys.functions set system =
true where system <> true and name in ('levenshtein', 'dameraulevenshtein',
'jarowinkler', 'editdistance', 'editdistance2', 'soundex', 'difference',
'qgramnormalize', 'similarity') and schema_id = 2000 and type = %d;\n"
+ "grant execute on filter function
contains(string, string, boolean) to public;\n"
+
+ "update sys.functions set system =
true where system <> true and name in ('levenshtein', 'dameraulevenshtein',
'jarowinkler') and schema_id = 2000 and type = %d;\n"
"update sys.functions set system =
true where system <> true and name in ('maxlevenshtein', 'minjarowinkler') and
schema_id = 2000 and type = %d;\n"
"update sys.functions set system =
true where system <> true and name in ('asciify', 'startswith', 'endswith',
'contains') and schema_id = 2000 and type = %d;\n"
"update sys.functions set system =
true where system <> true and name in ('startswith', 'endswith', 'contains')
and schema_id = 2000 and type = %d;\n"
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
