henning 2004/12/10 03:42:16
Modified: src/java/org/apache/torque/adapter Tag: TORQUE_3_1_BRANCH
DBFactory.java
xdocs Tag: TORQUE_3_1_BRANCH changes.xml
Added: src/generator/src/templates/sql/base/derby Tag:
TORQUE_3_1_BRANCH columns.vm drop.vm foreignkey.vm
index.vm primarykey.vm table.vm tablefk.vm
unique.vm
src/generator/src/templates/sql/id-table Tag:
TORQUE_3_1_BRANCH idtable.derby
src/generator/src/templates/sql/load/derby Tag:
TORQUE_3_1_BRANCH row.vm val.vm
Log:
Add basic support for Apache Derby. Native ID generation is still
missing (I have a non-working patch for that).
Revision Changes Path
No revision
No revision
1.35.2.3 +8 -1
db-torque/src/java/org/apache/torque/adapter/DBFactory.java
Index: DBFactory.java
===================================================================
RCS file:
/home/cvs/db-torque/src/java/org/apache/torque/adapter/DBFactory.java,v
retrieving revision 1.35.2.2
retrieving revision 1.35.2.3
diff -u -r1.35.2.2 -r1.35.2.3
--- DBFactory.java 20 May 2004 04:35:15 -0000 1.35.2.2
+++ DBFactory.java 10 Dec 2004 11:42:14 -0000 1.35.2.3
@@ -28,6 +28,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ralf Stranzenbach</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @version $Id$
*/
public class DBFactory
@@ -64,6 +65,10 @@
adapters.put("com.informix.jdbc.IfxDriver", DBInformix.class);
adapters.put("sun.jdbc.odbc.JdbcOdbcDriver", DBOdbc.class);
+ adapters.put("com.ibm.db2.jcc.DB2Driver", DBDerby.class);
+ adapters.put("org.apache.derby.jdbc.EmbeddedDriver", DBDerby.class);
+
+
// add some short names to be used when drivers are not used
adapters.put("as400", DBDB2400.class);
adapters.put("db2app", DBDB2App.class);
@@ -83,6 +88,8 @@
adapters.put("informix", DBInformix.class);
adapters.put("odbc", DBOdbc.class);
adapters.put("msaccess", DBOdbc.class);
+
+ adapters.put("derby", DBDerby.class);
adapters.put("", DBNone.class);
}
No revision
No revision
1.140.2.25 +3 -0 db-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
retrieving revision 1.140.2.24
retrieving revision 1.140.2.25
diff -u -r1.140.2.24 -r1.140.2.25
--- changes.xml 1 Dec 2004 16:31:17 -0000 1.140.2.24
+++ changes.xml 10 Dec 2004 11:42:14 -0000 1.140.2.25
@@ -26,6 +26,9 @@
<body>
<release version="3.1.2-dev" date="in CVS">
+ <action type="add" dev="henning">
+ Add Support for Apache Derby
+ </action>
<action type="add" dev="henning" issue="TRQS255">
Explicitly set the name of the ID Broker thread.
Suggested by Martin Goulet.
No revision
No revision
1.1.2.1 +23 -0
db-torque/src/generator/src/templates/sql/base/derby/Attic/columns.vm
1.1.2.1 +1 -0
db-torque/src/generator/src/templates/sql/base/derby/Attic/drop.vm
1.1.2.1 +10 -0
db-torque/src/generator/src/templates/sql/base/derby/Attic/foreignkey.vm
1.1.2.1 +3 -0
db-torque/src/generator/src/templates/sql/base/derby/Attic/index.vm
1.1.2.1 +3 -0
db-torque/src/generator/src/templates/sql/base/derby/Attic/primarykey.vm
1.1.2.1 +18 -0
db-torque/src/generator/src/templates/sql/base/derby/Attic/table.vm
1.1.2.1 +0 -0
db-torque/src/generator/src/templates/sql/base/derby/Attic/tablefk.vm
<<Binary file>>
1.1.2.1 +3 -0
db-torque/src/generator/src/templates/sql/base/derby/Attic/unique.vm
No revision
No revision
1.1.2.1 +4 -0
db-torque/src/generator/src/templates/sql/id-table/Attic/idtable.derby
No revision
No revision
1.1.2.1 +4 -0
db-torque/src/generator/src/templates/sql/load/derby/Attic/row.vm
1.1.2.1 +1 -0
db-torque/src/generator/src/templates/sql/load/derby/Attic/val.vm
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
