db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1436342 - in /db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates: transformer/SchemaTypeHelper.java typemapping/SizedForBitDataSqlType.java typemapping/SqlType.java
Date Mon, 21 Jan 2013 13:40:05 GMT
Author: tfischer
Date: Mon Jan 21 13:40:05 2013
New Revision: 1436342

URL: http://svn.apache.org/viewvc?rev=1436342&view=rev
Log:
TORQUE-252: BINARY and VARBINARY Datatypes mapped incorrectly in Derby
Fixed transferring default size from schema mapping

Modified:
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java?rev=1436342&r1=1436341&r2=1436342&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/SchemaTypeHelper.java
Mon Jan 21 13:40:05 2013
@@ -162,7 +162,6 @@ public final class SchemaTypeHelper
             }
         }
         SqlType result = platformSqlType.getNew(
-                platformSqlType.getSqlTypeName(),
                 size,
                 scale,
                 defaultValue);

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java?rev=1436342&r1=1436341&r2=1436342&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SizedForBitDataSqlType.java
Mon Jan 21 13:40:05 2013
@@ -75,7 +75,7 @@ public class SizedForBitDataSqlType exte
      * @see SqlType#SqlType(String, String, string, String)
      */
     public SizedForBitDataSqlType(
-            String sqlType,
+            SqlType sqlType,
             String size,
             String scale,
             String defaultValue)
@@ -110,7 +110,6 @@ public class SizedForBitDataSqlType exte
      */
     @Override
     public SqlType getNew(
-            String sqlTypeName,
             String size,
             String scale,
             String defaultValue)
@@ -120,7 +119,7 @@ public class SizedForBitDataSqlType exte
             size = "1";;
         }
         return new SizedForBitDataSqlType(
-                sqlTypeName,
+                this,
                 size,
                 scale,
                 defaultValue);

Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java?rev=1436342&r1=1436341&r2=1436342&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/SqlType.java
Mon Jan 21 13:40:05 2013
@@ -249,11 +249,10 @@ public class SqlType
      * @return a new instance with the given parameters.
      */
     public SqlType getNew(
-            String sqlTypeName,
             String size,
             String scale,
             String defaultValue)
     {
-        return new SqlType(sqlTypeName, size, scale, defaultValue);
+        return new SqlType(this, size, scale, defaultValue);
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message