Changeset: 435a724c66f0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=435a724c66f0
Modified Files:
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
Branch: default
Log Message:
Removed creation of MonetDriver object in constructor of MonetDatabaseMetaData.
It was only used to pull the Major and Minor version numbers of the JDBC
driver, which are static values.
diffs (72 lines):
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
@@ -20,12 +20,10 @@ import java.util.*;
*/
public class MonetDatabaseMetaData extends MonetWrapper implements
DatabaseMetaData {
private Connection con;
- private Driver driver;
private static Map<Connection, Map<String,String>> envs = new
HashMap<Connection, Map<String,String>>();
public MonetDatabaseMetaData(Connection parent) {
con = parent;
- driver = new MonetDriver();
}
private synchronized Statement getStmt() throws SQLException {
@@ -238,7 +236,7 @@ public class MonetDatabaseMetaData exten
*/
@Override
public int getDriverMajorVersion() {
- return driver.getMajorVersion();
+ return MonetDriver.getDriverMajorVersion();
}
/**
@@ -248,7 +246,7 @@ public class MonetDatabaseMetaData exten
*/
@Override
public int getDriverMinorVersion() {
- return driver.getMinorVersion();
+ return MonetDriver.getDriverMinorVersion();
}
/**
@@ -3307,8 +3305,7 @@ public class MonetDatabaseMetaData exten
}
/**
- * Retrieves the major JDBC version number for this
- * driver.
+ * Retrieves the major JDBC version number for this driver.
*
* @return JDBC version major number
*/
@@ -3318,8 +3315,7 @@ public class MonetDatabaseMetaData exten
}
/**
- * Retrieves the minor JDBC version number for this
- * driver.
+ * Retrieves the minor JDBC version number for this driver.
*
* @return JDBC version minor number
*/
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
@@ -357,6 +357,14 @@ final public class MonetDriver implement
return "" + DRIVERMAJOR + "." + DRIVERMINOR + " (" +
DRIVERVERSIONSUFFIX + ")";
}
+ public static int getDriverMajorVersion() {
+ return DRIVERMAJOR;
+ }
+
+ public static int getDriverMinorVersion() {
+ return DRIVERMINOR;
+ }
+
/**
* Return the parent Logger of all the Loggers used by this data
* source. This should be the Logger farthest from the root Logger
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
