Changeset: 05075c66ee88 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=05075c66ee88
Modified Files:
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
sql/common/sql_types.c
sql/server/rel_select.c
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
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.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
Branch: sfcgal
Log Message:
Merge with Default
diffs (truncated from 2276 to 300 lines):
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
@@ -2012,12 +2012,6 @@ drop function pcre_replace(string, strin
[ "sys", "ifthenelse", "ifthenelse", "calc", 0, 1, false,
false, false ]
[ "sys", "ilike", "create filter function \"ilike\"(val string,
pat string) external name algebra.\"ilike\";", "algebra", 1, 4,
true, false, false ]
[ "sys", "ilike", "create filter function \"ilike\"(val string,
pat string, esc string) external name algebra.\"ilike\";", "algebra",
1, 4, true, false, false ]
-[ "sys", "ilike", "ilike", "algebra", 0, 1,
false, false, false ]
-[ "sys", "ilike", "ilike", "algebra", 0, 1,
false, false, false ]
-[ "sys", "ilike", "ilike", "algebra", 0, 1,
false, false, false ]
-[ "sys", "ilike", "ilike", "algebra", 0, 1,
false, false, false ]
-[ "sys", "ilike", "ilike", "algebra", 0, 1,
false, false, false ]
-[ "sys", "ilike", "ilike", "algebra", 0, 1,
false, false, false ]
[ "sys", "imprintsize", "create function sys.imprintsize(i bigint, nme
string) returns bigint begin if nme = 'boolean' or nme = 'tinyint' or nme =
'smallint' or nme = 'int' or nme = 'bigint' or nme = 'hugeint' or nme =
'decimal' or nme = 'date' or nme = 'timestamp' or nme = 'real' or nme =
'double' then return cast(i * 0.12 as bigint); end if ; return 0; end;",
"user", 2, 1, false, false, false ]
[ "sys", "in", "in", "calc", 0, 1, false, false, false
]
[ "sys", "index", "index", "calc", 0, 1, false,
false, false ]
@@ -2066,12 +2060,6 @@ drop function pcre_replace(string, strin
[ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1,
false, false, false ]
[ "sys", "like", "create filter function \"like\"(val string, pat
string) external name algebra.\"like\";", "algebra", 1, 4,
true, false, false ]
[ "sys", "like", "create filter function \"like\"(val string, pat
string, esc string) external name algebra.\"like\";", "algebra", 1,
4, true, false, false ]
-[ "sys", "like", "like", "algebra", 0, 1, false, false,
false ]
-[ "sys", "like", "like", "algebra", 0, 1, false, false,
false ]
-[ "sys", "like", "like", "algebra", 0, 1, false, false,
false ]
-[ "sys", "like", "like", "algebra", 0, 1, false, false,
false ]
-[ "sys", "like", "like", "algebra", 0, 1, false, false,
false ]
-[ "sys", "like", "like", "algebra", 0, 1, false, false,
false ]
[ "sys", "listdir", "create procedure listdir(dirname string)
external name fits.listdir;", "fits", 1, 2, true, false, false ]
[ "sys", "listdirpat", "create procedure listdirpat(dirname string,pat
string) external name fits.listdirpattern;", "fits", 1, 2, true,
false, false ]
[ "sys", "local_timezone", "local_timezone", "mtime",
0, 1, false, false, false ]
@@ -3566,12 +3554,6 @@ drop function pcre_replace(string, strin
[ "sys", "hour", "arg_1", "timetz", 7, 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", "identity", "arg_1", "any", 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", "ifthenelse", "arg_1", "boolean", 1, 0,
1, "arg_2", "any", 0, 0, 1, "arg_3", "any",
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 ]
-[ "sys", "ilike", "arg_1", "char", 0, 0, 1,
"arg_2", "char", 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 ]
-[ "sys", "ilike", "arg_1", "char", 0, 0, 1,
"arg_2", "char", 0, 0, 1, "arg_3", "char", 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 ]
-[ "sys", "ilike", "arg_1", "clob", 0, 0, 1,
"arg_2", "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 ]
-[ "sys", "ilike", "arg_1", "clob", 0, 0, 1,
"arg_2", "clob", 0, 0, 1, "arg_3", "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 ]
-[ "sys", "ilike", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 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 ]
-[ "sys", "ilike", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 0, 0, 1, "arg_3",
"varchar", 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 ]
[ "sys", "ilike", "pat", "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", "ilike", "pat", "clob", 0, 0, 1, "esc",
"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 ]
[ "sys", "imprintsize", "i", "bigint", 64, 0, 1,
"nme", "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
]
@@ -3620,12 +3602,6 @@ drop function pcre_replace(string, strin
[ "sys", "levenshtein", "arg_1", "clob", 0, 0, 1,
"arg_2", "clob", 0, 0, 1, "arg_3", "int", 32,
0, 1, "arg_4", "int", 32, 0, 1, "arg_5",
"int", 32, 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 ]
[ "sys", "levenshtein", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 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 ]
[ "sys", "levenshtein", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 0, 0, 1, "arg_3",
"int", 32, 0, 1, "arg_4", "int", 32, 0, 1,
"arg_5", "int", 32, 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 ]
-[ "sys", "like", "arg_1", "char", 0, 0, 1,
"arg_2", "char", 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 ]
-[ "sys", "like", "arg_1", "char", 0, 0, 1,
"arg_2", "char", 0, 0, 1, "arg_3", "char", 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 ]
-[ "sys", "like", "arg_1", "clob", 0, 0, 1,
"arg_2", "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 ]
-[ "sys", "like", "arg_1", "clob", 0, 0, 1,
"arg_2", "clob", 0, 0, 1, "arg_3", "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 ]
-[ "sys", "like", "arg_1", "varchar", 0, 0, 1,
"arg_2", "varchar", 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 ]
-[ "sys", "like", "arg_1", "varchar", 0, 0, 1,
"arg_2", "varchar", 0, 0, 1, "arg_3",
"varchar", 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 ]
[ "sys", "like", "pat", "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", "like", "pat", "clob", 0, 0, 1, "esc", "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 ]
[ "sys", "listdir", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
@@ -5576,12 +5552,6 @@ drop function pcre_replace(string, strin
[ "ifthenelse" ]
[ "ilike" ]
[ "ilike" ]
-[ "ilike" ]
-[ "ilike" ]
-[ "ilike" ]
-[ "ilike" ]
-[ "ilike" ]
-[ "ilike" ]
[ "imprintsize" ]
[ "in" ]
[ "index" ]
@@ -5639,12 +5609,6 @@ drop function pcre_replace(string, strin
[ "levenshtein" ]
[ "like" ]
[ "like" ]
-[ "like" ]
-[ "like" ]
-[ "like" ]
-[ "like" ]
-[ "like" ]
-[ "like" ]
[ "listdir" ]
[ "listdirpat" ]
[ "local_timezone" ]
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
@@ -2034,12 +2034,6 @@ drop function pcre_replace(string, strin
[ "sys", "ifthenelse", "ifthenelse", "calc", 0, 1, false,
false, false ]
[ "sys", "ilike", "create filter function \"ilike\"(val string,
pat string) external name algebra.\"ilike\";", "algebra", 1, 4,
true, false, false ]
[ "sys", "ilike", "create filter function \"ilike\"(val string,
pat string, esc string) external name algebra.\"ilike\";", "algebra",
1, 4, true, false, false ]
-[ "sys", "ilike", "ilike", "algebra", 0, 1,
false, false, false ]
-[ "sys", "ilike", "ilike", "algebra", 0, 1,
false, false, false ]
-[ "sys", "ilike", "ilike", "algebra", 0, 1,
false, false, false ]
-[ "sys", "ilike", "ilike", "algebra", 0, 1,
false, false, false ]
-[ "sys", "ilike", "ilike", "algebra", 0, 1,
false, false, false ]
-[ "sys", "ilike", "ilike", "algebra", 0, 1,
false, false, false ]
[ "sys", "imprintsize", "create function sys.imprintsize(i bigint, nme
string) returns bigint begin if nme = 'boolean' or nme = 'tinyint' or nme =
'smallint' or nme = 'int' or nme = 'bigint' or nme = 'hugeint' or nme =
'decimal' or nme = 'date' or nme = 'timestamp' or nme = 'real' or nme =
'double' then return cast(i * 0.12 as bigint); end if ; return 0; end;",
"user", 2, 1, false, false, false ]
[ "sys", "in", "in", "calc", 0, 1, false, false, false
]
[ "sys", "index", "index", "calc", 0, 1, false,
false, false ]
@@ -2090,12 +2084,6 @@ drop function pcre_replace(string, strin
[ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1,
false, false, false ]
[ "sys", "like", "create filter function \"like\"(val string, pat
string) external name algebra.\"like\";", "algebra", 1, 4,
true, false, false ]
[ "sys", "like", "create filter function \"like\"(val string, pat
string, esc string) external name algebra.\"like\";", "algebra", 1,
4, true, false, false ]
-[ "sys", "like", "like", "algebra", 0, 1, false, false,
false ]
-[ "sys", "like", "like", "algebra", 0, 1, false, false,
false ]
-[ "sys", "like", "like", "algebra", 0, 1, false, false,
false ]
-[ "sys", "like", "like", "algebra", 0, 1, false, false,
false ]
-[ "sys", "like", "like", "algebra", 0, 1, false, false,
false ]
-[ "sys", "like", "like", "algebra", 0, 1, false, false,
false ]
[ "sys", "listdir", "create procedure listdir(dirname string)
external name fits.listdir;", "fits", 1, 2, true, false, false ]
[ "sys", "listdirpat", "create procedure listdirpat(dirname string,pat
string) external name fits.listdirpattern;", "fits", 1, 2, true,
false, false ]
[ "sys", "local_timezone", "local_timezone", "mtime",
0, 1, false, false, false ]
@@ -3769,12 +3757,6 @@ drop function pcre_replace(string, strin
[ "sys", "hour", "arg_1", "timetz", 7, 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", "identity", "arg_1", "any", 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", "ifthenelse", "arg_1", "boolean", 1, 0,
1, "arg_2", "any", 0, 0, 1, "arg_3", "any",
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 ]
-[ "sys", "ilike", "arg_1", "char", 0, 0, 1,
"arg_2", "char", 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 ]
-[ "sys", "ilike", "arg_1", "char", 0, 0, 1,
"arg_2", "char", 0, 0, 1, "arg_3", "char", 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 ]
-[ "sys", "ilike", "arg_1", "clob", 0, 0, 1,
"arg_2", "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 ]
-[ "sys", "ilike", "arg_1", "clob", 0, 0, 1,
"arg_2", "clob", 0, 0, 1, "arg_3", "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 ]
-[ "sys", "ilike", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 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 ]
-[ "sys", "ilike", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 0, 0, 1, "arg_3",
"varchar", 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 ]
[ "sys", "ilike", "pat", "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", "ilike", "pat", "clob", 0, 0, 1, "esc",
"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 ]
[ "sys", "imprintsize", "i", "bigint", 64, 0, 1,
"nme", "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
]
@@ -3825,12 +3807,6 @@ drop function pcre_replace(string, strin
[ "sys", "levenshtein", "arg_1", "clob", 0, 0, 1,
"arg_2", "clob", 0, 0, 1, "arg_3", "int", 32,
0, 1, "arg_4", "int", 32, 0, 1, "arg_5",
"int", 32, 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 ]
[ "sys", "levenshtein", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 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 ]
[ "sys", "levenshtein", "arg_1", "varchar", 0, 0,
1, "arg_2", "varchar", 0, 0, 1, "arg_3",
"int", 32, 0, 1, "arg_4", "int", 32, 0, 1,
"arg_5", "int", 32, 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 ]
-[ "sys", "like", "arg_1", "char", 0, 0, 1,
"arg_2", "char", 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 ]
-[ "sys", "like", "arg_1", "char", 0, 0, 1,
"arg_2", "char", 0, 0, 1, "arg_3", "char", 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 ]
-[ "sys", "like", "arg_1", "clob", 0, 0, 1,
"arg_2", "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 ]
-[ "sys", "like", "arg_1", "clob", 0, 0, 1,
"arg_2", "clob", 0, 0, 1, "arg_3", "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 ]
-[ "sys", "like", "arg_1", "varchar", 0, 0, 1,
"arg_2", "varchar", 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 ]
-[ "sys", "like", "arg_1", "varchar", 0, 0, 1,
"arg_2", "varchar", 0, 0, 1, "arg_3",
"varchar", 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 ]
[ "sys", "like", "pat", "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", "like", "pat", "clob", 0, 0, 1, "esc", "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 ]
[ "sys", "listdir", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
@@ -5961,12 +5937,6 @@ drop function pcre_replace(string, strin
[ "ifthenelse" ]
[ "ilike" ]
[ "ilike" ]
-[ "ilike" ]
-[ "ilike" ]
-[ "ilike" ]
-[ "ilike" ]
-[ "ilike" ]
-[ "ilike" ]
[ "imprintsize" ]
[ "in" ]
[ "index" ]
@@ -6026,12 +5996,6 @@ drop function pcre_replace(string, strin
[ "levenshtein" ]
[ "like" ]
[ "like" ]
-[ "like" ]
-[ "like" ]
-[ "like" ]
-[ "like" ]
-[ "like" ]
-[ "like" ]
[ "listdir" ]
[ "listdirpat" ]
[ "local_timezone" ]
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
@@ -1721,19 +1721,19 @@ public class MonetConnection extends Mon
try {
switch (hlp.parse(tmpLine)) {
case HeaderLineParser.NAME:
- name =
(String[])(hlp.values.clone());
+ name = hlp.values.clone();
isSet[NAMES] = true;
break;
case HeaderLineParser.LENGTH:
- columnLengths =
(int[])(hlp.intValues.clone());
+ columnLengths =
hlp.intValues.clone();
isSet[LENS] = true;
break;
case HeaderLineParser.TYPE:
- type =
(String[])(hlp.values.clone());
+ type = hlp.values.clone();
isSet[TYPES] = true;
break;
case HeaderLineParser.TABLE:
- tableNames =
(String[])(hlp.values.clone());
+ tableNames = hlp.values.clone();
isSet[TABLES] = true;
break;
}
@@ -2357,6 +2357,7 @@ public class MonetConnection extends Mon
* @param the query to execute
* @throws SQLException if a database error occurs
*/
+ @SuppressWarnings("fallthrough")
void executeQuery(String[] templ, String query)
throws SQLException
{
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
@@ -829,8 +829,8 @@ public class MonetPreparedStatement
*/
@Override
public String getParameterClassName(int param) throws
SQLException {
- Map map = getConnection().getTypeMap();
- Class c;
+ Map<String,Class<?>> map =
getConnection().getTypeMap();
+ Class<?> c;
if
(map.containsKey(monetdbType[getParamIdx(param)])) {
c =
(Class)map.get(monetdbType[getParamIdx(param)]);
} else {
@@ -1222,7 +1222,7 @@ public class MonetPreparedStatement
public void setCharacterStream(int parameterIndex, Reader reader)
throws SQLException
{
- setCharacterStream(parameterIndex, reader, (int)0);
+ setCharacterStream(parameterIndex, reader, 0);
}
/**
@@ -1870,7 +1870,7 @@ public class MonetPreparedStatement
setShort(parameterIndex, (short)(val ?
1 : 0));
break;
case Types.INTEGER:
- setInt(parameterIndex, (int)(val ? 1 :
0));
+ setInt(parameterIndex, (val ? 1 : 0));
// do not cast to (int) as it generates a compiler warning
break;
case Types.BIGINT:
setLong(parameterIndex, (long)(val ? 1
: 0));
@@ -1880,7 +1880,7 @@ public class MonetPreparedStatement
break;
case Types.FLOAT:
case Types.DOUBLE:
- setDouble(parameterIndex, (double)(val
? 1.0 : 0.0));
+ setDouble(parameterIndex, (val ? 1.0 :
0.0)); // do no cast to (double) as it generates a compiler warning
break;
case Types.DECIMAL:
case Types.NUMERIC:
@@ -2387,6 +2387,7 @@ public class MonetPreparedStatement
* @throws SQLException if a database access error occurs
*/
@Override
+ @Deprecated
public void setUnicodeStream(int parameterIndex, InputStream x, int
length)
throws SQLException
{
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
@@ -647,10 +647,11 @@ public class MonetResultSet extends Mone
BigDecimal bd;
try {
bd = new BigDecimal(decimal);
+ bd.setScale(scale);
} catch (NumberFormatException e) {
bd = BigDecimal.ZERO;
}
- return bd.setScale(scale);
+ return bd;
}
}
@@ -1589,7 +1590,7 @@ public class MonetResultSet extends Mone
}
}
if (conn != null) {
- Map map = conn.getTypeMap();
+ Map<String,Class<?>> map =
conn.getTypeMap();
if (map != null &&
map.containsKey(MonetDBtype)) {
type =
(Class)map.get(MonetDBtype);
}
@@ -1670,35 +1671,180 @@ public class MonetResultSet extends Mone
/**
* Gets the value of the designated column in the current row of this
* ResultSet object as an Object in the Java programming language.
- *
+ *
* This method will return the value of the given column as a Java
object.
* The type of the Java object will be the default Java object type
* corresponding to the column's SQL type, following the mapping for
* built-in types specified in the JDBC specification. If the value is
* an SQL NULL, the driver returns a Java null.
- *
+ *
* This method may also be used to read database-specific abstract data
* types. In the JDBC 2.0 API, the behavior of method getObject is
extended
* to materialize data of SQL user-defined types. When a column
contains a
* structured or distinct value, the behavior of this method is as if it
- * were a call to: getObject(columnIndex,
- * this.getStatement().getConnection().getTypeMap()).
+ * were a call to: getObject(columnIndex,
this.getStatement().getConnection().getTypeMap()).
*
* @param columnIndex the first column is 1, the second is 2, ...
- * @return a java.lang.Object holding the column value
+ * @return a java.lang.Object holding the column value or null
* @throws SQLException if a database access error occurs
*/
@Override
public Object getObject(int columnIndex) throws SQLException {
- /* statement is null for MonetVirtualResultSet such as the ones
that hold generated keys */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
