You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by fe...@apache.org on 2001/08/15 07:12:53 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/torque TorqueJDBCTransformTask.java
fedor 01/08/14 22:12:53
Modified: src/java/org/apache/turbine/torque Tag: T_2_1_BRANCH
TorqueJDBCTransformTask.java
Log:
now JDBC task also imports the defaults.
Revision Changes Path
No revision
No revision
1.4.4.9 +22 -1 jakarta-turbine/src/java/org/apache/turbine/torque/Attic/TorqueJDBCTransformTask.java
Index: TorqueJDBCTransformTask.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/torque/Attic/TorqueJDBCTransformTask.java,v
retrieving revision 1.4.4.8
retrieving revision 1.4.4.9
diff -u -r1.4.4.8 -r1.4.4.9
--- TorqueJDBCTransformTask.java 2001/08/12 05:56:33 1.4.4.8
+++ TorqueJDBCTransformTask.java 2001/08/15 05:12:53 1.4.4.9
@@ -92,7 +92,7 @@
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:fedor.karpelevitch@barra.com">Fedor Karpelevitch</a>
- * @version $Id: TorqueJDBCTransformTask.java,v 1.4.4.8 2001/08/12 05:56:33 fedor Exp $
+ * @version $Id: TorqueJDBCTransformTask.java,v 1.4.4.9 2001/08/15 05:12:53 fedor Exp $
*/
public class TorqueJDBCTransformTask extends Task
{
@@ -288,6 +288,7 @@
/* int columnNullableUnknown = 2; */
Integer nullType = (Integer) v.elementAt(3);
+ String defValue = (String)v.elementAt(4);
Element column = doc.createElement("column");
column.setAttribute("name", name);
@@ -316,6 +317,24 @@
column.setAttribute("primaryKey", "true");
}
+ if (defValue!=null)
+ {
+ // trim out parens & quotes out of def value.
+ // makes sense for MSSQL. not sure about others.
+
+ if (defValue.startsWith("(") && defValue.endsWith(")"))
+ {
+ defValue = defValue.substring(1, defValue.length()-1);
+ }
+
+ if (defValue.startsWith("'") && defValue.endsWith("'"))
+ {
+ defValue = defValue.substring(1, defValue.length()-1);
+ }
+
+ column.setAttribute("default", defValue);
+ }
+
table.appendChild(column);
}
@@ -397,12 +416,14 @@
Integer sqlType = new Integer(columnSet.getString(5));
Integer size = new Integer(columnSet.getInt(7));
Integer nullType = new Integer(columnSet.getInt(11));
+ String defValue = columnSet.getString(13);
Vector v = new Vector();
v.addElement (name);
v.addElement (sqlType);
v.addElement (size);
v.addElement (nullType);
+ v.addElement (defValue);
columns.addElement (v);
}
return columns;
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org