tfischer 2005/05/31 21:41:41
Modified: xdocs index.xml changes.xml
src/generator/src/templates/sql/base/interbase drop.vm
table.vm columns.vm
src/rttest id-table-schema.xml
Added: profile firebird.profile
src/generator/src/templates/sql/db-init/interbase
createdb.vm
Log:
Fixed a few bugs for the firebird database.
Added a runtimetest profile for firebird
Added firebird to the list of supported databases on the homepage
Changed the lenght of the tablename column from 255 to 250 in the idbroker
schema for the runtimetest to make firebird run
Revision Changes Path
1.25 +6 -0 db-torque/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/db-torque/xdocs/index.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- index.xml 25 Aug 2004 00:05:11 -0000 1.24
+++ index.xml 1 Jun 2005 04:41:41 -0000 1.25
@@ -63,6 +63,12 @@
<td><a href="mailto:[EMAIL PROTECTED]">Scott Weaver</a></td>
</tr>
<tr>
+ <td>Firebird</td>
+ <td>org.firebirdsql.jdbc.FBDriver</td>
+ <td>idMethod="native" does not work</td>
+ <td><a href="mailto:[EMAIL PROTECTED]">Thomas Fischer</a></td>
+ </tr>
+ <tr>
<td>Hypersonic</td>
<td>org.hsql.jdbcDriver</td>
<td></td>
1.161 +16 -0 db-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- changes.xml 20 May 2005 20:29:46 -0000 1.160
+++ changes.xml 1 Jun 2005 04:41:41 -0000 1.161
@@ -28,6 +28,22 @@
<body>
<release version="3.2-dev" date="in CVS">
+ <action type="fix" dev="tfischer">
+ Changed the length of the tablename column from 255 to 250 in the
idbroker
+ schema for the runtimetest. This is necessary because the firebird
database
+ cannot create an index on a varchar column which has the length 255.
+ </action>
+ <action type="fix" dev="tfischer">
+ Fixed a few things in the interbase implementation for compliance with
Firebird 1.5
+ <ul>
+ <li>Tables are dropped before they are created in the create-db
task</li>
+ <li>The style of comments in the db scripts is changed from /* */ to
--</li>
+ <li>Column names are no longer put into double quotes by the
create-db task</li>
+ <li>The template createdb.vm was added to be able to run the
create-db task</li>
+ </ul>
+ Also, a firebird profile was added for the runtimetest, and firebird
was added
+ to the list of supported databases on the homepage.
+ </action>
<action type="fix" dev="tfischer" issue="TRQS287">
Changed the name attribute of the database tag from #IMPLIED to
#REQUIRED in the dtd.
</action>
1.2 +1 -1
db-torque/src/generator/src/templates/sql/base/interbase/drop.vm
Index: drop.vm
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/base/interbase/drop.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drop.vm 10 Feb 2003 13:18:44 -0000 1.1
+++ drop.vm 1 Jun 2005 04:41:41 -0000 1.2
@@ -1 +1 @@
-drop table if exists $table.Name;
+drop table $table.Name;
1.2 +4 -4
db-torque/src/generator/src/templates/sql/base/interbase/table.vm
Index: table.vm
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/base/interbase/table.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- table.vm 10 Feb 2003 13:18:44 -0000 1.1
+++ table.vm 1 Jun 2005 04:41:41 -0000 1.2
@@ -1,8 +1,8 @@
-/* --------------------------------------------------------------------------
-$table.Name
--------------------------------------------------------------------------- */
-##$generator.parse("$basepath/drop.vm", "", "table", $tbl)
+--------------------------------------------------------------------------
+-- $table.Name
+--------------------------------------------------------------------------
+$generator.parse("$basepath/drop.vm", "", "table", $tbl)
CREATE TABLE $table.Name
(
#set ( $cols = $generator.parse("$basepath/columns.vm", "", "table", $tbl) )
1.5 +1 -1
db-torque/src/generator/src/templates/sql/base/interbase/columns.vm
Index: columns.vm
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/sql/base/interbase/columns.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- columns.vm 17 Jan 2004 01:53:28 -0000 1.4
+++ columns.vm 1 Jun 2005 04:41:41 -0000 1.5
@@ -2,7 +2,7 @@
#set ( $type = $col.Domain.SqlType )
#set ( $size = $col.printSize() )
#set ( $default = $col.DefaultSetting )
- #set ( $colName = $strings.concat(['"',$col.Name,'"']) )
+ #set ( $colName = $col.Name )
#set ( $entry = "$colName $type $size $default $col.NotNullString
$col.AutoIncrementString," )
$strings.sub($strings.collapseSpaces($entry)," ,",",")
#end
1.1 db-torque/profile/firebird.profile
Index: firebird.profile
===================================================================
# location of jar that you will be using for testing
# so that it can be copied into the dist/lib directory.
torque.testDatabaseJar =
${maven.repo.local}/firebird/jars/firebirdsql-1.5.5-full.jar
torque.idMethod = idbroker
#torque.idMethod = native
torque.defaultDatabase = bookstore
torque.sqlTest.defaultDatabase = sqltest
torque.sqlTest.databaseUrl =
jdbc:firebirdsql://192.168.1.101:3306/torquetest.fdb
lib.dir = lib
# -------------------------------------------------------------------
#
# T O R Q U E C O N F I G U R A T I O N F I L E
#
# -------------------------------------------------------------------
torque.project = bookstore
# -------------------------------------------------------------------
#
# T A R G E T D A T A B A S E
#
# -------------------------------------------------------------------
torque.database = interbase
# -------------------------------------------------------------------
#
# O B J E C T M O D E L I N F O R M A T I O N
#
# -------------------------------------------------------------------
# These settings will allow you to customize the way your
# Peer-based object model is created.
# -------------------------------------------------------------------
# addSaveMethod=true adds tracking code to determine how to save objects
#
# addGetByNameMethod=true adds methods to get fields by name/position
#
# complexObjectModel=true generates an om with collection support
#
# addTimeStamp=true puts time stamps in generated files
#
# addIntakeRetrievable=implement Intake's Retrievable interface
# -------------------------------------------------------------------
torque.generateDeprecated = false
torque.targetPackage=org.apache.torque.test
torque.basePrefix=Base
torque.addSaveMethod=true
torque.addGetByNameMethod=true
torque.complexObjectModel=true
#torque.complexObjectModel=false
torque.addTimeStamp=true
torque.addIntakeRetrievable=false
#torque.addIntakeRetrievable=true
#torque.useManagers=true
torque.useManagers=false
torque.generateBeans=true
# -------------------------------------------------------------------
#
# D A T A B A S E S E T T I N G S
#
# -------------------------------------------------------------------
# JDBC connection settings. This is used by the JDBCToXML task that
# will create an XML database schema from JDBC metadata. These
# settings are also used by the SQL Ant task to initialize your
# Torque system with the generated SQL.
# -------------------------------------------------------------------
torque.database.createUrl =
jdbc:firebirdsql://192.168.1.101:3050/torquetest.fdb
torque.database.buildUrl =
jdbc:firebirdsql://192.168.1.101:3050/torquetest.fdb
torque.database.url = jdbc:firebirdsql://192.168.1.101:3050/torquetest.fdb
torque.database.driver = org.firebirdsql.jdbc.FBDriver
torque.database.user = sysdba
torque.database.password = password
torque.database.host = 192.168.1.101
torque.database.validationQuery = SELECT CAST(1 AS INTEGER) FROM rdb$database
# Tells JDBC task that javaName attribute for the tables and columns
# should be made same as SQL name.
torque.sameJavaName = false
1.1
db-torque/src/generator/src/templates/sql/db-init/interbase/createdb.vm
Index: createdb.vm
===================================================================
-- do nothing
1.6 +2 -2 db-torque/src/rttest/id-table-schema.xml
Index: id-table-schema.xml
===================================================================
RCS file: /home/cvs/db-torque/src/rttest/id-table-schema.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- id-table-schema.xml 31 Oct 2003 20:48:42 -0000 1.5
+++ id-table-schema.xml 1 Jun 2005 04:41:41 -0000 1.6
@@ -16,7 +16,7 @@
<database name="@DATABASE_DEFAULT@">
<table name="ID_TABLE" idMethod="idbroker">
<column name="ID_TABLE_ID" required="true" primaryKey="true"
type="INTEGER"/>
- <column name="TABLE_NAME" required="true" size="255" type="VARCHAR"/>
+ <column name="TABLE_NAME" required="true" size="250" type="VARCHAR"/>
<column name="NEXT_ID" type="INTEGER"/>
<column name="QUANTITY" type="INTEGER"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
