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 2002/03/06 03:59:08 UTC
cvs commit: jakarta-turbine-torque/src/java/org/apache/torque/task TorqueDataModelTask.java TorqueSQLTask.java
jmcnally 02/03/05 18:59:08
Modified: src/conf build.xml
src/java/org/apache/torque/engine/database/model
AppData.java
src/java/org/apache/torque/engine/database/transform
SQLToAppData.java XmlToAppData.java
src/java/org/apache/torque/task TorqueDataModelTask.java
TorqueSQLTask.java
Log:
the code was not setup the use the ConstraintNameGenerator as it was not
passing the path to the db.props file.
Revision Changes Path
1.26 +3 -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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build.xml 18 Feb 2002 21:37:25 -0000 1.25
+++ build.xml 6 Mar 2002 02:59:07 -0000 1.26
@@ -67,6 +67,7 @@
controlTemplate="${SQLControlTemplate}"
outputDirectory="${torque.home}/${outputDirectory}/sql"
templatePath="${templatePath}"
+ basePathToDbProps="sql/base/"
sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
outputFile="report.${project}.sql.generation"
idTableXMLFile="${torque.home}/schema/id-table-schema.xml"
@@ -102,6 +103,7 @@
controlTemplate="${SQLControlTemplate}"
outputDirectory="${torque.home}/${outputDirectory}/sql"
templatePath="${templatePath}"
+ basePathToDbProps="sql/base/"
sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
outputFile="report.${project}.sql.generation"
targetDatabase="${database}">
@@ -423,6 +425,7 @@
controlTemplate="${OMControlTemplate}"
outputDirectory="${torque.home}/${outputDirectory}/java"
templatePath="${templatePath}"
+ basePathToDbProps="sql/base/"
outputFile="report.${project}.om.generation"
targetPackage="${targetPackage}.om"
targetDatabase="${database}">
1.7 +16 -10 jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/AppData.java
Index: AppData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/AppData.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AppData.java 8 Nov 2001 17:20:52 -0000 1.6
+++ AppData.java 6 Mar 2002 02:59:07 -0000 1.7
@@ -74,7 +74,7 @@
* @author <a href="mailto:leon@opticode.co.za>Leon Messerschmidt</a>
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
* @author <a href="mailto:dlr@finemaltcoding.com>Daniel Rall</a>
- * @version $Id: AppData.java,v 1.6 2001/11/08 17:20:52 mpoeschl Exp $
+ * @version $Id: AppData.java,v 1.7 2002/03/06 02:59:07 jmcnally Exp $
*/
public class AppData
{
@@ -105,14 +105,6 @@
private String name;
/**
- * Creates a new instance.
- */
- public AppData()
- {
- this(null, null);
- }
-
- /**
* Creates a new instance for the specified database type.
*
* @param databaseType The default type for any databases added to
@@ -161,7 +153,21 @@
}
idiosyncrasyTable.put(databaseType, idiosyncrasies);
}
- else
+ else
+ {
+ try
+ {
+ String path = '/' + basePropsFilePath + databaseType +
+ "/db.props";
+ idiosyncrasies.load(getClass().getResourceAsStream(path));
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ if (idiosyncrasies.isEmpty())
{
throw new TorqueException("Database-specific properties " +
"file does not exist: " +
1.3 +14 -7 jakarta-turbine-torque/src/java/org/apache/torque/engine/database/transform/SQLToAppData.java
Index: SQLToAppData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/transform/SQLToAppData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SQLToAppData.java 26 Dec 2001 22:24:43 -0000 1.2
+++ SQLToAppData.java 6 Mar 2002 02:59:07 -0000 1.3
@@ -80,7 +80,7 @@
*
* @author <a href="mailto:leon@opticode.co.za">Leon Messerschmidt</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: SQLToAppData.java,v 1.2 2001/12/26 22:24:43 jmcnally Exp $
+ * @version $Id: SQLToAppData.java,v 1.3 2002/03/06 02:59:07 jmcnally Exp $
*/
public class SQLToAppData
{
@@ -90,21 +90,28 @@
private AppData appData;
private Database appDataDB;
private int count;
+ private String databaseType;
+ private String basePropsFilePath;
/**
- * Create a new class without any input Reader.
+ * Create a new class with an input Reader
*/
- public SQLToAppData()
+ public SQLToAppData(String sqlFile)
{
- this (null);
+ this.sqlFile = sqlFile;
}
/**
- * Create a new class with an input Reader
+ * Create a new class with an input Reader. This ctor is not used
+ * but putting here in the event db.props properties are found to
+ * be useful converting sql to xml, the infrastructure will exist
*/
- public SQLToAppData (String sqlFile)
+ public SQLToAppData(String sqlFile, String databaseType,
+ String basePropsFilePath)
{
this.sqlFile = sqlFile;
+ this.databaseType = databaseType;
+ this.basePropsFilePath = basePropsFilePath;
}
@@ -488,7 +495,7 @@
public AppData execute() throws IOException, ParseException
{
count = 0;
- appData = new AppData();
+ appData = new AppData(databaseType, basePropsFilePath);
appDataDB = new Database();
appData.addDatabase(appDataDB);
1.12 +2 -11 jakarta-turbine-torque/src/java/org/apache/torque/engine/database/transform/XmlToAppData.java
Index: XmlToAppData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/transform/XmlToAppData.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XmlToAppData.java 29 Jan 2002 05:35:45 -0000 1.11
+++ XmlToAppData.java 6 Mar 2002 02:59:07 -0000 1.12
@@ -97,7 +97,7 @@
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: XmlToAppData.java,v 1.11 2002/01/29 05:35:45 jmcnally Exp $
+ * @version $Id: XmlToAppData.java,v 1.12 2002/03/06 02:59:07 jmcnally Exp $
*/
public class XmlToAppData extends DefaultHandler
{
@@ -124,14 +124,6 @@
}
/**
- * Creates a new instance.
- */
- public XmlToAppData()
- {
- this(null, null);
- }
-
- /**
* Creates a new instance for the specified database type.
*
* @param databaseType The type of database for the application.
@@ -140,8 +132,7 @@
*/
public XmlToAppData(String databaseType, String basePropsFilePath)
{
- app = (databaseType == null ? new AppData() :
- new AppData(databaseType, basePropsFilePath));
+ app = new AppData(databaseType, basePropsFilePath);
firstPass = true;
errorMessage = "";
}
1.10 +60 -2 jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueDataModelTask.java
Index: TorqueDataModelTask.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueDataModelTask.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TorqueDataModelTask.java 18 Jan 2002 02:49:57 -0000 1.9
+++ TorqueDataModelTask.java 6 Mar 2002 02:59:08 -0000 1.10
@@ -129,6 +129,21 @@
protected String sqldbmap;
/**
+ * The path to properties file containing db idiosyncrasies is
+ * constructed by appending the "getTargetDatabase()/db.props
+ * to this path.
+ */
+ private String basePathToDbProps;
+
+ /**
+ * 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;
+
+ /**
* Set the sqldbmap.
*
* @param String sqldbmap
@@ -201,6 +216,47 @@
}
/**
+ * 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;
+ }
+
+ /**
+ * The path to properties file containing db idiosyncrasies is
+ * constructed by appending the "getTargetDatabase()/db.props
+ * to this path.
+ */
+ public String getBasePathToDbProps()
+ {
+ return basePathToDbProps;
+ }
+
+ /**
+ * The path to properties file containing db idiosyncrasies is
+ * constructed by appending the "getTargetDatabase()/db.props
+ * to this path.
+ */
+ public void setBasePathToDbProps(String v)
+ {
+ this.basePathToDbProps = v;
+ }
+
+ /**
* Set up the initialial context for generating the
* SQL from the XML schema.
*
@@ -221,7 +277,8 @@
{
// Transform the XML database schema into
// data model object.
- xmlParser = new XmlToAppData();
+ xmlParser =
+ new XmlToAppData(getTargetDatabase(), getBasePathToDbProps());
AppData ad = xmlParser.parseFile(xmlFile);
xmlParser.parseFile(xmlFile);
ad.setName(grokName(xmlFile));
@@ -242,7 +299,8 @@
for (int j = 0; j < dataModelFiles.length; j++)
{
File f = new File(srcDir, dataModelFiles[j]);
- xmlParser = new XmlToAppData();
+ xmlParser = new XmlToAppData(getTargetDatabase(),
+ getBasePathToDbProps());
AppData ad = xmlParser.parseFile(f.toString());
xmlParser.parseFile(f.toString());
ad.setName(grokName(f.toString()));
1.10 +4 -32 jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueSQLTask.java
Index: TorqueSQLTask.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/task/TorqueSQLTask.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TorqueSQLTask.java 26 Dec 2001 22:24:43 -0000 1.9
+++ TorqueSQLTask.java 6 Mar 2002 02:59:08 -0000 1.10
@@ -71,19 +71,11 @@
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: TorqueSQLTask.java,v 1.9 2001/12/26 22:24:43 jmcnally Exp $
+ * @version $Id: TorqueSQLTask.java,v 1.10 2002/03/06 02:59:08 jmcnally Exp $
*/
public class TorqueSQLTask
extends TorqueDataModelTask
{
- /**
- * 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;
-
// if the database is set than all generated sql files
// will be placed in the specified database, the database
// will not be taken from the data model schema file.
@@ -132,27 +124,6 @@
return idTableXMLFile;
}
- /**
- * 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;
- }
-
private void createSqlDbMap()
throws Exception
{
@@ -208,7 +179,8 @@
{
// Transform the XML database schema into
// data model object.
- XmlToAppData xmlParser = new XmlToAppData();
+ XmlToAppData xmlParser = new XmlToAppData(getTargetDatabase(),
+ getBasePathToDbProps());
AppData ad = xmlParser.parseFile(getIdTableXMLFile());
xmlParser.parseFile(getIdTableXMLFile());
ad.setName("idmodel");
@@ -224,7 +196,7 @@
throws Exception
{
super.initControlContext();
- context.put("targetDatabase", targetDatabase);
+ context.put("targetDatabase", getTargetDatabase());
createSqlDbMap();
// If the load path for the id broker table xml schema is
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>