Changeset: f638f5257b2e for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java?cmd=changeset;node=f638f5257b2e
Modified Files:
tests/Test_Dobjects.java
Branch: default
Log Message:
Make Test_Dobjects independent of list of tables in sys schema.
This allows the JDBC test Test_Dobjects to run on all platforms, not just the
ones which have NetCDF and Geom installed.
Instead it now lists the tables of schema tmp which are available and the same
on all platforms.
Also removed dead code and improved code of dumpResultSet(ResultSet rs).
diffs (56 lines):
diff --git a/tests/Test_Dobjects.java b/tests/Test_Dobjects.java
--- a/tests/Test_Dobjects.java
+++ b/tests/Test_Dobjects.java
@@ -7,37 +7,36 @@
*/
import java.sql.*;
-import java.util.*;
public class Test_Dobjects {
private static void dumpResultSet(ResultSet rs) throws SQLException {
ResultSetMetaData rsmd = rs.getMetaData();
- System.out.println("Resultset with " + rsmd.getColumnCount() +
" columns");
- for (int col = 1; col <= rsmd.getColumnCount(); col++) {
+ int columnCount = rsmd.getColumnCount();
+ System.out.println("Resultset with " + columnCount + "
columns");
+ for (int col = 1; col <= columnCount; col++) {
System.out.print(rsmd.getColumnName(col) + "\t");
}
System.out.println();
while (rs.next()) {
- for (int col = 1; col <= rsmd.getColumnCount(); col++) {
+ for (int col = 1; col <= columnCount; col++) {
System.out.print(rs.getString(col) + "\t");
}
System.out.println();
}
+ rs.close();
}
public static void main(String[] args) throws Exception {
// Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con = DriverManager.getConnection(args[0]);
- Statement stmt = con.createStatement();
- PreparedStatement pstmt;
DatabaseMetaData dbmd = con.getMetaData();
-
try {
// inspect the catalog by use of dbmd functions
dumpResultSet(dbmd.getCatalogs());
// dumpResultSet(dbmd.getSchemas()); // this
produces different outputs on different platforms due to dependency on SAMTOOLS
and NETCDF. so exclude it
dumpResultSet(dbmd.getSchemas(null, "sys"));
- dumpResultSet(dbmd.getTables(null, "sys", null, null));
+// dumpResultSet(dbmd.getTables(null, "sys", null, null));
// this produces different outputs on different platforms due to dependency on
Geom and NETCDF.
+ dumpResultSet(dbmd.getTables(null, "tmp", null, null));
// schema tmp has 6 tables
dumpResultSet(dbmd.getUDTs(null, "sys", null, null));
int[] UDTtypes = { Types.STRUCT, Types.DISTINCT };
dumpResultSet(dbmd.getUDTs(null, "sys", null,
UDTtypes));
@@ -45,7 +44,6 @@ public class Test_Dobjects {
System.out.println("FAILED :( "+ e.getMessage());
System.out.println("ABORTING TEST!!!");
}
-
con.close();
}
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
