Author: tfischer
Date: Sat Sep 25 07:12:35 2010
New Revision: 1001152
URL: http://svn.apache.org/viewvc?rev=1001152&view=rev
Log:
make skipSql attribute work
Added:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/tableSkipDecider.vm
Modified:
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/database.vm
Modified:
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java?rev=1001152&r1=1001151&r2=1001152&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TorqueSchemaAttributeName.java
Sat Sep 25 07:12:35 2010
@@ -81,7 +81,9 @@ public enum TorqueSchemaAttributeName im
/** attribute filename. */
FILENAME("filename"),
/** attribute key */
- KEY("key");
+ KEY("key"),
+ /** attribute skipSql */
+ SKIP_SQL("skipSql");
/** The name of the attribute, not null. */
private String name;
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml?rev=1001152&r1=1001151&r2=1001152&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml
Sat Sep 25 07:12:35 2010
@@ -31,22 +31,50 @@
<mergepoint name="tables">
<action xsi:type="traverseAllAction"
element="table"
- outlet="torque.sql.ddl.table"/>
+ outlet="torque.sql.ddl.tableSkipDecider"/>
</mergepoint>
<mergepoint name="foreignKeys">
<action xsi:type="traverseAllAction"
- element="table/foreign-key"
- outlet="torque.sql.ddl.foreignKey"/>
+ element="table"
+ outlet="torque.sql.ddl.foreignKeySkipDecider"/>
</mergepoint>
<mergepoint name="comments">
<action xsi:type="traverseAllAction"
element="table"
+ outlet="torque.sql.ddl.commentSkipDecider"/>
+ </mergepoint>
+ <mergepoint name="databaseEnd" />
+ </outlet>
+
+ <outlet name="torque.sql.ddl.tableSkipDecider"
+ xsi:type="velocityOutlet"
+ path="ddl/tableSkipDecider.vm">
+ <mergepoint name="table">
+ <action xsi:type="applyAction"
+ outlet="torque.sql.ddl.table"/>
+ </mergepoint>
+ </outlet>
+
+ <outlet name="torque.sql.ddl.foreignKeySkipDecider"
+ xsi:type="velocityOutlet"
+ path="ddl/tableSkipDecider.vm">
+ <mergepoint name="table">
+ <action xsi:type="traverseAllAction"
+ element="foreign-key"
+ outlet="torque.sql.ddl.foreignKey"/>
+ </mergepoint>
+ </outlet>
+
+ <outlet name="torque.sql.ddl.commentSkipDecider"
+ xsi:type="velocityOutlet"
+ path="ddl/tableSkipDecider.vm">
+ <mergepoint name="table">
+ <action xsi:type="applyAction"
outlet="torque.sql.ddl.tableComment"/>
<action xsi:type="traverseAllAction"
- element="table/column"
+ element="column"
outlet="torque.sql.ddl.columnComment"/>
</mergepoint>
- <mergepoint name="databaseEnd" />
</outlet>
<outlet name="torque.sql.ddl.databaseStart"
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/database.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/database.vm?rev=1001152&r1=1001151&r2=1001152&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/database.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/database.vm
Sat Sep 25 07:12:35 2010
@@ -16,6 +16,4 @@
## under the License.
$torqueGen.mergepoint("databaseStart")
$torqueGen.mergepoint("tables")
-$torqueGen.mergepoint("foreignKeys")
-$torqueGen.mergepoint("comments")
$torqueGen.mergepoint("databaseEnd")
\ No newline at end of file
Added:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/tableSkipDecider.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/tableSkipDecider.vm?rev=1001152&view=auto
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/tableSkipDecider.vm
(added)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/tableSkipDecider.vm
Sat Sep 25 07:12:35 2010
@@ -0,0 +1,21 @@
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+#if (!$skipSql.equals("true"))##
+$torqueGen.mergepoint("table")##
+$torqueGen.mergepoint("foreignKeys")
+$torqueGen.mergepoint("comments")
+#end
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
