MonetDB: Jul2012 - DatabaseMetaData: fix getURL() to return some...

[Fabian Groffen]

Changeset: 4c38eeec4944 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c38eeec4944
Modified Files:
        java/ChangeLog.Jul2012
        java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
        java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
Branch: Jul2012
Log Message:

DatabaseMetaData: fix getURL() to return something useful again

the hostname and mapi_port properties were removed from the database
environment, so use the information as provided during connect instead


diffs (68 lines):

diff --git a/java/ChangeLog.Jul2012 b/java/ChangeLog.Jul2012
--- a/java/ChangeLog.Jul2012
+++ b/java/ChangeLog.Jul2012
@@ -1,3 +1,11 @@
 # ChangeLog file for java
 # This file is updated with Maddlog
 
+* Tue Aug 14 2012 Fabian Groffen <fab...@cwi.nl>
+- Fixed a bug where DatabaseMetaData.getURL() did return null:0 for
+  hostname:port.
+
+* Fri Jul 20 2012 Fabian Groffen <fab...@cwi.nl>
+- Fixed adaptive cache size used when retrieving results, not to cause
+  divide by zero errors when memory gets short, bug #3119.
+
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java 
b/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
@@ -1249,10 +1249,7 @@ public class MonetConnection extends Mon
         * @return a String representing this Object
         */
        public String toString() {
-               String language = "";
-               if (lang == LANG_MAL) language = "?language=mal";
-               return "MonetDB Connection (jdbc:monetdb://" + hostname +
-                               ":" + port + "/" + database + language + ") " + 
+               return "MonetDB Connection (" + getJDBCURL() + ") " + 
                                (closed ? "connected" : "disconnected");
        }
 
@@ -1379,6 +1376,14 @@ public class MonetConnection extends Mon
 
        //== end methods of interface Connection
 
+       public String getJDBCURL() {
+               String language = "";
+               if (lang == LANG_MAL)
+                       language = "?language=mal";
+               return "jdbc:monetdb://" + hostname + ":" + port + "/" +
+                       database + language;
+       }
+
        /**
         * Returns whether the BLOB type should be mapped to BINARY type.
         */
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java 
b/java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
@@ -54,8 +54,6 @@ public class MonetDatabaseMetaData exten
         * value is read, it is kept in a Map for reuse.
         */
        private synchronized String getEnv(String key) {
-               
-
                // if due to concurrency on this Class envs is assigned twice, I
                // just don't care here
                Map<String,String> menvs = envs.get(con);
@@ -132,9 +130,7 @@ public class MonetDatabaseMetaData exten
         * @throws SQLException if a database access error occurs
         */
        public String getURL() throws SQLException {
-               return "jdbc:monetdb://" + getEnv("host") +
-                       ":" + getEnv("mapi_port") + "/" +
-                       getEnv("gdk_dbname");
+               return ((MonetConnection)con).getJDBCURL();
        }
 
        /**
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list