Mercurial > hg > monetdb-java
changeset 27:04fbf3655452
Disable Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); code
as it is not needed anymore for self registering JDBC drivers
line wrap: on
line diff
--- a/tests/BugConcurrent_clients_SF_1504657.java +++ b/tests/BugConcurrent_clients_SF_1504657.java @@ -13,7 +13,7 @@ public class BugConcurrent_clients_SF_15 Connection con1 = null, con2 = null, con3 = null; Statement stmt1 = null, stmt2 = null, stmt3 = null; ResultSet rs1 = null, rs2= null, rs3 = null; - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers con1 = DriverManager.getConnection(args[0]); con2 = DriverManager.getConnection(args[0]); con3 = DriverManager.getConnection(args[0]);
--- a/tests/BugConcurrent_sequences.java +++ b/tests/BugConcurrent_sequences.java @@ -13,7 +13,7 @@ public class BugConcurrent_sequences { Connection con1 = null, con2 = null; Statement stmt1 = null, stmt2 = null; ResultSet rs1 = null, rs2 = null; - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers con1 = DriverManager.getConnection(args[0]); con2 = DriverManager.getConnection(args[0]); stmt1 = con1.createStatement();
--- a/tests/BugDatabaseMetaData_Bug_3356.java +++ b/tests/BugDatabaseMetaData_Bug_3356.java @@ -10,7 +10,7 @@ import java.sql.*; public class BugDatabaseMetaData_Bug_3356 { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers Connection con = DriverManager.getConnection(args[0]); DatabaseMetaData dbmd = con.getMetaData(); ResultSet rs = dbmd.getColumns("", "sys", "_tables", "id");
--- a/tests/BugDecimalRound_Bug_3561.java +++ b/tests/BugDecimalRound_Bug_3561.java @@ -11,7 +11,7 @@ import java.math.BigDecimal; public class BugDecimalRound_Bug_3561 { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers Connection con = DriverManager.getConnection(args[0]); Statement stmt1 = con.createStatement(); PreparedStatement st;
--- a/tests/BugExecuteUpdate_Bug_3350.java +++ b/tests/BugExecuteUpdate_Bug_3350.java @@ -10,7 +10,7 @@ import java.sql.*; public class BugExecuteUpdate_Bug_3350 { public static void main(String[] args) throws Exception { - // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers final Connection con = DriverManager.getConnection(args[0]); con.setAutoCommit(false); // disable auto commit, so we can roll back the transaction
--- a/tests/BugSetQueryTimeout_Bug_3357.java +++ b/tests/BugSetQueryTimeout_Bug_3357.java @@ -10,7 +10,7 @@ import java.sql.*; public class BugSetQueryTimeout_Bug_3357 { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers Connection con = DriverManager.getConnection(args[0]); Statement st = con.createStatement(); try {
--- a/tests/Test_Cautocommit.java +++ b/tests/Test_Cautocommit.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_Cautocommit { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers Connection con1 = DriverManager.getConnection(args[0]); Connection con2 = DriverManager.getConnection(args[0]); Statement stmt1 = con1.createStatement();
--- a/tests/Test_Cforkbomb.java +++ b/tests/Test_Cforkbomb.java @@ -47,7 +47,7 @@ public class Test_Cforkbomb { public static void main(String[] args) throws Exception { Test_Cforkbomb.args = args; - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers // just DoS the server full throttle :) int i;
--- a/tests/Test_CisValid.java +++ b/tests/Test_CisValid.java @@ -14,7 +14,7 @@ public class Test_CisValid { * The function Connection.isValid() should only return TRUE or FALSE. It * shall never alter the state of this connection */ public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers Connection conn = DriverManager.getConnection(args[0]); Statement stmt = conn.createStatement();
--- a/tests/Test_Clargequery.java +++ b/tests/Test_Clargequery.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_Clargequery { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers Connection con1 = DriverManager.getConnection(args[0]); Statement stmt1 = con1.createStatement(); ResultSet rs = null;
--- a/tests/Test_Cmanycon.java +++ b/tests/Test_Cmanycon.java @@ -11,7 +11,7 @@ import java.util.*; public class Test_Cmanycon { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers List cons = new ArrayList(100); // Connections go in here try {
--- a/tests/Test_Creplysize.java +++ b/tests/Test_Creplysize.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_Creplysize { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers Connection con1 = DriverManager.getConnection(args[0]); Statement stmt1 = con1.createStatement(); ResultSet rs = null;
--- a/tests/Test_Csavepoints.java +++ b/tests/Test_Csavepoints.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_Csavepoints { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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(); ResultSet rs = null;
--- a/tests/Test_Csendthread.java +++ b/tests/Test_Csendthread.java @@ -10,8 +10,7 @@ import java.sql.*; public class Test_Csendthread { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); - + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers System.out.println("0. active threads: " + Thread.activeCount()); StringBuilder sb = new StringBuilder();
--- a/tests/Test_Ctransaction.java +++ b/tests/Test_Ctransaction.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_Ctransaction { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers Connection con1 = DriverManager.getConnection(args[0]); Statement stmt1 = con1.createStatement(); //DatabaseMetaData dbmd = con.getMetaData();
--- a/tests/Test_Dobjects.java +++ b/tests/Test_Dobjects.java @@ -26,7 +26,7 @@ public class Test_Dobjects { } public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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;
--- a/tests/Test_FetchSize.java +++ b/tests/Test_FetchSize.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_FetchSize { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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(); ResultSet rs = stmt.executeQuery("SELECT * FROM _tables");
--- a/tests/Test_Int128.java +++ b/tests/Test_Int128.java @@ -18,7 +18,7 @@ import java.sql.Statement; /* Test whether we can represent a full-size int128 as JDBC results */ public class Test_Int128 { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers Connection con = DriverManager.getConnection(args[0]); BigInteger bi = new BigInteger( "123456789012345678909876543210987654321");
--- a/tests/Test_PSgeneratedkeys.java +++ b/tests/Test_PSgeneratedkeys.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_PSgeneratedkeys { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers Connection con = DriverManager.getConnection(args[0]); con.setAutoCommit(false); // >> false: auto commit was just switched off
--- a/tests/Test_PSgetObject.java +++ b/tests/Test_PSgetObject.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_PSgetObject { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers final Connection con = DriverManager.getConnection(args[0]); con.setAutoCommit(false); // >> false: auto commit was just switched off
--- a/tests/Test_PSlargeamount.java +++ b/tests/Test_PSlargeamount.java @@ -14,7 +14,7 @@ import java.util.*; public class Test_PSlargeamount { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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; @@ -24,7 +24,7 @@ public class Test_PSlargeamount { try { System.out.println("1. Preparing and executing a unique statement"); - for (int i = 0; i < 100000; i++) { + for (int i = 0; i < 50000; i++) { pstmt = con.prepareStatement("select " + i + ", " + i + " = ?"); pstmt.setInt(1, i); ResultSet rs = pstmt.executeQuery();
--- a/tests/Test_PSlargebatchval.java +++ b/tests/Test_PSlargebatchval.java @@ -12,7 +12,7 @@ import java.nio.charset.Charset; public class Test_PSlargebatchval { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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;
--- a/tests/Test_PSlargeresponse.java +++ b/tests/Test_PSlargeresponse.java @@ -11,7 +11,7 @@ import java.util.*; public class Test_PSlargeresponse { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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; @@ -23,7 +23,10 @@ public class Test_PSlargeresponse { try { System.out.print("1. DatabaseMetadata environment retrieval... "); - System.out.println(dbmd.getURL()); + if (args[0].startsWith(dbmd.getURL())) + System.out.println("oke"); + else + System.out.println("not oke " + dbmd.getURL()); pstmt = con.prepareStatement("select * from columns"); System.out.print("2. empty call...");
--- a/tests/Test_PSmanycon.java +++ b/tests/Test_PSmanycon.java @@ -11,7 +11,7 @@ import java.util.*; public class Test_PSmanycon { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers List pss = new ArrayList(100); // Connections go in here try {
--- a/tests/Test_PSmetadata.java +++ b/tests/Test_PSmetadata.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_PSmetadata { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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;
--- a/tests/Test_PSsomeamount.java +++ b/tests/Test_PSsomeamount.java @@ -14,7 +14,7 @@ import java.util.*; public class Test_PSsomeamount { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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;
--- a/tests/Test_PSsqldata.java +++ b/tests/Test_PSsqldata.java @@ -11,7 +11,7 @@ import nl.cwi.monetdb.jdbc.types.*; public class Test_PSsqldata { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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;
--- a/tests/Test_PStimedate.java +++ b/tests/Test_PStimedate.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_PStimedate { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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;
--- a/tests/Test_PStimezone.java +++ b/tests/Test_PStimezone.java @@ -18,7 +18,7 @@ public class Test_PStimezone { // savings corrections TimeZone.setDefault(TimeZone.getTimeZone("UTC")); - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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;
--- a/tests/Test_PStypes.java +++ b/tests/Test_PStypes.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_PStypes { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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;
--- a/tests/Test_Rbooleans.java +++ b/tests/Test_Rbooleans.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_Rbooleans { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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(); ResultSet rs = null;
--- a/tests/Test_Rmetadata.java +++ b/tests/Test_Rmetadata.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_Rmetadata { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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(); ResultSet rs = null;
--- a/tests/Test_Rpositioning.java +++ b/tests/Test_Rpositioning.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_Rpositioning { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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(); DatabaseMetaData dbmd = con.getMetaData();
--- a/tests/Test_Rsqldata.java +++ b/tests/Test_Rsqldata.java @@ -11,7 +11,7 @@ import nl.cwi.monetdb.jdbc.types.*; public class Test_Rsqldata { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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(); ResultSet rs = null;
--- a/tests/Test_Rtimedate.java +++ b/tests/Test_Rtimedate.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_Rtimedate { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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(); ResultSet rs = null;
--- a/tests/Test_Sbatching.java +++ b/tests/Test_Sbatching.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_Sbatching { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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(); ResultSet rs = null;
--- a/tests/Test_Smoreresults.java +++ b/tests/Test_Smoreresults.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_Smoreresults { public static void main(String[] args) throws Exception { - Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // 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(); ResultSet rs = null;
--- a/tests/Test_Wrapper.java +++ b/tests/Test_Wrapper.java @@ -10,7 +10,7 @@ import java.sql.*; public class Test_Wrapper { public static void main(String[] args) throws Exception { - // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); + // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not needed anymore for self registering JDBC drivers final Connection con = DriverManager.getConnection(args[0]); System.out.println("Connected. Auto commit is: " + con.getAutoCommit());