Author: mwriedt
Date: Sat Nov 23 15:16:02 2024
New Revision: 1922040
URL: http://svn.apache.org/viewvc?rev=1922040&view=rev
Log:
Fix TORQUE-368 // allowing an empty String as a valid value for "default"
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-derby.sql
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-hsqldb.sql
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mssql.sql
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mysql.sql
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-oracle.sql
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-postgresql.sql
db/torque/trunk/torque-templates/src/test/schema/schema.xml
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java?rev=1922040&r1=1922039&r2=1922040&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
Sat Nov 23 15:16:02 2024
@@ -299,7 +299,7 @@ public class SQLModelTransformer impleme
resultList.add(sqlTypeName);
- if (StringUtils.isNotEmpty(sqlType.getDefaultValue()))
+ if (sqlType.getDefaultValue() != null)
{
resultList.add("default");
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java?rev=1922040&r1=1922039&r2=1922040&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
(original)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
Sat Nov 23 15:16:02 2024
@@ -345,7 +345,7 @@ public class SQLTransformer implements S
resultList.add(sqlTypeName);
- if (StringUtils.isNotEmpty(sqlType.getDefaultValue()))
+ if (sqlType.getDefaultValue() != null)
{
resultList.add("default");
Modified:
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-derby.sql
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-derby.sql?rev=1922040&r1=1922039&r2=1922040&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-derby.sql
(original)
+++
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-derby.sql
Sat Nov 23 15:16:02 2024
@@ -84,7 +84,8 @@ CREATE TABLE a
(
a_id INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
name VARCHAR(50) default 'a_name' NOT NULL,
- contactdata VARCHAR(500) NOT NULL,
+ contactdata_withoutdefault VARCHAR(500) NOT NULL,
+ contactdata_withemptydefault VARCHAR(500) default '' NOT NULL,
created_at TIMESTAMP default CURRENT_TIMESTAMP NOT NULL,
updated_at TIMESTAMP NOT NULL,
enum VARCHAR(50) default 'x',
Modified:
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-hsqldb.sql
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-hsqldb.sql?rev=1922040&r1=1922039&r2=1922040&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-hsqldb.sql
(original)
+++
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-hsqldb.sql
Sat Nov 23 15:16:02 2024
@@ -88,7 +88,8 @@ CREATE TABLE a
(
a_id INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH 1) NOT NULL,
name VARCHAR(50) default 'a_name' NOT NULL,
- contactdata VARCHAR(500) NOT NULL,
+ contactdata_withoutdefault VARCHAR(500) NOT NULL,
+ contactdata_withemptydefault VARCHAR(500) default '' NOT NULL,
created_at TIMESTAMP(6) default CURRENT_TIMESTAMP NOT NULL,
updated_at TIMESTAMP(6) NOT NULL,
enum VARCHAR(50) default 'x',
Modified:
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mssql.sql
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mssql.sql?rev=1922040&r1=1922039&r2=1922040&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mssql.sql
(original)
+++
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mssql.sql
Sat Nov 23 15:16:02 2024
@@ -449,7 +449,8 @@ CREATE TABLE a
(
a_id INT NOT NULL IDENTITY,
name VARCHAR(50) default 'a_name' NOT NULL,
- contactdata VARCHAR(500) NOT NULL,
+ contactdata_withoutdefault VARCHAR(500) NOT NULL,
+ contactdata_withemptydefault VARCHAR(500) default '' NOT NULL,
created_at DATETIME(6) default CURRENT_TIMESTAMP NOT NULL,
updated_at DATETIME(6) NOT NULL,
enum VARCHAR(50) default 'x' NULL,
Modified:
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mysql.sql
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mysql.sql?rev=1922040&r1=1922039&r2=1922040&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mysql.sql
(original)
+++
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-mysql.sql
Sat Nov 23 15:16:02 2024
@@ -45,7 +45,8 @@ CREATE TABLE a
(
a_id INTEGER NOT NULL AUTO_INCREMENT,
name VARCHAR(50) default 'a_name' NOT NULL,
- contactdata VARCHAR(500) NOT NULL,
+ contactdata_withoutdefault VARCHAR(500) NOT NULL,
+ contactdata_withemptydefault VARCHAR(500) default '' NOT NULL,
created_at DATETIME(6) default CURRENT_TIMESTAMP NOT NULL,
updated_at DATETIME(6) NOT NULL,
enum VARCHAR(50) default 'x',
Modified:
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-oracle.sql
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-oracle.sql?rev=1922040&r1=1922039&r2=1922040&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-oracle.sql
(original)
+++
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-oracle.sql
Sat Nov 23 15:16:02 2024
@@ -90,7 +90,8 @@ CREATE TABLE a
(
a_id NUMBER(10,0) NOT NULL,
name VARCHAR2(50 CHAR) default 'a_name' NOT NULL,
- contactdata VARCHAR2(500 CHAR) NOT NULL,
+ contactdata_withoutdefault VARCHAR2(500 CHAR) NOT NULL,
+ contactdata_withemptydefault VARCHAR2(500 CHAR) default '' NOT NULL,
created_at TIMESTAMP(6) default CURRENT_TIMESTAMP NOT NULL,
updated_at TIMESTAMP(6) NOT NULL,
enum VARCHAR2(50 CHAR) default 'x'
Modified:
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-postgresql.sql
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-postgresql.sql?rev=1922040&r1=1922039&r2=1922040&view=diff
==============================================================================
---
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-postgresql.sql
(original)
+++
db/torque/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-postgresql.sql
Sat Nov 23 15:16:02 2024
@@ -94,7 +94,8 @@ CREATE TABLE a
(
a_id INTEGER NOT NULL,
name VARCHAR(50) default 'a_name' NOT NULL,
- contactdata VARCHAR(500) NOT NULL,
+ contactdata_withoutdefault VARCHAR(500) NOT NULL,
+ contactdata_withemptydefault VARCHAR(500) default '' NOT NULL,
created_at TIMESTAMP(6) default CURRENT_TIMESTAMP NOT NULL,
updated_at TIMESTAMP(6) NOT NULL,
enum VARCHAR(50) default 'x',
Modified: db/torque/trunk/torque-templates/src/test/schema/schema.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/test/schema/schema.xml?rev=1922040&r1=1922039&r2=1922040&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/src/test/schema/schema.xml (original)
+++ db/torque/trunk/torque-templates/src/test/schema/schema.xml Sat Nov 23
15:16:02 2024
@@ -47,13 +47,21 @@
<!-- resetting of attributes size/scale for the same sql type
eg. by scale="") is only required if xdoc or html is generated (bug!)
-->
+ <!-- required columns, but one of it sets the default value to empty
string -->
<column
- name="contactdata"
+ name="contactdata_withoutdefault"
required="true"
type="VARCHAR"
size="500"
/>
<column
+ name="contactdata_withemptydefault"
+ required="true"
+ type="VARCHAR"
+ size="500"
+ default=""
+ />
+ <column
name="created_at"
required="true"
type="TIMESTAMP"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
