Changeset: 01d3a8aaa4c1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=01d3a8aaa4c1 Modified Files: sql/jdbc/tests/Tests/All sql/jdbc/tests/Tests/Test_Dobjects.SQL.bat sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh sql/jdbc/tests/Tests/Test_Dobjects.stable.err sql/jdbc/tests/Tests/Test_Dobjects.stable.out Branch: Dec2011 Log Message:
JDBC: add DatabaseMetaData test diffs (174 lines): diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All --- a/sql/jdbc/tests/Tests/All +++ b/sql/jdbc/tests/Tests/All @@ -4,6 +4,7 @@ HAVE_JDBCTESTS?Test_Cmanycon HAVE_JDBCTESTS?Test_Creplysize HAVE_JDBCTESTS?Test_Csavepoints HAVE_JDBCTESTS?Test_Ctransaction +HAVE_JDBCTESTS?Test_Dobjects HAVE_JDBCTESTS?Test_PSgeneratedkeys HAVE_JDBCTESTS?Test_PSlargeamount HAVE_JDBCTESTS?Test_PStimedate diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.SQL.bat b/sql/jdbc/tests/Tests/Test_Dobjects.SQL.bat new file mode 100755 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_Dobjects.SQL.bat @@ -0,0 +1,1 @@ +@call "%TSTSRCDIR%\Test.SQL.bat" %* diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh b/sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh new file mode 100755 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +$TSTSRCDIR/Test.SQL.sh $* diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.err b/sql/jdbc/tests/Tests/Test_Dobjects.stable.err new file mode 100644 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.err @@ -0,0 +1,42 @@ +stderr of test 'Test_Dobjects` in directory 'jdbc/tests` itself: + + +# 20:09:14 > +# 20:09:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Dec2011-sofia.ins.cwi.nl/sql/dbfarm" "--set" "mapi_open=true" "--set" "mapi_port=35456" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_jdbc_tests" "--set" "mal_listing=0" +# 20:09:14 > + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /ufs/fabian/scratch/ssd/monetdb/Dec2011/program-x86_64/var/lib/monetdb5/dbfarm +# builtin opt gdk_debug = 0 +# builtin opt gdk_alloc_map = no +# builtin opt gdk_vmtrim = yes +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt gdk_dbfarm = /net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Dec2011-sofia.ins.cwi.nl/sql/dbfarm +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 35456 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_jdbc_tests +# cmdline opt mal_listing = 0 + +# 20:09:14 > +# 20:09:14 > "./Test_Dobjects.SQL.sh" "Test_Dobjects" +# 20:09:14 > + + +# 20:09:14 > +# 20:09:14 > java Test_Dobjects "jdbc:monetdb://sofia:35456/mTests_jdbc_tests?user=monetdb&password=monetdb" +# 20:09:14 > + + +# 20:09:14 > +# 20:09:14 > "Done." +# 20:09:14 > + diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out new file mode 100644 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out @@ -0,0 +1,97 @@ +stdout of test 'Test_Dobjects` in directory 'jdbc/tests` itself: + + +# 20:09:14 > +# 20:09:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Dec2011-sofia.ins.cwi.nl/sql/dbfarm" "--set" "mapi_open=true" "--set" "mapi_port=35456" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_jdbc_tests" "--set" "mal_listing=0" +# 20:09:14 > + +# MonetDB 5 server v11.7.0 "Dec2011-eea3ac87dc01+" +# Serving database 'mTests_jdbc_tests', using 8 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.662 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://sofia.ins.cwi.nl:35456/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/DataCell module not loaded: SQLException:mvc:SQL module not initialized + +Ready. +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_history.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_compress.sql +# loading sql script: 18_dictionary.sql +# loading sql script: 19_cluster.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 24_zorder.sql +# loading sql script: 25_debug.sql +# loading sql script: 40_geom.sql +# loading sql script: 80_udf.sql +# loading sql script: 99_system.sql + +# 20:09:14 > +# 20:09:14 > "./Test_Dobjects.SQL.sh" "Test_Dobjects" +# 20:09:14 > + + +# 20:09:14 > +# 20:09:14 > java Test_Dobjects "jdbc:monetdb://sofia:35456/mTests_jdbc_tests?user=monetdb&password=monetdb" +# 20:09:14 > + +Resultset with 1 columns +TABLE_TYPE +mTests_jdbc_tests +Resultset with 3 columns +TABLE_SCHEM TABLE_CATALOG TABLE_CAT +sys mTests_jdbc_tests mTests_jdbc_tests +tmp mTests_jdbc_tests mTests_jdbc_tests +Resultset with 10 columns +TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME REF_GENERATION +mTests_jdbc_tests sys _columns SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys _tables SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys args SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys auths SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys callhistory SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys connections SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys db_user_info SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys dependencies SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys functions SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys idxs SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys keys SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys objects SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys privileges SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys queryhistory SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys schemas SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys sequences SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys systemfunctions SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys triggers SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys types SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys user_role SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests tmp _columns SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests tmp _tables SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests tmp idxs SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests tmp keys SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests tmp objects SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests tmp triggers SYSTEM TABLE null null null null rowid SYSTEM +mTests_jdbc_tests sys columns SYSTEM VIEW SELECT * FROM (SELECT p.* FROM "sys"."_columns" AS p UNION ALL SELECT t.* FROM "tmp"."_columns" AS t) AS columns; null null null rowid SYSTEM +mTests_jdbc_tests sys querylog SYSTEM VIEW create view querylog as +select qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql +where qd.id = ql.id; null null null rowid SYSTEM +mTests_jdbc_tests sys tables SYSTEM VIEW SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t) AS tables where tables.type < 2; null null null rowid SYSTEM +mTests_jdbc_tests sys users SYSTEM VIEW SELECT u."name" AS "name", ui."fullname", ui."default_schema" FROM db_users() AS u LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name" ; null null null rowid SYSTEM + +# 20:09:14 > +# 20:09:14 > "Done." +# 20:09:14 > + _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
