db-ddlutils-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject svn commit: r231117 - in /db/ddlutils/trunk/src: java/org/apache/ddlutils/builder/BuilderUtils.java test/jdbc.properties.derby
Date Tue, 09 Aug 2005 21:28:00 GMT
Author: tomdz
Date: Tue Aug  9 14:27:39 2005
New Revision: 231117

URL: http://svn.apache.org/viewcvs?rev=231117&view=rev
Log:
Enhanced support for new Derby version 10.1.1.0

Added:
    db/ddlutils/trunk/src/test/jdbc.properties.derby
Modified:
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/BuilderUtils.java

Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/BuilderUtils.java
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/BuilderUtils.java?rev=231117&r1=231116&r2=231117&view=diff
==============================================================================
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/BuilderUtils.java (original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/BuilderUtils.java Tue Aug  9 14:27:39
2005
@@ -32,6 +32,10 @@
     public static final String DRIVER_DB2                     = "COM.ibm.db2.jdbc.app.DB2Driver";
     /** The i-net DB2 jdbc driver */
     public static final String DRIVER_DB2_INET                = "com.inet.drda.DRDADriver";
+    /** The derby jdbc driver for use as a client for a normal server */
+    public static final String DRIVER_DERBY_CLIENT            = "org.apache.derby.jdbc.ClientDriver";
+    /** The derby jdbc driver for use as an embedded database */
+    public static final String DRIVER_DERBY_EMBEDDED          = "org.apache.derby.jdbc.EmbeddedDriver";
     /** The standard Firebird jdbc driver */
     public static final String DRIVER_FIREBIRD                = "org.firebirdsql.jdbc.FBDriver";
     /** The standard Hsqldb jdbc driver */
@@ -75,6 +79,8 @@
     public static final String SUBPROTOCOL_DB2                       = "db2";
     /** The subprotocol used by the i-net DB2 driver */
     public static final String SUBPROTOCOL_DB2_INET                  = "inetdb2";
+    /** The subprotocol used by the derby drivers */
+    public static final String SUBPROTOCOL_DERBY                     = "derby";
     /** The subprotocol used by the standard Firebird driver */
     public static final String SUBPROTOCOL_FIREBIRD                  = "firebirdsql";
     /** The subprotocol used by the standard Hsqldb driver */
@@ -141,6 +147,7 @@
         // drivers so we have no means to distinguish them
         jdbcSubProtocolToPlatform.put(SUBPROTOCOL_DB2,                       Db2Builder.DATABASENAME);
         jdbcSubProtocolToPlatform.put(SUBPROTOCOL_DB2_INET,                  Db2Builder.DATABASENAME);
+        jdbcSubProtocolToPlatform.put(SUBPROTOCOL_DERBY,                     DerbyBuilder.DATABASENAME);
         jdbcSubProtocolToPlatform.put(SUBPROTOCOL_FIREBIRD,                  FirebirdBuilder.DATABASENAME);
         jdbcSubProtocolToPlatform.put(SUBPROTOCOL_HSQLDB,                    HsqlDbBuilder.DATABASENAME);
         jdbcSubProtocolToPlatform.put(SUBPROTOCOL_INFORMIX,                  FirebirdBuilder.DATABASENAME);
@@ -167,6 +174,8 @@
 
         jdbcDriverToPlatform.put(DRIVER_DB2,                     Db2Builder.DATABASENAME);
         jdbcDriverToPlatform.put(DRIVER_DB2_INET,                Db2Builder.DATABASENAME);
+        jdbcDriverToPlatform.put(DRIVER_DERBY_EMBEDDED,          DerbyBuilder.DATABASENAME);
+        jdbcDriverToPlatform.put(DRIVER_DERBY_CLIENT,            DerbyBuilder.DATABASENAME);
         jdbcDriverToPlatform.put(DRIVER_FIREBIRD,                FirebirdBuilder.DATABASENAME);
         jdbcDriverToPlatform.put(DRIVER_HSQLDB,                  HsqlDbBuilder.DATABASENAME);
         jdbcDriverToPlatform.put(DRIVER_INFORMIX,                FirebirdBuilder.DATABASENAME);

Added: db/ddlutils/trunk/src/test/jdbc.properties.derby
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/test/jdbc.properties.derby?rev=231117&view=auto
==============================================================================
--- db/ddlutils/trunk/src/test/jdbc.properties.derby (added)
+++ db/ddlutils/trunk/src/test/jdbc.properties.derby Tue Aug  9 14:27:39 2005
@@ -0,0 +1,16 @@
+# JDBC properties for Derby >= 10.1.1.0
+
+# Use this property if ddlutils does not recognize the platform from the settings
+#ddlutils.platform=Derby
+
+# Properties starting with "datasource." will be fed into the datasource instance of the
+# class configured via the datasource.class property
+datasource.class=org.apache.commons.dbcp.BasicDataSource
+datasource.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
+
+# Use this one for a normal client-server model
+#datasource.driverClassName=org.apache.derby.jdbc.ClientDriver
+
+datasource.url=jdbc:derby:../database/ddlutils
+#datasource.username=
+#datasource.password=
\ No newline at end of file



Mime
View raw message