You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jm...@apache.org on 2001/10/29 05:07:26 UTC
cvs commit: jakarta-turbine-torque/src/templates/sql/base/postgresql db.props
jmcnally 01/10/28 20:07:26
Modified: src/conf build.xml
src/java/org/apache/torque/task TorqueObjectModelTask.java
src/templates/om Control.vm MapBuilder.vm
src/templates/sql/base/oracle db.props
src/templates/sql/base/postgresql db.props
Log:
made db.props available to the om/peer generation. used this to set the
sequence name for oracle in the event the idMethod="native" is used in the
xml.
Revision Changes Path
1.10 +1 -0 jakarta-turbine-torque/src/conf/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 2001/10/28 19:39:35 1.9
+++ build.xml 2001/10/29 04:07:26 1.10
@@ -254,6 +254,7 @@
outputFile="report.${project}.om.generation"
targetPackage="${targetPackage}.om"
xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
+ targetDatabase="${database}"
/>
</target>
1.5 +32 -1 jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueObjectModelTask.java
Index: TorqueObjectModelTask.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueObjectModelTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TorqueObjectModelTask.java 2001/10/28 20:33:24 1.4
+++ TorqueObjectModelTask.java 2001/10/29 04:07:26 1.5
@@ -62,7 +62,7 @@
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: TorqueObjectModelTask.java,v 1.4 2001/10/28 20:33:24 jvanzyl Exp $
+ * @version $Id: TorqueObjectModelTask.java,v 1.5 2001/10/29 04:07:26 jmcnally Exp $
*/
public class TorqueObjectModelTask
extends TorqueDataModelTask
@@ -74,6 +74,14 @@
private String targetPackage;
/**
+ * The target database(s) we are generating SQL
+ * for. Right now we can only deal with a single
+ * target, but we will support multiple targets
+ * soon.
+ */
+ private String targetDatabase;
+
+ /**
* Get the current target package.
*
* @return return target java package.
@@ -95,6 +103,28 @@
}
/**
+ * Get the current target package.
+ *
+ * @return String target database(s)
+ */
+ public String getTargetDatabase ()
+ {
+ return targetDatabase;
+ }
+
+ /**
+ * Set the current target package. This is where
+ * generated java classes will live.
+ *
+ * @param String target database(s)
+ */
+ public void setTargetDatabase (String v)
+ {
+ targetDatabase = v;
+ }
+
+
+ /**
* Place our target package value
* into the context for use in the templates.
*/
@@ -103,6 +133,7 @@
{
super.initControlContext();
context.put("targetPackage", targetPackage);
+ context.put("targetDatabase", targetDatabase);
return context;
}
}
1.3 +2 -0 jakarta-turbine-torque/src/templates/om/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/Control.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Control.vm 2001/10/27 19:06:16 1.2
+++ Control.vm 2001/10/29 04:07:26 1.3
@@ -1,4 +1,6 @@
#set ($basePath = $generator.OutputPath)
+#set ( $dbprops = $properties.load("$generator.TemplatePath/sql/base/$targetDatabase/db.props") )
+
#foreach ($dataModel in $dataModels)
#foreach ($database in $dataModel.Databases)
1.5 +1 -1 jakarta-turbine-torque/src/templates/om/MapBuilder.vm
Index: MapBuilder.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/MapBuilder.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MapBuilder.vm 2001/08/29 05:27:33 1.4
+++ MapBuilder.vm 2001/10/29 04:07:26 1.5
@@ -95,7 +95,7 @@
#if ($table.IdMethod == "idbroker")
tMap.setPrimaryKeyMethodInfo(tMap.getName());
- #elseif ($table.IdMethod == "sequence")
+ #elseif ($table.IdMethod == "sequence" || ($table.IdMethod == "native" && $dbprops.get("idMethod") == "sequence"))
tMap.setPrimaryKeyMethodInfo("$table.SequenceName");
#elseif ($table.IdMethodParameters)
// this might need upgrading based on what all the databases
1.3 +2 -0 jakarta-turbine-torque/src/templates/sql/base/oracle/db.props
Index: db.props
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/oracle/db.props,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- db.props 2001/08/22 02:08:42 1.2
+++ db.props 2001/10/29 04:07:26 1.3
@@ -45,3 +45,5 @@
suppressDefaults = false
maxColumnNameLength = 30
+
+idMethod=sequence
1.2 +2 -0 jakarta-turbine-torque/src/templates/sql/base/postgresql/db.props
Index: db.props
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/postgresql/db.props,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- db.props 2001/08/02 05:08:40 1.1
+++ db.props 2001/10/29 04:07:26 1.2
@@ -41,3 +41,5 @@
removeNotNullWithAutoIncrement = true
suppressDefaults = false
+idMethod=sequence
+
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>