Changeset: cd34cfdcdda7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cd34cfdcdda7
Modified Files:
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
Branch: default
Log Message:
Disabling mapping of type table to Types.ARRAY as we currently do not support
JDBC Array methods
diffs (97 lines):
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
@@ -25,15 +25,15 @@ import java.util.logging.Logger;
/**
* A Driver suitable for the MonetDB database.
- *
+ *
* This driver will be used by the DriverManager to determine if an URL
* is to be handled by this driver, and if it does, then this driver
* will supply a Connection suitable for MonetDB.
- *
+ *
* This class has no explicit constructor, the default constructor
* generated by the Java compiler will be sufficient since nothing has
* to be set in order to use this driver.
- *
+ *
* This Driver supports MonetDB database URLs. MonetDB URLs are defined
* as:
* <tt>jdbc:monetdb://<host>[:<port>]/<database></tt>
@@ -93,10 +93,10 @@ final public class MonetDriver implement
* connect to the given URL. This will be common, as when the JDBC
driver
* manager is asked to connect to a given URL it passes the URL to each
* loaded driver in turn.
- *
+ *
* The driver should throw an SQLException if it is the right driver to
* connect to the given URL but has trouble connecting to the database.
- *
+ *
* The java.util.Properties argument can be used to pass arbitrary
string
* tag/value pairs as connection arguments. Normally at least "user" and
* "password" properties should be included in the Properties object.
@@ -186,7 +186,7 @@ final public class MonetDriver implement
/**
* Gets information about the possible properties for this driver.
- *
+ *
* The getPropertyInfo method is intended to allow a generic GUI tool to
* discover what properties it should prompt a human for in order to get
* enough information to connect to a database. Note that depending on
the
@@ -202,7 +202,7 @@ final public class MonetDriver implement
* are required.
*/
public DriverPropertyInfo[] getPropertyInfo(String url, Properties
info) {
- if (!acceptsURL(url))
+ if (!acceptsURL(url))
return null;
List<DriverPropertyInfo> props = new
ArrayList<DriverPropertyInfo>();
@@ -260,11 +260,11 @@ final public class MonetDriver implement
* Reports whether this driver is a genuine JDBC Compliant&tm; driver. A
* driver may only report true here if it passes the JDBC compliance
tests;
* otherwise it is required to return false.
- *
+ *
* JDBC compliance requires full support for the JDBC API and full
support
* for SQL 92 Entry Level. It is expected that JDBC compliant drivers
will
* be available for all the major commercial databases.
- *
+ *
* This method is not intended to encourage the development of non-JDBC
* compliant drivers, but is a recognition of the fact that some
vendors are
* interested in using the JDBC API and framework for lightweight
databases
@@ -287,6 +287,7 @@ final public class MonetDriver implement
private static java.util.Map<String, Integer> typeMap = new
java.util.HashMap<String, Integer>();
static {
// fill the typeMap once
+ // typeMap.put("any", Integer.valueOf(Types.???));
typeMap.put("bigint", Integer.valueOf(Types.BIGINT));
typeMap.put("blob", Integer.valueOf(Types.BLOB));
typeMap.put("boolean", Integer.valueOf(Types.BOOLEAN));
@@ -295,16 +296,20 @@ final public class MonetDriver implement
typeMap.put("date", Integer.valueOf(Types.DATE));
typeMap.put("decimal", Integer.valueOf(Types.DECIMAL));
typeMap.put("double", Integer.valueOf(Types.DOUBLE));
+ // typeMap.put("geometry", Integer.valueOf(Types.???));
+ // typeMap.put("geometrya", Integer.valueOf(Types.???));
typeMap.put("hugeint", Integer.valueOf(Types.NUMERIC));
typeMap.put("inet", Integer.valueOf(Types.VARCHAR));
typeMap.put("int", Integer.valueOf(Types.INTEGER));
typeMap.put("json", Integer.valueOf(Types.VARCHAR));
+ // typeMap.put("mbr", Integer.valueOf(Types.???));
typeMap.put("month_interval", Integer.valueOf(Types.INTEGER));
typeMap.put("oid", Integer.valueOf(Types.BIGINT));
+ // typeMap.put("ptr", Integer.valueOf(Types.???));
typeMap.put("real", Integer.valueOf(Types.REAL));
typeMap.put("sec_interval", Integer.valueOf(Types.DECIMAL));
typeMap.put("smallint", Integer.valueOf(Types.SMALLINT));
- typeMap.put("table", Integer.valueOf(Types.ARRAY));
+ // typeMap.put("table", Integer.valueOf(Types.???));
typeMap.put("time", Integer.valueOf(Types.TIME));
typeMap.put("timestamp", Integer.valueOf(Types.TIMESTAMP));
typeMap.put("timestamptz", Integer.valueOf(Types.TIMESTAMP));
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
