tfischer 2005/03/09 07:43:05
Modified: . project-base.xml
xdocs changes.xml
src/generator/src/java/org/apache/torque/engine/platform
PlatformOracleImpl.java
src/generator/src/test/org/apache/torque/engine/database/model
OracleDomainTest.java
Log:
TRQS263:
In Oracle:
schema type timestamp is now mapped to database type timestamp (and not to
date anymore)
The number of digits used to store an integer is limited to 10
Thanks to Christoph Zenger for the patch
Revision Changes Path
1.14 +4 -0 db-torque/project-base.xml
Index: project-base.xml
===================================================================
RCS file: /home/cvs/db-torque/project-base.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project-base.xml 31 Jan 2005 19:43:56 -0000 1.13
+++ project-base.xml 9 Mar 2005 15:43:05 -0000 1.14
@@ -282,6 +282,10 @@
<name>Thomas Vandahl</name>
<email>[EMAIL PROTECTED]</email>
</contributor>
+ <contributor>
+ <name>Christoph Zenger</name>
+ <email>[EMAIL PROTECTED]</email>
+ </contributor>
</contributors>
<licenses>
1.147 +4 -0 db-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- changes.xml 4 Mar 2005 06:37:02 -0000 1.146
+++ changes.xml 9 Mar 2005 15:43:05 -0000 1.147
@@ -28,6 +28,10 @@
<body>
<release version="3.2-dev" date="in CVS">
+ <action type="add" dev="tfischer">
+ TRQS263: Add support for oracle datatype timestamp;
+ limit number of digits for saving integers in oracle to 10
+ </action>
<action type="fix" dev="tfischer">
TRQS267: Fix escpaing of single quotes in datasql task
</action>
1.7 +3 -3
db-torque/src/generator/src/java/org/apache/torque/engine/platform/PlatformOracleImpl.java
Index: PlatformOracleImpl.java
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/java/org/apache/torque/engine/platform/PlatformOracleImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PlatformOracleImpl.java 22 Feb 2004 06:27:19 -0000 1.6
+++ PlatformOracleImpl.java 9 Mar 2005 15:43:05 -0000 1.7
@@ -44,7 +44,7 @@
setSchemaDomainMapping(new Domain(SchemaType.BIT, "NUMBER", "1",
"0"));
setSchemaDomainMapping(new Domain(SchemaType.TINYINT, "NUMBER", "3",
"0"));
setSchemaDomainMapping(new Domain(SchemaType.SMALLINT, "NUMBER",
"5", "0"));
- setSchemaDomainMapping(new Domain(SchemaType.INTEGER, "NUMBER"));
+ setSchemaDomainMapping(new Domain(SchemaType.INTEGER, "NUMBER",
"10", "0"));
setSchemaDomainMapping(new Domain(SchemaType.BOOLEANINT, "NUMBER",
"1", "0"));
setSchemaDomainMapping(new Domain(SchemaType.BIGINT, "NUMBER", "20",
"0"));
setSchemaDomainMapping(new Domain(SchemaType.REAL, "NUMBER"));
@@ -54,7 +54,7 @@
setSchemaDomainMapping(new Domain(SchemaType.VARCHAR, "VARCHAR2"));
setSchemaDomainMapping(new Domain(SchemaType.LONGVARCHAR,
"VARCHAR2", "2000"));
setSchemaDomainMapping(new Domain(SchemaType.TIME, "DATE"));
- setSchemaDomainMapping(new Domain(SchemaType.TIMESTAMP, "DATE"));
+ setSchemaDomainMapping(new Domain(SchemaType.TIMESTAMP,
"TIMESTAMP"));
setSchemaDomainMapping(new Domain(SchemaType.BINARY, "LONG RAW"));
setSchemaDomainMapping(new Domain(SchemaType.VARBINARY, "BLOB"));
setSchemaDomainMapping(new Domain(SchemaType.LONGVARBINARY, "LONG
RAW"));
1.4 +3 -3
db-torque/src/generator/src/test/org/apache/torque/engine/database/model/OracleDomainTest.java
Index: OracleDomainTest.java
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/test/org/apache/torque/engine/database/model/OracleDomainTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OracleDomainTest.java 22 Feb 2004 06:29:38 -0000 1.3
+++ OracleDomainTest.java 9 Mar 2005 15:43:05 -0000 1.4
@@ -113,7 +113,7 @@
Table table = db.getTable("native");
Column col = table.getColumn("native_id");
assertEquals("", col.getAutoIncrementString());
- assertEquals("native_id NUMBER NOT NULL ", col.getSqlString());
+ assertEquals("native_id NUMBER(10,0) NOT NULL ", col.getSqlString());
col = table.getColumn("name");
assertEquals("", col.getAutoIncrementString());
}
@@ -123,7 +123,7 @@
Table table = db.getTable("article");
Column col = table.getColumn("article_id");
assertEquals("", col.getAutoIncrementString());
- assertEquals("article_id NUMBER NOT NULL ", col.getSqlString());
+ assertEquals("article_id NUMBER(10,0) NOT NULL ",
col.getSqlString());
col = table.getColumn("name");
assertEquals("", col.getAutoIncrementString());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
