1.1.18 h2 add comment

Author: think-gem

META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ermasterr
 Bundle-SymbolicName: org.insightech.er;singleton:=true
-Bundle-Version: 1.1.17
+Bundle-Version: 1.1.18
 Bundle-Activator: org.insightech.er.ERDiagramActivator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,

README.md

@@ -1,71 +1,71 @@
-# ERMaster
-
-A fork of ERMaster. Faster, Better, VCS-friendly.
-
-Original version is http://ermaster.sourceforge.net  
-
-> ERMaster is GUI editor for ER diagram.  
-> It runs as Eclipse plug-in.  
-> It can be done graphically to making ER diagram, printing ER diagram, exporting the DDL from ER diagram, etc. .  
-> Moreover, importing from DB, management of the group, and the historical management, etc. are supported.  
-
-# Install
-
-1. Install Eclipse 
- 
-Package: `Eclipse IDE for Java Developers`
-
-2. Install PDE plug-in  
-
-Plug-in name: `Eclipse PDE Plug-in Developer Resources`
-
-3. Install ermasterr 
- 
-Update Site:
-
-`https://thinkgem.gitee.io/ermasterr/updatesite`
-
-or
-
-`https://thinkgem.github.io/ermasterr/updatesite`
-
-or
-
-Copy the contents of the [dropins folder](https://gitee.com/thinkgem/ermasterr/tree/master/dropins/ermasterr/eclipse/plugins) to the dropins folder located in the root of your Eclipse installation.
-
-Directory tree example:
-
-```
-your_eclipse_install_dir/
-└── dropins/
-    └── ermasterr/
-        └── eclipse/
-            └── plugins/
-                └── org.insightech.er_x.y.z.jar
-```
-
-or put jar file to dropins directly.
-
-```
-your_eclipse_install_dir/
-└── dropins/
-    └── org.insightech.er_x.y.z.jar
-```
-
-# Features
-
-## Faster
-
-* ermasterr prevented a increase of the drawing time by getting rid of tabs of each category and skipping expensive initialization for each category.
-
-## Better
-
-* ermasterr has fixed the issue that erdiagram data file size becomes gigantic in sometimes by writing a large amount of same xml tags. (https://sourceforge.net/p/ermaster/bugs/119/)
-
-## VCS-friendly
-
-* ermasterr can write git-mergable erdiagram data as far as possible. (https://sourceforge.net/p/ermaster/feature-requests/104/)
-
-# License
-
-Apache License V2.0
+# ERMaster
+
+A fork of ERMaster. Faster, Better, VCS-friendly.
+
+Original version is http://ermaster.sourceforge.net  
+
+> ERMaster is GUI editor for ER diagram.  
+> It runs as Eclipse plug-in.  
+> It can be done graphically to making ER diagram, printing ER diagram, exporting the DDL from ER diagram, etc. .  
+> Moreover, importing from DB, management of the group, and the historical management, etc. are supported.  
+
+# Install
+
+1. Install Eclipse 
+ 
+Package: `Eclipse IDE for Java Developers`
+
+2. Install PDE plug-in  
+
+Plug-in name: `Eclipse PDE Plug-in Developer Resources`
+
+3. Install ermasterr 
+ 
+Update Site:
+
+`https://thinkgem.gitee.io/ermasterr/updatesite`
+
+or
+
+`https://thinkgem.github.io/ermasterr/updatesite`
+
+or
+
+Copy the contents of the [org.insightech.er_x.y.z.jar](https://gitee.com/thinkgem/ermasterr/tree/master/updatesite/plugins) latest version to the dropins folder located in the root of your Eclipse installation.
+
+Directory tree example:
+
+```
+your_eclipse_install_dir/
+└── dropins/
+    └── ermasterr/
+        └── eclipse/
+            └── plugins/
+                └── org.insightech.er_x.y.z.jar
+```
+
+or put jar file to dropins directly.
+
+```
+your_eclipse_install_dir/
+└── dropins/
+    └── org.insightech.er_x.y.z.jar
+```
+
+# Features
+
+## Faster
+
+* ermasterr prevented a increase of the drawing time by getting rid of tabs of each category and skipping expensive initialization for each category.
+
+## Better
+
+* ermasterr has fixed the issue that erdiagram data file size becomes gigantic in sometimes by writing a large amount of same xml tags. (https://sourceforge.net/p/ermaster/bugs/119/)
+
+## VCS-friendly
+
+* ermasterr can write git-mergable erdiagram data as far as possible. (https://sourceforge.net/p/ermaster/feature-requests/104/)
+
+# License
+
+Apache License V2.0

dropins/ermasterr/eclipse/plugins/org.insightech.er_1.1.16.jar

@@ -2,7 +2,7 @@
 <feature
       id="org.insightech.er"
       label="ERMaster Features"
-      version="1.1.17"
+      version="1.1.18"
       provider-name="jeesite.com">
 
    <description url="http://jeesite.com">

features/feature.xml

@@ -1,8 +1,15 @@
 package org.insightech.er.db.impl.h2;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.insightech.er.editor.model.ERDiagram;
 import org.insightech.er.editor.model.dbexport.ddl.DDLCreator;
 import org.insightech.er.editor.model.diagram_contents.element.node.category.Category;
+import org.insightech.er.editor.model.diagram_contents.element.node.table.ERTable;
+import org.insightech.er.editor.model.diagram_contents.element.node.table.column.Column;
+import org.insightech.er.editor.model.diagram_contents.element.node.table.column.NormalColumn;
+import org.insightech.er.editor.model.diagram_contents.not_element.group.ColumnGroup;
 import org.insightech.er.editor.model.diagram_contents.not_element.sequence.Sequence;
 import org.insightech.er.editor.model.diagram_contents.not_element.tablespace.Tablespace;
 import org.insightech.er.util.Check;
@@ -13,6 +20,84 @@ public H2DDLCreator(final ERDiagram diagram, final Category targetCategory, fina
         super(diagram, targetCategory, semicolon);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<String> getCommentDDL(final ERTable table) {
+        final List<String> ddlList = new ArrayList<String>();
+
+        String tableComment = filterComment(table.getLogicalName(), table.getDescription(), false);
+        tableComment = replaceLF(tableComment, LF());
+
+        if (!Check.isEmpty(tableComment)) {
+            final StringBuilder ddl = new StringBuilder();
+
+            ddl.append("COMMENT ON TABLE ");
+            ddl.append(filterName(table.getNameWithSchema(getDiagram().getDatabase())));
+            ddl.append(" IS '");
+            ddl.append(tableComment.replaceAll("'", "''"));
+            ddl.append("'");
+            if (semicolon) {
+                ddl.append(";");
+            }
+
+            ddlList.add(ddl.toString());
+        }
+
+        for (final Column column : table.getColumns()) {
+            if (column instanceof NormalColumn) {
+                final NormalColumn normalColumn = (NormalColumn) column;
+
+                String comment = filterComment(normalColumn.getLogicalName(), normalColumn.getDescription(), true);
+                comment = replaceLF(comment, LF());
+
+                if (!Check.isEmpty(comment)) {
+                    final StringBuilder ddl = new StringBuilder();
+
+                    ddl.append("COMMENT ON COLUMN ");
+                    ddl.append(filterName(table.getNameWithSchema(getDiagram().getDatabase())));
+                    ddl.append(".");
+                    ddl.append(filterName(normalColumn.getPhysicalName()));
+                    ddl.append(" IS '");
+                    ddl.append(comment.replaceAll("'", "''"));
+                    ddl.append("'");
+                    if (semicolon) {
+                        ddl.append(";");
+                    }
+
+                    ddlList.add(ddl.toString());
+                }
+
+            } else {
+                final ColumnGroup columnGroup = (ColumnGroup) column;
+
+                for (final NormalColumn normalColumn : columnGroup.getColumns()) {
+                    final String comment = filterComment(normalColumn.getLogicalName(), normalColumn.getDescription(), true);
+
+                    if (!Check.isEmpty(comment)) {
+                        final StringBuilder ddl = new StringBuilder();
+
+                        ddl.append("COMMENT ON COLUMN ");
+                        ddl.append(filterName(table.getNameWithSchema(getDiagram().getDatabase())));
+                        ddl.append(".");
+                        ddl.append(filterName(normalColumn.getPhysicalName()));
+                        ddl.append(" IS '");
+                        ddl.append(comment.replaceAll("'", "''"));
+                        ddl.append("'");
+                        if (semicolon) {
+                            ddl.append(";");
+                        }
+
+                        ddlList.add(ddl.toString());
+                    }
+                }
+            }
+        }
+
+        return ddlList;
+    }
+
     @Override
     protected String getDDL(final Tablespace tablespace) {
         return null;

src/org/insightech/er/db/impl/h2/H2DDLCreator.java

@@ -29,14 +29,12 @@ protected List getModelChildren() {
      */
     @Override
     protected void refreshOutlineVisuals() {
-        if (!DBManagerFactory.getDBManager(getDiagram()).isSupported(DBManager.SUPPORT_SEQUENCE)) {
-            ((TreeItem) getWidget()).setForeground(ColorConstants.lightGray);
-
-        } else {
-            ((TreeItem) getWidget()).setForeground(ColorConstants.black);
-
-        }
-
+//        if (!DBManagerFactory.getDBManager(getDiagram()).isSupported(DBManager.SUPPORT_SEQUENCE)) {
+//            ((TreeItem) getWidget()).setForeground(ColorConstants.lightGray);
+//
+//        } else {
+//            ((TreeItem) getWidget()).setForeground(ColorConstants.black);
+//        }
         setWidgetText(ResourceString.getResourceString("label.sequence") + " (" + getModelChildren().size() + ")");
         setWidgetImage(ERDiagramActivator.getImage(ImageKey.DICTIONARY));
     }

src/org/insightech/er/editor/controller/editpart/outline/sequence/SequenceSetOutlineEditPart.java

@@ -3,11 +3,8 @@
    <description name="ermasterr" url="https://gitee.com/thinkgem/ermasterr">
       ER Master 是一个用于设计ER模型图的Eclipse插件。提供的功能包括：从数据库导入关系生成ER图，导出设计图，导出DDL数据定义语句等。目前完整支持的数据库包括 MySQL、PostgreSQL、Oracle、SQLServer、DB2等。
    </description>
-   <feature url="features/org.insightech.er_1.1.16.jar" id="org.insightech.er" version="1.1.16">
-      <category name="ermaster"/>
+   <feature url="features/org.insightech.er_1.1.18.jar" id="org.insightech.er" version="1.1.18">
+      <category name="ERMaster"/>
    </feature>
-   <feature url="features/org.insightech.er_1.1.17.jar" id="org.insightech.er" version="1.1.17">
-      <category name="ermaster"/>
-   </feature>
-   <category-def name="ermaster" label="ERMaster"/>
+   <category-def name="ERMaster" label="ERMaster"/>
 </site>