Changeset: 0b77d4562e15 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0b77d4562e15
Branch: nested
Log Message:
merge upstream
diffs (55 lines):
diff --git a/clients/odbc/tests/ODBCmetadata.c
b/clients/odbc/tests/ODBCmetadata.c
--- a/clients/odbc/tests/ODBCmetadata.c
+++ b/clients/odbc/tests/ODBCmetadata.c
@@ -1535,9 +1535,9 @@ main(int argc, char **argv)
"Resultset with 1 columns\n"
"Resultset with 18 rows\n"
"mal\n"
- "WLONGVARCHAR(190)\n"
+ "WLONGVARCHAR(206)\n"
"function user.main():void;\n"
- " X_1:void := querylog.define(\"explain physical select *
from odbctst.\\\"LINES\\\";\":str, \"default_pipe\":str, 27:int);\n"
+ " X_1:void := querylog.define(\"explain physical select *
from odbctst.\\\"LINES\\\";\":str, \"default_pipe\":str, 28:int);\n"
"\n"
" X_33:bat[:int] := bat.new(nil:int);\n"
" X_34:bat[:int] := bat.new(nil:int);\n"
@@ -1550,16 +1550,16 @@ main(int argc, char **argv)
" X_42:bat[:int] := bat.pack(0:int, 0:int, 0:int, 3:int);\n"
" X_43:bat[:int] := bat.pack(0:int, 0:int, 0:int, 0:int);\n"
"\n"
- " X_37:int := sql.resultSet(X_38:bat[:str], X_39:bat[:str],
X_40:bat[:str], X_41:bat[:int], X_42:bat[:int], X_43:bat[:int], X_33:bat[:int],
X_34:bat[:int], X_35:bat[:int], X_36:bat[:int]);\n"
+ " X_37:int := sql.resultSet(X_38:bat[:str], X_39:bat[:str],
X_40:bat[:str], X_41:bat[:int], X_42:bat[:int], X_43:bat[:int], X_43:bat[:int],
X_33:bat[:int], X_34:bat[:int], X_35:bat[:int], X_36:bat[:int]);\n"
"end user.main;\n"
"\n\n"
:
"Resultset with 1 columns\n"
"Resultset with 16 rows\n"
"mal\n"
- "WLONGVARCHAR(190)\n"
+ "WLONGVARCHAR(206)\n"
"function user.main():void;\n"
- " X_1:void := querylog.define(\"explain physical select *
from odbctst.\\\"LINES\\\";\":str, \"default_pipe\":str, 27:int);\n"
+ " X_1:void := querylog.define(\"explain physical select *
from odbctst.\\\"LINES\\\";\":str, \"default_pipe\":str, 28:int);\n"
" X_33:bat[:int] := bat.new(nil:int);\n"
" X_34:bat[:int] := bat.new(nil:int);\n"
" X_35:bat[:int] := bat.new(nil:int);\n"
@@ -1570,7 +1570,7 @@ main(int argc, char **argv)
" X_41:bat[:int] := bat.pack(31:int, 31:int, 31:int,
9:int);\n"
" X_42:bat[:int] := bat.pack(0:int, 0:int, 0:int, 3:int);\n"
" X_43:bat[:int] := bat.pack(0:int, 0:int, 0:int, 0:int);\n"
- " X_37:int := sql.resultSet(X_38:bat[:str], X_39:bat[:str],
X_40:bat[:str], X_41:bat[:int], X_42:bat[:int], X_43:bat[:int], X_33:bat[:int],
X_34:bat[:int], X_35:bat[:int], X_36:bat[:int]);\n"
+ " X_37:int := sql.resultSet(X_38:bat[:str], X_39:bat[:str],
X_40:bat[:str], X_41:bat[:int], X_42:bat[:int], X_43:bat[:int], X_43:bat[:int],
X_33:bat[:int], X_34:bat[:int], X_35:bat[:int], X_36:bat[:int]);\n"
"end user.main;\n"
"\n\n");
diff --git a/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
b/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
--- a/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
+++ b/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
@@ -14,6 +14,7 @@ URL=f"jdbc:monetdb://{HOST}:{MAPIPORT}/{
JDBC_API_TESTER_ARGS=''
# JDBC_API_TESTER_ARGS='-skipMALoutput'
+JDBC_API_TESTER_ARGS='-supportsNestedTypes'
cmd = ['java', 'JDBC_API_Tester', URL, JDBC_API_TESTER_ARGS]
try:
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
