mpoeschl 2003/08/22 10:01:42
Modified: src/generator/src/java/org/apache/torque/task
TorqueJDBCTransformTask.java
xdocs changes.xml
Log:
JdbcTrasformTask: error fetching foreign keys using an ODBC source.
patch by [EMAIL PROTECTED]
Revision Changes Path
1.6 +4 -3
db-torque/src/generator/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java
Index: TorqueJDBCTransformTask.java
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TorqueJDBCTransformTask.java 25 Jul 2003 16:47:42 -0000 1.5
+++ TorqueJDBCTransformTask.java 22 Aug 2003 17:01:42 -0000 1.6
@@ -511,18 +511,19 @@
foreignKeys = dbMeta.getImportedKeys(null, dbSchema, tableName);
while (foreignKeys.next())
{
+ String refTableName = foreignKeys.getString(3);
String fkName = foreignKeys.getString(12);
// if FK has no name - make it up (use tablename instead)
if (fkName == null)
{
- fkName = foreignKeys.getString(3);
+ fkName = refTableName;
}
Object[] fk = (Object[]) fks.get(fkName);
List refs;
if (fk == null)
{
fk = new Object[2];
- fk[0] = foreignKeys.getString(3); //referenced table name
+ fk[0] = refTableName; //referenced table name
refs = new ArrayList();
fk[1] = refs;
fks.put(fkName, fk);
1.105 +16 -0 db-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- changes.xml 19 Aug 2003 19:18:15 -0000 1.104
+++ changes.xml 22 Aug 2003 17:01:42 -0000 1.105
@@ -9,6 +9,22 @@
<body>
+<section name="Torque 3.1-rc">
+<p>
+ Changes between Torque 3.1-beta1 and 3.1-rc. <br/>
+</p>
+
+<subsection name="Fixed bugs">
+<p>
+ <ul>
+ <li>
+ JdbcTrasformTask: error fetching foreign keys using an ODBC source.
+ </li>
+ </ul>
+</p>
+</subsection>
+</section>
+
<section name="Torque 3.1-beta1">
<p>
Changes between Torque 3.1-alpha2 and 3.1-beta1. <br/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
