mpoeschl 2002/10/24 09:18:40
Modified: src/java/org/apache/torque/engine/database/model
TypeMap.java
src/rttest test-schema.xml
xdocs changes.xml
Log:
TRQ28: booleanint/booleanchar fails with javaType="object"
Revision Changes Path
1.6 +17 -15
jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/TypeMap.java
Index: TypeMap.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/TypeMap.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TypeMap.java 11 Apr 2002 22:02:06 -0000 1.5
+++ TypeMap.java 24 Oct 2002 16:18:40 -0000 1.6
@@ -228,8 +228,8 @@
public static final String REAL_VILLAGE_OBJECT_METHOD = "asFloatObj()";
public static final String FLOAT_VILLAGE_OBJECT_METHOD = "asDoubleObj()";
public static final String DOUBLE_VILLAGE_OBJECT_METHOD = "asDoubleObj()";
- public static final String BOOLEANINT_VILLAGE_OBJECT_METHOD =
- "asIntegerObj()";
+ public static final String BOOLEANCHAR_VILLAGE_OBJECT_METHOD = "asString()";
+ public static final String BOOLEANINT_VILLAGE_OBJECT_METHOD = "asInt()";
public static final String CHAR_PP_METHOD = "getString(ppKey)";
public static final String VARCHAR_PP_METHOD = "getString(ppKey)";
@@ -340,9 +340,9 @@
jdbcToJavaNativeObjectMap.put(REAL, REAL_NATIVE_OBJECT_TYPE);
jdbcToJavaNativeObjectMap.put(FLOAT, FLOAT_NATIVE_OBJECT_TYPE);
jdbcToJavaNativeObjectMap.put(DOUBLE, DOUBLE_NATIVE_OBJECT_TYPE);
- jdbcToJavaNativeObjectMap.put(BOOLEANCHAR,
+ jdbcToJavaNativeObjectMap.put(BOOLEANCHAR,
BOOLEANCHAR_NATIVE_OBJECT_TYPE);
- jdbcToJavaNativeObjectMap.put(BOOLEANINT,
+ jdbcToJavaNativeObjectMap.put(BOOLEANINT,
BOOLEANINT_NATIVE_OBJECT_TYPE);
/*
@@ -378,19 +378,21 @@
jdbcToVillageObjectMethodMap = new Hashtable();
jdbcToVillageObjectMethodMap.put(BIT, BIT_VILLAGE_OBJECT_METHOD);
- jdbcToVillageObjectMethodMap.put(TINYINT,
+ jdbcToVillageObjectMethodMap.put(TINYINT,
TINYINT_VILLAGE_OBJECT_METHOD);
- jdbcToVillageObjectMethodMap.put(SMALLINT,
+ jdbcToVillageObjectMethodMap.put(SMALLINT,
SMALLINT_VILLAGE_OBJECT_METHOD);
- jdbcToVillageObjectMethodMap.put(INTEGER,
+ jdbcToVillageObjectMethodMap.put(INTEGER,
INTEGER_VILLAGE_OBJECT_METHOD);
- jdbcToVillageObjectMethodMap.put(BIGINT,
+ jdbcToVillageObjectMethodMap.put(BIGINT,
BIGINT_VILLAGE_OBJECT_METHOD);
jdbcToVillageObjectMethodMap.put(REAL, REAL_VILLAGE_OBJECT_METHOD);
jdbcToVillageObjectMethodMap.put(FLOAT, FLOAT_VILLAGE_OBJECT_METHOD);
- jdbcToVillageObjectMethodMap.put(DOUBLE,
+ jdbcToVillageObjectMethodMap.put(DOUBLE,
DOUBLE_VILLAGE_OBJECT_METHOD);
- jdbcToVillageObjectMethodMap.put(BOOLEANINT,
+ jdbcToVillageObjectMethodMap.put(BOOLEANCHAR,
+ BOOLEANCHAR_VILLAGE_OBJECT_METHOD);
+ jdbcToVillageObjectMethodMap.put(BOOLEANINT,
BOOLEANINT_VILLAGE_OBJECT_METHOD);
/*
@@ -530,9 +532,9 @@
initialize();
}
String s = (String)jdbcToJavaNativeObjectMap.get(jdbcType);
- if ( s == null )
+ if ( s == null )
{
- s = (String)jdbcToJavaNativeMap.get(jdbcType);
+ s = (String)jdbcToJavaNativeMap.get(jdbcType);
}
return s;
}
@@ -563,9 +565,9 @@
initialize();
}
String s = (String)jdbcToVillageObjectMethodMap.get(jdbcType);
- if ( s == null )
+ if ( s == null )
{
- s = (String)jdbcToVillageMethodMap.get(jdbcType);
+ s = (String)jdbcToVillageMethodMap.get(jdbcType);
}
return s;
}
1.2 +3 -0 jakarta-turbine-torque/src/rttest/test-schema.xml
Index: test-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/rttest/test-schema.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test-schema.xml 24 Oct 2002 15:38:04 -0000 1.1
+++ test-schema.xml 24 Oct 2002 16:18:40 -0000 1.2
@@ -12,6 +12,9 @@
<table name="timestamp_pk">
<column name="test_key" required="true" primaryKey="true" type="TIMESTAMP" />
<column name="col_a" type="TIMESTAMP" />
+ <!-- TRQS28 -->
+ <column name="col_b" type="BOOLEANINT" javaType="object" />
+ <column name="col_c" type="BOOLEANCHAR" javaType="object" />
</table>
</database>
1.40 +6 -3 jakarta-turbine-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/xdocs/changes.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- changes.xml 24 Oct 2002 15:17:01 -0000 1.39
+++ changes.xml 24 Oct 2002 16:18:40 -0000 1.40
@@ -38,9 +38,6 @@
TRQS13: torque.overloadKeySetters obsoleted
</li>
<li>
- TRQS15: Torque gererated code does not compile
- </li>
- <li>
added support for the new com.mysql.jdbc.Driver
</li>
<li>
@@ -72,6 +69,9 @@
TRQ26: string to date conversion in MSSQL/Sybase
</li>
<li>
+ TRQ28: booleanint/booleanchar fails with javaType="object"
+ </li>
+ <li>
TRQ31: ComboKey(String) ctor out-of-memory error
</li>
<li>
@@ -87,6 +87,9 @@
</li>
<li>
TRQS1: several small patches to correct db2 sql generation
+ </li>
+ <li>
+ TRQS15: Torque gererated code does not compile
</li>
<li>
bugzilla #12626: Peer.vm was missing the DateKey import.
--
To unsubscribe, e-mail: <mailto:turbine-torque-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:turbine-torque-dev-help@;jakarta.apache.org>
