Changeset: 6ba6b5e2f37f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ba6b5e2f37f Added Files: java/tests/BugDatabaseMetaData_Bug_3356.java sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.SQL.bat sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.SQL.sh sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.stable.err sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.stable.out Modified Files: java/tests/Makefile.ag java/tests/build.xml sql/jdbc/tests/Tests/All Branch: Feb2013 Log Message:
Added test for bug 3356. diffs (191 lines): diff --git a/java/tests/BugDatabaseMetaData_Bug_3356.java b/java/tests/BugDatabaseMetaData_Bug_3356.java new file mode 100644 --- /dev/null +++ b/java/tests/BugDatabaseMetaData_Bug_3356.java @@ -0,0 +1,40 @@ +/* + * The contents of this file are subject to the MonetDB Public License + * Version 1.1 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.monetdb.org/Legal/MonetDBLicense + * + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * + * The Original Code is the MonetDB Database System. + * + * The Initial Developer of the Original Code is CWI. + * Portions created by CWI are Copyright (C) 1997-July 2008 CWI. + * Copyright August 2008-2013 MonetDB B.V. + * All Rights Reserved. + */ + +import java.sql.*; + +public class BugDatabaseMetaData_Bug_3356 { + public static void main(String[] args) throws Exception { + Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + Connection con = DriverManager.getConnection(args[0]); + DatabaseMetaData dbmd = con.getMetaData(); + ResultSet rs = dbmd.getColumns("mTests_sql_jdbc_tests", "sys", "_tables", "id"); + rs.next(); + String tableName1 = rs.getString("TABLE_NAME"); + String tableName2 = rs.getString(3); + String isNullable1 = rs.getString("IS_NULLABLE"); + String isNullable2 = rs.getString(18); + System.out.println(tableName1); + System.out.println(tableName2); + System.out.println(isNullable1); + System.out.println(isNullable2); + rs.close(); + con.close(); + } +} diff --git a/java/tests/Makefile.ag b/java/tests/Makefile.ag --- a/java/tests/Makefile.ag +++ b/java/tests/Makefile.ag @@ -35,6 +35,7 @@ EXTRA_DIST = \ Test_Rtimedate.java \ Test_Sbatching.java \ BugConcurrent_clients_SF_1504657.java \ + BugDatabaseMetaData_Bug_3356.java \ build.xml build.properties ant_jar_jdbctests = { diff --git a/java/tests/build.xml b/java/tests/build.xml --- a/java/tests/build.xml +++ b/java/tests/build.xml @@ -132,6 +132,7 @@ All Rights Reserved. <antcall target="Test_Smoreresults" /> <antcall target="BugConcurrent_clients_SF_1504657" /> <antcall target="BugConcurrent_sequences" /> + <antcall target="BugDatabaseMetaData_Bug_3356" /> </target> <target name="test_class" depends="compile,jdbc"> @@ -322,4 +323,10 @@ All Rights Reserved. </antcall> </target> + <target name="BugDatabaseMetaData_Bug_3356"> + <antcall target="test_class"> + <param name="test.class" value="BugDatabaseMetaData_Bug_3356" /> + </antcall> + </target> + </project> 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 @@ -24,3 +24,4 @@ HAVE_JDBCTESTS?Test_Sbatching HAVE_JDBCCLIENT_JAR?Test_JdbcClient HAVE_JDBCTESTS?BugConcurrent_clients_SF_1504657 HAVE_JDBCTESTS?BugConcurrent_sequences +HAVE_JDBCTESTS?BugDatabaseMetaData_Bug_3356 diff --git a/sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.SQL.bat b/sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.SQL.bat new file mode 100755 --- /dev/null +++ b/sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.SQL.bat @@ -0,0 +1,1 @@ +@call "%TSTSRCDIR%\Test.SQL.bat" %* diff --git a/sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.SQL.sh b/sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.SQL.sh new file mode 100755 --- /dev/null +++ b/sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.SQL.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +$TSTSRCDIR/Test.SQL.sh $* diff --git a/sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.stable.err b/sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.stable.err new file mode 100644 --- /dev/null +++ b/sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.stable.err @@ -0,0 +1,40 @@ +stderr of test 'BugDatabaseMetaData_Bug_3356` in directory 'sql/jdbc/tests` itself: + + +# 17:27:28 > +# 17:27:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34631" "--set" "mapi_usock=/var/tmp/mtest-23634/.s.monetdb.34631" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_jdbc_tests" "--set" "mal_listing=0" +# 17:27:28 > + +# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# 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 mapi_open = true +# cmdline opt mapi_port = 34631 +# cmdline opt mapi_usock = /var/tmp/mtest-23634/.s.monetdb.34631 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_jdbc_tests +# cmdline opt mal_listing = 0 + +# 17:27:28 > +# 17:27:28 > "./BugDatabaseMetaData_Bug_3356.SQL.sh" "BugDatabaseMetaData_Bug_3356" +# 17:27:28 > + + +# 17:27:28 > +# 17:27:28 > java BugDatabaseMetaData_Bug_3356 "jdbc:monetdb://madrid:34631/mTests_sql_jdbc_tests?user=monetdb&password=monetdb" +# 17:27:28 > + + +# 17:27:28 > +# 17:27:28 > "Done." +# 17:27:28 > + diff --git a/sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.stable.out b/sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.stable.out new file mode 100644 --- /dev/null +++ b/sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.stable.out @@ -0,0 +1,41 @@ +stdout of test 'BugDatabaseMetaData_Bug_3356` in directory 'sql/jdbc/tests` itself: + + +# 17:27:28 > +# 17:27:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34631" "--set" "mapi_usock=/var/tmp/mtest-23634/.s.monetdb.34631" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_jdbc_tests" "--set" "mal_listing=0" +# 17:27:28 > + +# MonetDB 5 server v11.15.16 (hg id: 4e1be37a5d65+) +# This is an unreleased version +# Serving database 'mTests_sql_jdbc_tests', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.591 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:34631/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23634/.s.monetdb.34631 +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# MonetDB/SQL module loaded + +Ready. + +# 17:27:28 > +# 17:27:28 > "./BugDatabaseMetaData_Bug_3356.SQL.sh" "BugDatabaseMetaData_Bug_3356" +# 17:27:28 > + + +# 17:27:28 > +# 17:27:28 > java BugDatabaseMetaData_Bug_3356 "jdbc:monetdb://madrid:34631/mTests_sql_jdbc_tests?user=monetdb&password=monetdb" +# 17:27:28 > + +_tables +_tables +YES +YES + +# 17:27:28 > +# 17:27:28 > "Done." +# 17:27:28 > + _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
