CAY-2901 Loosing comments on the existing ObjAttribute after DB import

Author: stariy95

RELEASE-NOTES.txt

@@ -34,6 +34,7 @@ CAY-2896 Inserting two identical objects into two datamaps stores both objects i
 CAY-2898 Crypto: NPE in a ColumnQuery
 CAY-2899 CommitLog: missing lifecycle-induced changes in `excludeFromTransaction` mode
 CAY-2900 Meaningful generated PKs could lead to the ClassCastException
+CAY-2901 Loosing comments on the existing ObjAttribute after DB import
 
 ----------------------------------
 Release: 5.0-M1

cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportModule.java

@@ -34,6 +34,8 @@
 import org.apache.cayenne.project.ProjectModule;
 import org.apache.cayenne.project.ProjectSaver;
 import org.apache.cayenne.project.extension.ExtensionAwareHandlerFactory;
+import org.apache.cayenne.project.extension.info.InfoExtension;
+import org.apache.cayenne.project.extension.info.InfoExtension;
 
 /**
  * A DI module that bootstraps {@link DbImportAction}.
@@ -53,7 +55,9 @@ public void configure(Binder binder) {
         binder.bind(DataChannelMetaData.class).to(DefaultDataChannelMetaData.class);
         binder.bind(HandlerFactory.class).to(ExtensionAwareHandlerFactory.class);
 
-        ProjectModule.extend(binder).addExtension(DbImportExtension.class);
+        ProjectModule.extend(binder)
+                .addExtension(DbImportExtension.class)
+                .addExtension(InfoExtension.class);
     }
 
 }

maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml

@@ -29,5 +29,6 @@
     </db-entity>
     <obj-entity name="Parent" className="Parent" dbEntityName="PARENT">
         <obj-attribute name="col2" type="java.lang.String" db-attribute-path="COL2"/>
+        <info:property xmlns:info="http://cayenne.apache.org/schema/10/info" name="comment" value="test"/>
     </obj-entity>
 </data-map>

maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml-result

@@ -31,5 +31,6 @@
     <obj-entity name="Parent" className="Parent" dbEntityName="PARENT">
         <obj-attribute name="col2" type="java.lang.String" db-attribute-path="COL2"/>
         <obj-attribute name="col4" type="java.lang.String" db-attribute-path="COL4"/>
+        <info:property xmlns:info="http://cayenne.apache.org/schema/10/info" name="comment" value="test"/>
     </obj-entity>
 </data-map>