Author: tfischer Date: Wed May 15 21:19:13 2013 New Revision: 1483089 URL: http://svn.apache.org/r1483089 Log: TORQUE-273 change model types from String to Boolean where possible fix some checkstyle and javadoc issues
Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Domain.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ExternalSchema.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ForeignKey.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IdMethodParameter.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IncludeSchema.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Index.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IndexColumn.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Inheritance.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Option.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Reference.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/View.java db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/dropView.groovy db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/view.groovy db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/dropView.groovy db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/view.groovy db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/dropView.groovy db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/view.groovy db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/view.groovy db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/view.groovy db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/view.groovy db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/tableSkipDecider.groovy Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Domain.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Domain.java?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Domain.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Domain.java Wed May 15 21:19:13 2013 @@ -1,6 +1,5 @@ package org.apache.torque.templates.model; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ExternalSchema.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ExternalSchema.java?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ExternalSchema.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ExternalSchema.java Wed May 15 21:19:13 2013 @@ -1,6 +1,5 @@ package org.apache.torque.templates.model; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -29,6 +28,7 @@ public class ExternalSchema { // properties from schema + /** The database to which this external schema definition belongs to. */ public Database parent; /** The file name of the external schema. */ @@ -36,6 +36,6 @@ public class ExternalSchema // general generation properties - // the database element of the loaded external schema + /** The database element of the loaded external schema. */ public Database database; } Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ForeignKey.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ForeignKey.java?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ForeignKey.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/ForeignKey.java Wed May 15 21:19:13 2013 @@ -1,9 +1,5 @@ package org.apache.torque.templates.model; -import java.util.ArrayList; -import java.util.List; - - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -23,6 +19,9 @@ import java.util.List; * under the License. */ +import java.util.ArrayList; +import java.util.List; + /** * The model of the foreign-key tag in a Torque schema file. * @@ -30,18 +29,29 @@ import java.util.List; */ public class ForeignKey { + /** The table to which this foreign key definition belongs. */ public Table parent; + /** The list of options for this foreign key. */ public List<Option> optionList = new ArrayList<Option>(); + /** The list of column references for this foreign key. */ public List<Reference> referenceList = new ArrayList<Reference>(); + /** The name of the foreign key. */ public String name; + /** The name of the foreign table. */ public String foreignTable; + /** + * The action performed by the database if the referenced record is deleted. + */ public String onDelete; + /** + * The action performed by the database if the referenced record is updated. + */ public String onUpdate; // SQL generation properties Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IdMethodParameter.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IdMethodParameter.java?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IdMethodParameter.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IdMethodParameter.java Wed May 15 21:19:13 2013 @@ -1,6 +1,5 @@ package org.apache.torque.templates.model; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -27,6 +26,7 @@ package org.apache.torque.templates.mode */ public class IdMethodParameter { + /** The table where the id method parameter belongs to. */ public Table parent; /** The name of the parameter. */ Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IncludeSchema.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IncludeSchema.java?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IncludeSchema.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IncludeSchema.java Wed May 15 21:19:13 2013 @@ -1,6 +1,5 @@ package org.apache.torque.templates.model; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -27,6 +26,7 @@ package org.apache.torque.templates.mode */ public class IncludeSchema { + /** The schema root into which the referenced schema should be included. */ public Database parent; /** The file name of the schema to include. */ Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Index.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Index.java?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Index.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Index.java Wed May 15 21:19:13 2013 @@ -1,9 +1,5 @@ package org.apache.torque.templates.model; -import java.util.ArrayList; -import java.util.List; - - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -23,6 +19,9 @@ import java.util.List; * under the License. */ +import java.util.ArrayList; +import java.util.List; + /** * The model of the index tag in a Torque schema file. * @@ -32,12 +31,16 @@ public class Index { // schema properties + /** The table to which the index belongs. */ public Table parent; + /** The list of otions for the index. */ public List<Option> optionList = new ArrayList<Option>(); + /** The list of indexColumns for the index. */ public List<IndexColumn> indexColumnList = new ArrayList<IndexColumn>(); + /** The name of the index. */ public String name; // SQL generatiopn properties Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IndexColumn.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IndexColumn.java?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IndexColumn.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/IndexColumn.java Wed May 15 21:19:13 2013 @@ -1,7 +1,5 @@ package org.apache.torque.templates.model; - - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -28,7 +26,9 @@ package org.apache.torque.templates.mode */ public class IndexColumn { + /** The index to which the IndexColumn belongs. */ public Index parent; + /** The name of the referenced column. */ public String name; } Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Inheritance.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Inheritance.java?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Inheritance.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Inheritance.java Wed May 15 21:19:13 2013 @@ -1,6 +1,5 @@ package org.apache.torque.templates.model; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -27,6 +26,7 @@ package org.apache.torque.templates.mode */ public class Inheritance { + /** The column to which this inheritance definition belongs to. */ public Column parent; /** A value found in the column marked as the inheritance key column. */ Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Option.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Option.java?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Option.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Option.java Wed May 15 21:19:13 2013 @@ -1,6 +1,5 @@ package org.apache.torque.templates.model; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -27,11 +26,8 @@ package org.apache.torque.templates.mode */ public class Option { - public Database parentDatabase; - - public Table parentTable; - - public Column parentColumn; + /** The direct parent of the option. */ + public Object parent; /** The key of the option. */ public String key; Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Reference.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Reference.java?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Reference.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Reference.java Wed May 15 21:19:13 2013 @@ -1,6 +1,5 @@ package org.apache.torque.templates.model; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -27,6 +26,7 @@ package org.apache.torque.templates.mode */ public class Reference { + /** The foreign key to which this column mapping belongs. */ public ForeignKey parent; /** The unqualified name of the foreign column. */ Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/Table.java Wed May 15 21:19:13 2013 @@ -1,8 +1,5 @@ package org.apache.torque.templates.model; -import java.util.ArrayList; -import java.util.List; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -22,6 +19,9 @@ import java.util.List; * under the License. */ +import java.util.ArrayList; +import java.util.List; + /** * The model of the table tag in a Torque schema file. * @@ -31,37 +31,67 @@ public class Table { // properties from schema + /** The database to which this table belongs. */ public Database parent; + /** The options for this table. */ public List<Option> optionList = new ArrayList<Option>(); + /** The columns of this table. */ public List<Column> columnList = new ArrayList<Column>(); + /** The foreign keys of this table. */ public List<ForeignKey> foreignKeyList = new ArrayList<ForeignKey>(); + /** The index list for this table. */ public List<Index> indexList = new ArrayList<Index>(); + /** The list of unique indices for this table. */ public List<Unique> uniqueList = new ArrayList<Unique>(); + /** The id method parameters for this table. */ public List<IdMethodParameter> idMethodParameterList = new ArrayList<IdMethodParameter>(); + /** The table's name. */ public String name; + /** + * Specifies an interface that the generated data object class implements. + * If this is a fully qualified class name (i. e. the string contains dots), + * the interface will simply be implemented by the data object class. + * If the interface is a simple class name (without dots), + * an empty interface file will be generated in the data object package. + * When this attribute is used, all peer methods that normally would return + * the data object type will now return the interface type. + */ public String _interface; + /** The base class of the data object class. */ public String baseClass; + /** The base class of the peer class. */ public String basePeer; + /** + * The id method to use. + * Valid values are "idbroker", "native", "none" or null. + */ public String idMethod; - public String _abstract; + /** Whether the data object class is abstract. */ + public Boolean _abstract; + /** + * The unqualified name of the data object class. + * If null, the class name will be determined frome the name attribute. + */ public String javaName; - public String skipSql; + /** Whether sql generation should be skipped. */ + public Boolean skipSql; + /** A description of the table. */ public String description; // general generation properties Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/View.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/View.java?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/View.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/model/View.java Wed May 15 21:19:13 2013 @@ -49,7 +49,7 @@ public class View public String createSql; - public String skipSql; + public Boolean skipSql; public String description; Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/dropView.groovy URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/dropView.groovy?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/dropView.groovy (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/dropView.groovy Wed May 15 21:19:13 2013 @@ -19,7 +19,7 @@ import org.apache.torque.templates.model TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen View view = torqueGenGroovy.model -if (!view.skipSql.equals("true")) +if (!view.skipSql) { return """\ DROP VIEW ${view.name}; Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/view.groovy URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/view.groovy?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/view.groovy (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/view.groovy Wed May 15 21:19:13 2013 @@ -20,7 +20,7 @@ import org.apache.torque.templates.model TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen View view = torqueGenGroovy.model -if (!view.skipSql.equals("true")) +if (!view.skipSql) { if (view.createSql != null) { Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/dropView.groovy URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/dropView.groovy?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/dropView.groovy (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/dropView.groovy Wed May 15 21:19:13 2013 @@ -19,7 +19,7 @@ import org.apache.torque.templates.model TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen View view = torqueGenGroovy.model -if (!view.skipSql.equals("true")) +if (!view.skipSql) { return """\ DROP VIEW ${view.name} IF EXISTS; Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/view.groovy URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/view.groovy?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/view.groovy (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/view.groovy Wed May 15 21:19:13 2013 @@ -19,7 +19,7 @@ import org.apache.torque.templates.model TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen View view = torqueGenGroovy.model -if (!view.skipSql.equals("true")) +if (!view.skipSql) { if (view.createSql != null) { Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/dropView.groovy URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/dropView.groovy?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/dropView.groovy (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/dropView.groovy Wed May 15 21:19:13 2013 @@ -21,7 +21,7 @@ import org.apache.torque.templates.model TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen View view = torqueGenGroovy.model -if (!view.skipSql.equals("true")) +if (!view.skipSql) { return """\ DROP VIEW ${view.name}; Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/view.groovy URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/view.groovy?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/view.groovy (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/view.groovy Wed May 15 21:19:13 2013 @@ -20,7 +20,7 @@ import org.apache.torque.templates.model TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen View view = torqueGenGroovy.model -if (!view.skipSql.equals("true")) +if (!view.skipSql) { if (view.createSql != null) { Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/view.groovy URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/view.groovy?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/view.groovy (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/view.groovy Wed May 15 21:19:13 2013 @@ -19,7 +19,7 @@ import org.apache.torque.templates.model TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen View view = torqueGenGroovy.model -if (!view.skipSql.equals("true")) +if (!view.skipSql) { if (view.createSql != null) { Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/view.groovy URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/view.groovy?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/view.groovy (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/view.groovy Wed May 15 21:19:13 2013 @@ -20,7 +20,7 @@ import org.apache.torque.templates.model TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen View view = torqueGenGroovy.model -if (!view.skipSql.equals("true")) +if (!view.skipSql) { if (view.createSql != null) { Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/view.groovy URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/view.groovy?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/view.groovy (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/view.groovy Wed May 15 21:19:13 2013 @@ -19,7 +19,7 @@ import org.apache.torque.templates.model TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen View view = torqueGenGroovy.model -if (!view.skipSql.equals("true")) +if (!view.skipSql) { if (view.createSql != null) { Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/tableSkipDecider.groovy URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/tableSkipDecider.groovy?rev=1483089&r1=1483088&r2=1483089&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/tableSkipDecider.groovy (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/tableSkipDecider.groovy Wed May 15 21:19:13 2013 @@ -19,7 +19,7 @@ import org.apache.torque.templates.model TorqueGenGroovy torqueGenGroovy = (TorqueGenGroovy) torqueGen Table table = torqueGenGroovy.model -if (!table.skipSql.equals("true")) +if (!table.skipSql) { return torqueGenGroovy.mergepoint("table") } \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org