Author: tfischer
Date: Tue Jan 22 22:32:04 2013
New Revision: 1437222
URL: http://svn.apache.org/viewvc?rev=1437222&view=rev
Log:
TORQUE-251 fix SQL errors in the test project for mysql
Modified:
db/torque/torque4/trunk/torque-test/pom.xml
db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml
Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1437222&r1=1437221&r2=1437222&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Tue Jan 22 22:32:04 2013
@@ -121,6 +121,9 @@
<filter token="ON_UPDATE_CASCADE"
value="${torque.test.onUpdateCascade}" />
<filter token="ON_UPDATE_SETNULL"
value="${torque.test.onUpdateSetNull}" />
<filter token="BIT_DATA_TYPE"
value="${torque.test.bitDataType}" />
+ <filter token="CURRENT_TIMESTAMP_DEFAULT"
value="${torque.test.currentTimestampDefault}" />
+ <filter token="CURRENT_TIME_DEFAULT"
value="${torque.test.currentTimeDefault}" />
+ <filter token="CURRENT_DATE_DEFAULT"
value="${torque.test.currentDateDefault}" />
</filterset>
</copy>
<delete dir="target/torque/test/sql" />
@@ -486,6 +489,9 @@
<torque.test.onUpdateCascade></torque.test.onUpdateCascade>
<torque.test.onUpdateSetNull></torque.test.onUpdateSetNull>
<torque.test.bitDataType>VARCHAR</torque.test.bitDataType><!-- BIT if
database supports bIT type, something else if not -->
+
<torque.test.currentDateDefault>default="CURRENT_DATE"</torque.test.currentDateDefault><!--
default="CURRENT_DATE" if database supports it -->
+
<torque.test.currentTimeDefault>default="CURRENT_TIME"</torque.test.currentTimeDefault><!--
default="CURRENT_TIME" if database supports it -->
+
<torque.test.currentTimestampDefault>default="CURRENT_TIMESTAMP"</torque.test.currentTimestampDefault><!--
default="CURRENT_TIMESTAMP" if database supports it -->
<torque.driver>org.apache.derby.jdbc.EmbeddedDriver</torque.driver>
<torque.targetDatabase>derby</torque.targetDatabase>
<torque.database.url>jdbc:derby:target/bookstore;create=true</torque.database.url>
@@ -535,6 +541,9 @@
<torque.test.onUpdateCascade>onUpdate="cascade"</torque.test.onUpdateCascade>
<torque.test.onUpdateSetNull>onUpdate="setnull"</torque.test.onUpdateSetNull>
<torque.test.bitDataType>BIT</torque.test.bitDataType><!-- BIT if
database supports bIT type, something else if not -->
+
<torque.test.currentDateDefault>default="CURRENT_DATE"</torque.test.currentDateDefault><!--
default="CURRENT_DATE" if database supports it -->
+
<torque.test.currentTimeDefault>default="CURRENT_TIME"</torque.test.currentTimeDefault><!--
default="CURRENT_TIME" if database supports it -->
+
<torque.test.currentTimestampDefault>default="CURRENT_TIMESTAMP"</torque.test.currentTimestampDefault><!--
default="CURRENT_TIMESTAMP" if database supports it -->
<torque.driver>org.hsqldb.jdbcDriver</torque.driver>
<torque.targetDatabase>hsqldb</torque.targetDatabase>
<torque.database.url>jdbc:hsqldb:target/sqltest;shutdown=true</torque.database.url>
@@ -585,6 +594,9 @@
<torque.test.onUpdateCascade>onUpdate="cascade"</torque.test.onUpdateCascade>
<torque.test.onUpdateSetNull>onUpdate="setnull"</torque.test.onUpdateSetNull>
<torque.test.bitDataType>BIT</torque.test.bitDataType><!-- BIT if
database supports bIT type, something else if not -->
+
<torque.test.currentDateDefault>default="CURRENT_DATE"</torque.test.currentDateDefault><!--
default="CURRENT_DATE" if database supports it -->
+
<torque.test.currentTimeDefault>default="CURRENT_TIME"</torque.test.currentTimeDefault><!--
default="CURRENT_TIME" if database supports it -->
+
<torque.test.currentTimestampDefault>default="CURRENT_TIMESTAMP"</torque.test.currentTimestampDefault><!--
default="CURRENT_TIMESTAMP" if database supports it -->
<torque.driver>org.hsqldb.jdbcDriver</torque.driver>
<torque.targetDatabase>hsqldb</torque.targetDatabase>
<torque.database.url>jdbc:hsqldb:torque-test/target/sqltest;shutdown=true</torque.database.url>
@@ -630,6 +642,9 @@
<torque.test.onUpdateCascade>onUpdate="cascade"</torque.test.onUpdateCascade>
<torque.test.onUpdateSetNull>onUpdate="setnull"</torque.test.onUpdateSetNull>
<torque.test.bitDataType>BIT</torque.test.bitDataType><!-- BIT if
database supports bIT type, something else if not -->
+
<torque.test.currentDateDefault>default="CURRENT_DATE"</torque.test.currentDateDefault><!--
default="CURRENT_DATE" if database supports it -->
+
<torque.test.currentTimeDefault>default="CURRENT_TIME"</torque.test.currentTimeDefault><!--
default="CURRENT_TIME" if database supports it -->
+
<torque.test.currentTimestampDefault>default="CURRENT_TIMESTAMP"</torque.test.currentTimestampDefault><!--
default="CURRENT_TIMESTAMP" if database supports it -->
<torque.driver>org.apache.derby.jdbc.ClientDriver</torque.driver>
<torque.targetDatabase>derby</torque.targetDatabase>
<torque.database.url>jdbc:derby://localhost:1527/bookstore;create=true</torque.database.url>
@@ -675,6 +690,9 @@
<torque.test.onUpdateCascade>onUpdate="cascade"</torque.test.onUpdateCascade>
<torque.test.onUpdateSetNull>onUpdate="setnull"</torque.test.onUpdateSetNull>
<torque.test.bitDataType>BIT</torque.test.bitDataType><!-- BIT if
database supports bIT type, something else if not -->
+ <torque.test.currentDateDefault></torque.test.currentDateDefault><!--
default="CURRENT_DATE" if database supports it -->
+ <torque.test.currentTimeDefault></torque.test.currentTimeDefault><!--
default="CURRENT_TIME" if database supports it -->
+
<torque.test.currentTimestampDefault></torque.test.currentTimestampDefault><!--
default="CURRENT_TIMESTAMP" if database supports it -->
<torque.driver>org.gjt.mm.mysql.Driver</torque.driver>
<torque.targetDatabase>mysql</torque.targetDatabase>
<torque.database.url>jdbc:mysql://localhost:3306/bookstore</torque.database.url>
@@ -720,6 +738,9 @@
<torque.test.onUpdateCascade>onUpdate="cascade"</torque.test.onUpdateCascade>
<torque.test.onUpdateSetNull>onUpdate="setnull"</torque.test.onUpdateSetNull>
<torque.test.bitDataType>BIT</torque.test.bitDataType><!-- BIT if
database supports bIT type, something else if not -->
+
<torque.test.currentDateDefault>default="CURRENT_DATE"</torque.test.currentDateDefault><!--
default="CURRENT_DATE" if database supports it -->
+
<torque.test.currentTimeDefault>default="CURRENT_TIME"</torque.test.currentTimeDefault><!--
default="CURRENT_TIME" if database supports it -->
+
<torque.test.currentTimestampDefault>default="CURRENT_TIMESTAMP"</torque.test.currentTimestampDefault><!--
default="CURRENT_TIMESTAMP" if database supports it -->
<torque.driver>net.sourceforge.jtds.jdbc.Driver</torque.driver>
<torque.targetDatabase>mssql</torque.targetDatabase>
<torque.database.url>jdbc:jtds:sqlserver://localhost:1433/torque</torque.database.url>
@@ -765,6 +786,9 @@
<torque.test.onUpdateCascade>onUpdate="cascade"</torque.test.onUpdateCascade>
<torque.test.onUpdateSetNull>onUpdate="setnull"</torque.test.onUpdateSetNull>
<torque.test.bitDataType>BIT</torque.test.bitDataType><!-- BIT if
database supports bIT type, something else if not -->
+
<torque.test.currentDateDefault>default="CURRENT_DATE"</torque.test.currentDateDefault><!--
default="CURRENT_DATE" if database supports it -->
+
<torque.test.currentTimeDefault>default="CURRENT_TIME"</torque.test.currentTimeDefault><!--
default="CURRENT_TIME" if database supports it -->
+
<torque.test.currentTimestampDefault>default="CURRENT_TIMESTAMP"</torque.test.currentTimestampDefault><!--
default="CURRENT_TIMESTAMP" if database supports it -->
<torque.driver>oracle.jdbc.driver.OracleDriver</torque.driver>
<torque.targetDatabase>oracle</torque.targetDatabase>
<torque.database.url>jdbc:oracle:thin:@localhost:1521:XE</torque.database.url>
@@ -810,6 +834,9 @@
<torque.test.onUpdateCascade>onUpdate="cascade"</torque.test.onUpdateCascade>
<torque.test.onUpdateSetNull>onUpdate="setnull"</torque.test.onUpdateSetNull>
<torque.test.bitDataType>BIT</torque.test.bitDataType><!-- BIT if
database supports bIT type, something else if not -->
+
<torque.test.currentDateDefault>default="CURRENT_DATE"</torque.test.currentDateDefault><!--
default="CURRENT_DATE" if database supports it -->
+
<torque.test.currentTimeDefault>default="CURRENT_TIME"</torque.test.currentTimeDefault><!--
default="CURRENT_TIME" if database supports it -->
+
<torque.test.currentTimestampDefault>default="CURRENT_TIMESTAMP"</torque.test.currentTimestampDefault><!--
default="CURRENT_TIMESTAMP" if database supports it -->
<torque.driver>org.postgresql.Driver</torque.driver>
<torque.targetDatabase>postgresql</torque.targetDatabase>
<torque.database.url>jdbc:postgresql://localhost:5432/bookstore</torque.database.url>
@@ -855,6 +882,9 @@
<torque.test.onUpdateCascade>onUpdate="cascade"</torque.test.onUpdateCascade>
<torque.test.onUpdateSetNull>onUpdate="setnull"</torque.test.onUpdateSetNull>
<torque.test.bitDataType>BIT</torque.test.bitDataType><!-- BIT if
database supports bIT type, something else if not -->
+
<torque.test.currentDateDefault>default="CURRENT_DATE"</torque.test.currentDateDefault><!--
default="CURRENT_DATE" if database supports it -->
+
<torque.test.currentTimeDefault>default="CURRENT_TIME"</torque.test.currentTimeDefault><!--
default="CURRENT_TIME" if database supports it -->
+
<torque.test.currentTimestampDefault>default="CURRENT_TIMESTAMP"</torque.test.currentTimestampDefault><!--
default="CURRENT_TIMESTAMP" if database supports it -->
<torque.driver>org.gjt.mm.mysql.Driver</torque.driver>
<torque.targetDatabase>mysql</torque.targetDatabase>
<torque.database.url>jdbc:mysql://gatekeeper.home.lan:3306/bookstore</torque.database.url>
@@ -897,6 +927,9 @@
<torque.test.onUpdateCascade>onUpdate="cascade"</torque.test.onUpdateCascade>
<torque.test.onUpdateSetNull>onUpdate="setnull"</torque.test.onUpdateSetNull>
<torque.test.bitDataType>VARCHAR</torque.test.bitDataType><!-- BIT if
database supports bIT type, something else if not -->
+
<torque.test.currentDateDefault>default="CURRENT_DATE"</torque.test.currentDateDefault><!--
default="CURRENT_DATE" if database supports it -->
+
<torque.test.currentTimeDefault>default="CURRENT_TIME"</torque.test.currentTimeDefault><!--
default="CURRENT_TIME" if database supports it -->
+
<torque.test.currentTimestampDefault>default="CURRENT_TIMESTAMP"</torque.test.currentTimestampDefault><!--
default="CURRENT_TIMESTAMP" if database supports it -->
<torque.driver>org.apache.derby.jdbc.EmbeddedDriver</torque.driver>
<torque.targetDatabase>derby</torque.targetDatabase>
<torque.database.url>jdbc:derby:torque-test/target/bookstore;create=true</torque.database.url>
Modified:
db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml?rev=1437222&r1=1437221&r2=1437222&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml
(original)
+++
db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml
Tue Jan 22 22:32:04 2013
@@ -23,7 +23,7 @@
package="org.apache.torque.test.ext"
xmlns="http://db.apache.org/torque/4.0/templates/database";>
- <domain name="myTimestamp" type="TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+ <domain name="myTimestamp" type="TIMESTAMP" @CURRENT_TIMESTAMP_DEFAULT@/>
<table name="database_default_values">
<column
@@ -131,12 +131,12 @@
<column
name="CURRENT_DATE_VALUE"
type="DATE"
- default="CURRENT_DATE"
+ @CURRENT_DATE_DEFAULT@
/>
<column
name="CURRENT_TIME_VALUE"
type="TIME"
- default="CURRENT_TIME"
+ @CURRENT_TIME_DEFAULT@
/>
<column
name="CURRENT_TIMESTAMP_VALUE"
@@ -161,7 +161,7 @@
name="CURRENT_DATE_VALUE"
required="true"
type="DATE"
- default="CURRENT_DATE"
+ @CURRENT_DATE_DEFAULT@
useDatabaseDefaultValue="true"
/>
</table>
@@ -183,7 +183,7 @@
name="CURRENT_TIME_VALUE"
required="true"
type="TIME"
- default="CURRENT_TIME"
+ @CURRENT_TIME_DEFAULT@
useDatabaseDefaultValue="true"
/>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
