Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml?rev=1470235&r1=1470234&r2=1470235&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml Sat Apr 20 21:23:39 2013 @@ -39,7 +39,7 @@ <discardFrom>.</discardFrom> <suffix>-idtable-init.sql</suffix> </filenameOutlet> - <source xsi:type="fileSource" elements="database"> + <source xsi:type="fileSource"> <transformer class="org.apache.torque.templates.transformer.sql.SQLTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude>
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml?rev=1470235&r1=1470234&r2=1470235&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml Sat Apr 20 21:23:39 2013 @@ -51,7 +51,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table"> + <source xsi:type="fileSource" elements="all-tables/table"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -78,7 +78,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-views/view"> + <source xsi:type="fileSource" elements="all-views/view"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -104,7 +104,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table"> + <source xsi:type="fileSource" elements="all-tables/table"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -130,7 +130,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-views/view"> + <source xsi:type="fileSource" elements="all-views/view"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -157,7 +157,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table/column/inheritance"> + <source xsi:type="fileSource" elements="all-tables/table/column/inheritance"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -184,7 +184,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-views/view/column/inheritance"> + <source xsi:type="fileSource" elements="all-views/view/column/inheritance"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -211,7 +211,7 @@ acceptNotSet="true"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table" + <source xsi:type="fileSource" elements="all-tables/table" skipDecider="org.apache.torque.templates.skipdecider.InterfaceSkipDecider"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> @@ -239,7 +239,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table"> + <source xsi:type="fileSource" elements="all-tables/table"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -266,7 +266,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-views/view"> + <source xsi:type="fileSource" elements="all-views/view"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -293,7 +293,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table"> + <source xsi:type="fileSource" elements="all-tables/table"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -320,7 +320,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-views/view"> + <source xsi:type="fileSource" elements="all-views/view"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -347,7 +347,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table"> + <source xsi:type="fileSource" elements="all-tables/table"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -374,7 +374,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-views/view"> + <source xsi:type="fileSource" elements="all-views/view"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -401,7 +401,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table"> + <source xsi:type="fileSource" elements="all-tables/table"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -428,7 +428,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-views/view"> + <source xsi:type="fileSource" elements="all-views/view"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -455,7 +455,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table"> + <source xsi:type="fileSource" elements="all-tables/table"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -482,7 +482,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-views/view"> + <source xsi:type="fileSource" elements="all-views/view"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -509,7 +509,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table"> + <source xsi:type="fileSource" elements="all-tables/table"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -536,7 +536,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-views/view"> + <source xsi:type="fileSource" elements="all-views/view"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> <exclude>id-table-schema.xml</exclude> @@ -563,7 +563,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table" + <source xsi:type="fileSource" elements="all-tables/table" skipDecider="org.apache.torque.templates.skipdecider.BeanSkipDecider"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> @@ -591,7 +591,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-views/view" + <source xsi:type="fileSource" elements="all-views/view" skipDecider="org.apache.torque.templates.skipdecider.BeanSkipDecider"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> @@ -619,7 +619,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table" + <source xsi:type="fileSource" elements="all-tables/table" skipDecider="org.apache.torque.templates.skipdecider.BeanSkipDecider"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> @@ -647,7 +647,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-views/view" + <source xsi:type="fileSource" elements="all-views/view" skipDecider="org.apache.torque.templates.skipdecider.BeanSkipDecider"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> @@ -675,7 +675,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table/column/inheritance" + <source xsi:type="fileSource" elements="all-tables/table/column/inheritance" skipDecider="org.apache.torque.templates.skipdecider.BeanSkipDecider"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> @@ -703,7 +703,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-views/view/column/inheritance" + <source xsi:type="fileSource" elements="all-views/view/column/inheritance" skipDecider="org.apache.torque.templates.skipdecider.BeanSkipDecider"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> @@ -730,7 +730,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" combineFiles="true" elements="source/databaseSets/databaseSet" + <source xsi:type="fileSource" combineFiles="true" elements="databaseSets/databaseSet" skipDecider="org.apache.torque.templates.skipdecider.MapInitSkipDecider"> <transformer class="org.apache.torque.templates.transformer.om.mapInit.DatabaseMapInitTransformer"/> <include>*schema.xml</include> @@ -758,7 +758,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" combineFiles="true" elements="source/databaseSets/databaseSet" + <source xsi:type="fileSource" combineFiles="true" elements="databaseSets/databaseSet" skipDecider="org.apache.torque.templates.skipdecider.MapInitSkipDecider"> <transformer class="org.apache.torque.templates.transformer.om.mapInit.DatabaseMapInitTransformer"/> <include>*schema.xml</include> @@ -786,7 +786,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table" + <source xsi:type="fileSource" elements="all-tables/table" skipDecider="org.apache.torque.templates.skipdecider.ManagerSkipDecider"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> @@ -814,7 +814,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-views/view" + <source xsi:type="fileSource" elements="all-views/view" skipDecider="org.apache.torque.templates.skipdecider.ManagerSkipDecider"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> @@ -843,7 +843,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-tables/table" + <source xsi:type="fileSource" elements="all-tables/table" skipDecider="org.apache.torque.templates.skipdecider.ManagerSkipDecider"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> @@ -871,7 +871,7 @@ acceptNotSet="false"/> </mergepoint> </filenameOutlet> - <source xsi:type="fileSource" elements="database/all-views/view" + <source xsi:type="fileSource" elements="all-views/view" skipDecider="org.apache.torque.templates.skipdecider.ManagerSkipDecider"> <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/> <include>*schema.xml</include> Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml?rev=1470235&r1=1470234&r2=1470235&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml Sat Apr 20 21:23:39 2013 @@ -40,6 +40,13 @@ <discardFrom>.</discardFrom> <suffix>.sql</suffix> </filenameOutlet> + <!-- source xsi:type="fileSource"> + <transformer class="org.apache.torque.generator.source.transform.SourceElementToModelTransformer"> + <modelRootClass>org.apache.torque.templates.model.Database</modelRootClass> + </transformer> + <transformer class="org.apache.torque.templates.transformer.sql.SQLModelTransformer"/> + <include>*schema.xml</include> + </source--> <source xsi:type="fileSource" elements="database"> <transformer class="org.apache.torque.templates.transformer.sql.SQLTransformer"/> <include>*schema.xml</include> Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/createdb/conf/control.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/createdb/conf/control.xml?rev=1470235&r1=1470234&r2=1470235&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/createdb/conf/control.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/createdb/conf/control.xml Sat Apr 20 21:23:39 2013 @@ -40,7 +40,7 @@ <discardFrom>.</discardFrom> <suffix>-create.sql</suffix> </filenameOutlet> - <source xsi:type="fileSource" elements="database"> + <source xsi:type="fileSource"> <transformer class="org.apache.torque.templates.transformer.sql.SQLTransformer"/> <include>*schema.xml</include> </source> Modified: db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java?rev=1470235&r1=1470234&r2=1470235&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java (original) +++ db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java Sat Apr 20 21:23:39 2013 @@ -48,26 +48,26 @@ public class TestProcessing @Before public void setUp() throws Exception { - String testRoot = "target"; + final String testRoot = "target"; { - File generatedDocDir = new File(testRoot, "generated-docs"); + final File generatedDocDir = new File(testRoot, "generated-docs"); FileUtils.deleteDirectory(generatedDocDir); } { - File generatedSourcesDir = new File(testRoot, "generated-sources"); + final File generatedSourcesDir = new File(testRoot, "generated-sources"); FileUtils.deleteDirectory(generatedSourcesDir); } { - File generatedSources2Dir + final File generatedSources2Dir = new File(testRoot, "generated-sources-2"); FileUtils.deleteDirectory(generatedSources2Dir); } { - File generatedSqlDir = new File(testRoot, "generated-sql"); + final File generatedSqlDir = new File(testRoot, "generated-sql"); FileUtils.deleteDirectory(generatedSqlDir); } { - File generatedXdocsDir = new File(testRoot, "generated-xdocs"); + final File generatedXdocsDir = new File(testRoot, "generated-xdocs"); FileUtils.deleteDirectory(generatedXdocsDir); } } @@ -75,9 +75,9 @@ public class TestProcessing @Test public void testProcessSchemaXml() throws Exception { - Controller controller = new Controller(); - List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); - Map<String, String> overrideOptions = new HashMap<String, String>(); + final Controller controller = new Controller(); + final List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); + final Map<String, String> overrideOptions = new HashMap<String, String>(); overrideOptions.put("torque.database", "mysql"); overrideOptions.put("torque.om.package", "org.apache.torque.test"); overrideOptions.put("torque.om.generateMapInit", "true"); @@ -93,12 +93,12 @@ public class TestProcessing projectPaths.setOutputDirectory( Maven2ProjectPaths.MODIFIABLE_OUTPUT_DIR_KEY, new File("target/generated-sources-2")); - Fileset sourceFileset = new Fileset(); - Set<String> sourceIncludes = new HashSet<String>(); + final Fileset sourceFileset = new Fileset(); + final Set<String> sourceIncludes = new HashSet<String>(); sourceIncludes.add("schema.xml"); sourceFileset.setIncludes(sourceIncludes); sourceFileset.setBasedir(projectPaths.getDefaultSourcePath()); - SourceProvider sourceProvider + final SourceProvider sourceProvider = new FileSourceProvider( null, sourceFileset, @@ -112,28 +112,6 @@ public class TestProcessing new MapOptionsConfiguration(overrideOptions)); unitDescriptors.add(unitDescriptor); - // sql ddl templates - projectPaths - = new CustomProjectPaths( - new Maven2DirectoryProjectPaths(new File("."))); - projectPaths.setConfigurationDir( - new File("src/main/resources/org/apache/torque/templates/sql")); - projectPaths.setSourceDir( - new File(SCHEMA_DIR)); - projectPaths.setOutputDirectory( - null, - new File("target/generated-sql")); - projectPaths.setOutputDirectory( - Maven2ProjectPaths.MODIFIABLE_OUTPUT_DIR_KEY, - new File("target/generated-sql-2")); - unitDescriptor = new UnitDescriptor( - UnitDescriptor.Packaging.DIRECTORY, - projectPaths, - new DefaultTorqueGeneratorPaths()); - unitDescriptor.setOverrideOptions( - new MapOptionsConfiguration(overrideOptions)); - unitDescriptors.add(unitDescriptor); - // sql createdb templates projectPaths = new CustomProjectPaths( @@ -223,4 +201,47 @@ public class TestProcessing // generate controller.run(unitDescriptors); } + + @Test + public void testSqlDdlTemplates() throws Exception + { + final Controller controller = new Controller(); + final List<UnitDescriptor> unitDescriptors = new ArrayList<UnitDescriptor>(); + final Map<String, String> overrideOptions = new HashMap<String, String>(); + overrideOptions.put("torque.database", "mysql"); + + // sql ddl templates + final CustomProjectPaths projectPaths + = new CustomProjectPaths( + new Maven2DirectoryProjectPaths(new File("."))); + projectPaths.setConfigurationDir( + new File("src/main/resources/org/apache/torque/templates/sql")); + projectPaths.setSourceDir( + new File(SCHEMA_DIR)); + projectPaths.setOutputDirectory( + null, + new File("target/generated-sql")); + projectPaths.setOutputDirectory( + Maven2ProjectPaths.MODIFIABLE_OUTPUT_DIR_KEY, + new File("target/generated-sql-2")); + final UnitDescriptor unitDescriptor = new UnitDescriptor( + UnitDescriptor.Packaging.DIRECTORY, + projectPaths, + new DefaultTorqueGeneratorPaths()); + unitDescriptor.setOverrideOptions( + new MapOptionsConfiguration(overrideOptions)); + unitDescriptors.add(unitDescriptor); + + // generate + controller.run(unitDescriptors); + + // assert sql ddl +// final String expected = IOUtils.toString( +// getClass().getResourceAsStream("schema.sql"), +// "ISO-8859-1"); +// final String actual = FileUtils.readFileToString( +// new File("target/generated-sql/schema.sql"), +// "iso-8859-1"); +// assertEquals(expected, actual); + } } Modified: db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml?rev=1470235&r1=1470234&r2=1470235&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml Sat Apr 20 21:23:39 2013 @@ -42,6 +42,7 @@ required="true" type="VARCHAR" size="50" + default="a_name" /> </table> --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org