This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 3edd4bfd9 CAY-2901 Loosing comments on the existing ObjAttribute after
DB import
3edd4bfd9 is described below
commit 3edd4bfd997e37823eede48e2cee0facdae26e09
Author: Nikita Timofeev <[email protected]>
AuthorDate: Mon Oct 27 18:34:11 2025 +0400
CAY-2901 Loosing comments on the existing ObjAttribute after DB import
---
RELEASE-NOTES.txt | 1 +
.../org/apache/cayenne/dbsync/reverse/dbimport/DbImportModule.java | 6 +++++-
.../cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml | 1 +
.../tools/dbimport/testPreserveCustomObjMappings.map.xml-result | 1 +
4 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 24e4a0eb7..d92e28d50 100644
--- a/RELEASE-NOTES.txt
+++ b/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
diff --git
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportModule.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportModule.java
index 45c4611d2..90a82f6dc 100644
---
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportModule.java
+++
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportModule.java
@@ -34,6 +34,8 @@ import org.apache.cayenne.project.FileProjectSaver;
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 class DbImportModule implements Module {
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);
}
}
diff --git
a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml
b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml
index 05686922d..43ebf83db 100644
---
a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml
+++
b/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>
diff --git
a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml-result
b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml-result
index 797180697..247f2d244 100644
---
a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml-result
+++
b/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>
