generator設定

git-svn-id: http://svn.sourceforge.jp/svnroot/ea2ddl/trunk/ea2ddl@43 136db618-7844-41ca-8ac1-fb3fd040db1d

diff --git a/ea2ddl-ddl/.settings/org.eclipse.jdt.ui.prefs b/ea2ddl-ddl/.settings/org.eclipse.jdt.ui.prefs
index 4b70c95..d68b00f 100644 (file)
--- a/ea2ddl-ddl/.settings/org.eclipse.jdt.ui.prefs
+++ b/ea2ddl-ddl/.settings/org.eclipse.jdt.ui.prefs
@@ -1,10 +1,12 @@
-#Sat Oct 18 02:40:42 JST 2008\r
+#Wed Oct 22 11:40:13 JST 2008\r
 eclipse.preferences.version=1\r
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true\r
+formatter_settings_version=11\r
 org.eclipse.jdt.ui.exception.name=e\r
 org.eclipse.jdt.ui.gettersetter.use.is=true\r
 org.eclipse.jdt.ui.keywordthis=false\r
 org.eclipse.jdt.ui.overrideannotation=true\r
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>\r
 sp_cleanup.add_default_serial_version_id=true\r
 sp_cleanup.add_generated_serial_version_id=false\r
 sp_cleanup.add_missing_annotations=true\r

diff --git a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/factory/impl/DatabaseModelFactoryImpl.java b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/factory/impl/DatabaseModelFactoryImpl.java
index 0ffe289..5503e3e 100644 (file)
--- a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/factory/impl/DatabaseModelFactoryImpl.java
+++ b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/factory/impl/DatabaseModelFactoryImpl.java
@@ -7,9 +7,7 @@ import java.util.List;
 \r
 import jp.sourceforge.ea2ddl.common.config.Config;\r
 import jp.sourceforge.ea2ddl.dao.allcommon.cbean.ListResultBean;\r
-import jp.sourceforge.ea2ddl.dao.cbean.TAttributeCB;\r
 import jp.sourceforge.ea2ddl.dao.cbean.TConnectorCB;\r
-import jp.sourceforge.ea2ddl.dao.cbean.TObjectpropertiesCB;\r
 import jp.sourceforge.ea2ddl.dao.cbean.TOperationCB;\r
 import jp.sourceforge.ea2ddl.dao.cbean.TOperationparamsCB;\r
 import jp.sourceforge.ea2ddl.dao.exbhv.TAttributeBhv;\r
@@ -22,7 +20,6 @@ import jp.sourceforge.ea2ddl.dao.exbhv.TPackageBhv;
 import jp.sourceforge.ea2ddl.dao.exentity.TAttribute;\r
 import jp.sourceforge.ea2ddl.dao.exentity.TConnector;\r
 import jp.sourceforge.ea2ddl.dao.exentity.TObject;\r
-import jp.sourceforge.ea2ddl.dao.exentity.TObjectproperties;\r
 import jp.sourceforge.ea2ddl.dao.exentity.TOperation;\r
 import jp.sourceforge.ea2ddl.dao.exentity.TOperationparams;\r
 import jp.sourceforge.ea2ddl.dao.exentity.TPackage;\r
@@ -102,8 +99,7 @@ public class DatabaseModelFactoryImpl implements DatabaseModelFactory {
        public DatabaseModel create() {\r
                final DatabaseModel dbModel = new DatabaseModel();\r
                final TPackage pkg = getPackage(_config.getProperty("er.package.tree"));\r
-               final List<TObject> objectList = _tObjectBhv.selectListByStereotype(\r
-                               pkg, "table");\r
+               final List<TObject> objectList = _tObjectBhv.selectListByStereotype(pkg, "table");\r
                _log.debug(objectList.size());\r
 \r
                for (TObject object : objectList) {\r
@@ -123,14 +119,7 @@ public class DatabaseModelFactoryImpl implements DatabaseModelFactory {
                table.setAlias(tobject.getAlias());\r
                table.setNote(tobject.getNote());\r
                if (_config.getBoolean("use.schema")) {\r
-                       final TObjectpropertiesCB cb = new TObjectpropertiesCB();\r
-                       cb.query().setObjectId_Equal(tobject.getObjectId());\r
-                       cb.query().setProperty_Equal("OWNER");\r
-                       final TObjectproperties owner = _tObjectpropertiesBhv\r
-                                       .selectEntity(cb);\r
-                       if (owner != null) {\r
-                               table.setSchema(owner.getValue());\r
-                       }\r
+                       table.setSchema(_tObjectpropertiesBhv.getValue(tobject, "OWNER"));\r
                }\r
                generateColumnModel(table, tobject);\r
                generatePKModel(table, tobject);\r
@@ -141,11 +130,7 @@ public class DatabaseModelFactoryImpl implements DatabaseModelFactory {
        }\r
 \r
        protected void generateColumnModel(TableModel table, TObject tobject) {\r
-               final TAttributeCB cb = new TAttributeCB();\r
-               cb.query().setObjectId_Equal(tobject.getObjectId());\r
-               cb.query().addOrderBy_Pos_Asc();\r
-               final ListResultBean<TAttribute> attributes = _tAttributeBhv\r
-                               .selectList(cb);\r
+               final List<TAttribute> attributes = _tAttributeBhv.selectColumns(tobject);\r
                for (TAttribute attribute : attributes) {\r
                        final ColumnModel column = new ColumnModel();\r
                        column.setName(attribute.getName());\r
@@ -154,27 +139,20 @@ public class DatabaseModelFactoryImpl implements DatabaseModelFactory {
                        column.setLength(attribute.getLength());\r
                        column.setPrecision(attribute.getPrecision());\r
                        column.setScale(attribute.getScale());\r
-                       column.setNullable(Integer.valueOf(0).equals(\r
-                                       attribute.getAllowduplicates()));\r
+                       column.setNullable(Integer.valueOf(0).equals(attribute.getAllowduplicates()));\r
                        column.setNote(attribute.getNotes());\r
                        table.addColumn(column);\r
                }\r
        }\r
 \r
        protected void generatePKModel(TableModel table, TObject tobject) {\r
-               final TOperationCB opeCB = new TOperationCB();\r
-               opeCB.query().setObjectId_Equal(tobject.getObjectId());\r
-               opeCB.query().setStereotype_Equal("PK");\r
-               final TOperation opePK = _tOperationBhv.selectEntity(opeCB);\r
-               if (opePK == null) {\r
+               final ListResultBean<TOperation> pkList = _tOperationBhv.selectOperation(tobject, "PK");\r
+               if (pkList.isEmpty()) {\r
                        return;\r
                }\r
-               final TOperationparamsCB cb = new TOperationparamsCB();\r
-               cb.query().setOperationid_Equal(opePK.getOperationid());\r
-               cb.query().addOrderBy_Pos_Asc();\r
-               final ListResultBean<TOperationparams> params = _tOperationparamsBhv\r
-                               .selectList(cb);\r
-               if (0 < params.size()) {\r
+               final TOperation opePK = pkList.get(0);\r
+               final ListResultBean<TOperationparams> params = _tOperationparamsBhv.selectOperationParams(opePK);\r
+               if (!params.isEmpty()) {\r
                        final PrimaryKeyModel pk = new PrimaryKeyModel();\r
                        pk.setName(opePK.getName());\r
                        for (TOperationparams param : params) {\r
@@ -185,22 +163,15 @@ public class DatabaseModelFactoryImpl implements DatabaseModelFactory {
        }\r
 \r
        protected void generateFKModel(TableModel table, TObject tobject) {\r
-               final TOperationCB opeCB = new TOperationCB();\r
-               opeCB.query().setObjectId_Equal(tobject.getObjectId());\r
-               opeCB.query().setStereotype_Equal("FK");\r
-               final ListResultBean<TOperation> opeFKList = _tOperationBhv\r
-                               .selectList(opeCB);\r
-               for (TOperation opeFK : opeFKList) {\r
-                       final ForeignKeyModel fk = new ForeignKeyModel();\r
-                       fk.setName(opeFK.getName());\r
+               final ListResultBean<TOperation> fkList = _tOperationBhv.selectOperation(tobject, "FK");\r
+               for (TOperation opeFK : fkList) {\r
+                       final ForeignKeyModel fkModel = new ForeignKeyModel();\r
+                       fkModel.setName(opeFK.getName());\r
+\r
                        {\r
-                               final TOperationparamsCB paraCB = new TOperationparamsCB();\r
-                               paraCB.query().setOperationid_Equal(opeFK.getOperationid());\r
-                               paraCB.query().addOrderBy_Pos_Asc();\r
-                               final ListResultBean<TOperationparams> params = _tOperationparamsBhv\r
-                                               .selectList(paraCB);\r
+                               final ListResultBean<TOperationparams> params = _tOperationparamsBhv.selectOperationParams(opeFK);\r
                                for (TOperationparams param : params) {\r
-                                       fk.addColumnName(param.getName());\r
+                                       fkModel.addColumnName(param.getName());\r
                                }\r
                        }\r
                        {\r
@@ -209,27 +180,21 @@ public class DatabaseModelFactoryImpl implements DatabaseModelFactory {
                                conCB.query().setSourcerole_Equal(opeFK.getName());\r
                                final TConnector con = _tConnectorBhv.selectEntity(conCB);\r
 \r
-                               final TObject targetTable = _tObjectBhv.selectEntity(con\r
-                                               .getEndObjectId());\r
-                               fk.setTargetTable(targetTable.getName());\r
+                               final TObject targetTable = _tObjectBhv.selectEntity(con.getEndObjectId());\r
+                               fkModel.setTargetTable(targetTable.getName());\r
 \r
                                final TOperationCB targetOpeCB = new TOperationCB();\r
                                targetOpeCB.query().setObjectId_Equal(con.getEndObjectId());\r
                                targetOpeCB.query().setName_Equal(con.getDestrole());\r
-                               final TOperation targetOpe = _tOperationBhv\r
-                                               .selectEntity(targetOpeCB);\r
+                               final TOperation targetOpe = _tOperationBhv.selectEntity(targetOpeCB);\r
 \r
-                               final TOperationparamsCB targetParaCB = new TOperationparamsCB();\r
-                               targetParaCB.query().setOperationid_Equal(\r
-                                               targetOpe.getOperationid());\r
-                               targetParaCB.query().addOrderBy_Pos_Asc();\r
                                final ListResultBean<TOperationparams> targetParams = _tOperationparamsBhv\r
-                                               .selectList(targetParaCB);\r
+                                               .selectOperationParams(targetOpe);\r
                                for (TOperationparams targetParam : targetParams) {\r
-                                       fk.addTargetColumnName(targetParam.getName());\r
+                                       fkModel.addTargetColumnName(targetParam.getName());\r
                                }\r
                        }\r
-                       table.addForeignKey(fk);\r
+                       table.addForeignKey(fkModel);\r
                }\r
        }\r
 \r
@@ -237,16 +202,14 @@ public class DatabaseModelFactoryImpl implements DatabaseModelFactory {
                final TOperationCB cb = new TOperationCB();\r
                cb.query().setObjectId_Equal(tobject.getObjectId());\r
                cb.query().setStereotype_Equal("unique");\r
-               final ListResultBean<TOperation> uniqueList = _tOperationBhv\r
-                               .selectList(cb);\r
+               final ListResultBean<TOperation> uniqueList = _tOperationBhv.selectList(cb);\r
                for (TOperation unique : uniqueList) {\r
                        final UniqueModel uniqueModel = new UniqueModel();\r
                        uniqueModel.setName(unique.getName());\r
                        final TOperationparamsCB opeCB = new TOperationparamsCB();\r
                        opeCB.query().setOperationid_Equal(unique.getOperationid());\r
                        opeCB.query().addOrderBy_Pos_Asc();\r
-                       final ListResultBean<TOperationparams> cols = _tOperationparamsBhv\r
-                                       .selectList(opeCB);\r
+                       final ListResultBean<TOperationparams> cols = _tOperationparamsBhv.selectList(opeCB);\r
                        for (TOperationparams param : cols) {\r
                                uniqueModel.addColumnName(param.getName());\r
                        }\r

diff --git a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/model/ColumnModel.java b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/model/ColumnModel.java
index e0fe1a4..2a7d5b7 100644 (file)
--- a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/model/ColumnModel.java
+++ b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/model/ColumnModel.java
@@ -117,17 +117,4 @@ public class ColumnModel implements Serializable {
                return b.toString();\r
        }\r
 \r
-       public String getComment() {\r
-               StringBuffer b = new StringBuffer();\r
-               if (getAlias() != null) {\r
-                       b.append(getAlias()).append(".").append("\r\n");\r
-               }\r
-               if (getNote() != null) {\r
-                       b.append(getNote());\r
-               }\r
-               if (b.length() == 0) {\r
-                       return null;\r
-               }\r
-               return b.toString();\r
-       }\r
 }\r

diff --git a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/model/TableModel.java b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/model/TableModel.java
index 7916289..7485d4d 100644 (file)
--- a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/model/TableModel.java
+++ b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/model/TableModel.java
@@ -129,17 +129,4 @@ public class TableModel implements Serializable {
                _indexList = indexList;\r
        }\r
 \r
-       public String getComment() {\r
-               StringBuffer b = new StringBuffer();\r
-               if (getAlias() != null) {\r
-                       b.append(getAlias()).append(".").append("\r\n");\r
-               }\r
-               if (getNote() != null) {\r
-                       b.append(getNote());\r
-               }\r
-               if (b.length() == 0) {\r
-                       return null;\r
-               }\r
-               return b.toString();\r
-       }\r
 }\r

diff --git a/ea2ddl-ddl/src/main/resources/app.properties b/ea2ddl-ddl/src/main/resources/app.properties
index f735a34..47e566d 100644 (file)
--- a/ea2ddl-ddl/src/main/resources/app.properties
+++ b/ea2ddl-ddl/src/main/resources/app.properties
@@ -1,2 +1,2 @@
 root.package.name=\u30d3\u30e5\u30fc\r
-er.package.tree=\u30af\u30e9\u30b9\u30d3\u30e5\u30fc/ER\u56f3/EXAMPLEDB
\ No newline at end of file
+er.package.tree=\u30af\u30e9\u30b9\u30d3\u30e5\u30fc/ER\u56f3/MFGS
\ No newline at end of file

diff --git a/ea2ddl-ddl/src/main/resources/base.ftl b/ea2ddl-ddl/src/main/resources/base.ftl
index 3848c7f..0a383ff 100644 (file)
--- a/ea2ddl-ddl/src/main/resources/base.ftl
+++ b/ea2ddl-ddl/src/main/resources/base.ftl
@@ -1,4 +1,9 @@
 <#list tableList as table>\r
+<#list table.foreignKeyList as fk>ALTER TABLE ${table.name} DROP CONSTRAINT ${fk.name}\r
+;\r
+</#list>\r
+</#list>\r
+<#list tableList as table>\r
 DROP TABLE ${table.name};\r
 </#list>\r
 \r
@@ -16,13 +21,13 @@ CREATE TABLE ${table.name} (
        UNIQUE (<#list unique.columnNameList as columnName>${columnName}<#if columnName_has_next>,</#if></#list>)\r
 ;\r
 </#list>\r
-<#if table.comment??>\r
-COMMENT ON TABLE ${table.name} IS '${table.comment}'\r
+<#if table.alias?? || table.note??>\r
+COMMENT ON TABLE ${table.name} IS '<#if table.alias??>[${table.alias}]:</#if><#if table.note??>${table.note}</#if>'\r
 ;\r
 </#if>\r
 <#list table.columnList as column>\r
-<#if column.comment??>\r
-COMMENT ON COLUMN ${table.name}.${column.name} IS '${column.comment}'\r
+<#if column.alias?? || column.note??>\r
+COMMENT ON COLUMN ${table.name}.${column.name} IS '<#if column.alias??>[${column.alias}]:</#if><#if column.note??>${column.note}</#if>'\r
 ;\r
 </#if>\r
 </#list>\r