[cayenne] 02/02: CAY-2690 dbimport skips length changes for BINARY and VARBINARY columns

[ntimofeev]

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit a22851b4dad05aef9a76717a763ce860c4a6e50d
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Thu Nov 12 12:00:35 2020 +0300

    CAY-2690 dbimport skips length changes for BINARY and VARBINARY columns
    
    (cherry picked from commit 6715e35b20f4981b79b35520ba309997bb4a8ad3)
---
 RELEASE-NOTES.txt                                                   | 4 ++--
 .../java/org/apache/cayenne/dbsync/merge/DbAttributeMerger.java     | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index a7cd5e5..1f4fe0a 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -9,7 +9,7 @@ https://issues.apache.org/jira/browse/CAY
 
 ----------------------------------
 Release: 4.1.1
-Date: 
+Date:
 ----------------------------------
 
 Bug Fixes:
@@ -18,7 +18,7 @@ CAY-2670 CommitLog does not include FKs for deleted objects 
with one-way relatio
 CAY-2676 Degradation: Custom class generation templates are not working anymore
 CAY-2679 Unstable ordering of relationships in the .map.xml file
 CAY-2681 Modeler: All selected checkboxes cause project to become dirty at 
initialization
-
+CAY-2690 dbimport skips length changes for BINARY and VARBINARY columns
 ----------------------------------
 Release: 4.1
 Date: July 14, 2020
diff --git 
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DbAttributeMerger.java
 
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DbAttributeMerger.java
index 156d516..c82172d 100644
--- 
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DbAttributeMerger.java
+++ 
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DbAttributeMerger.java
@@ -137,7 +137,11 @@ class DbAttributeMerger extends AbstractMerger<DbEntity, 
DbAttribute> {
         }
 
         if(original.getMaxLength() != imported.getMaxLength()) {
-            int[] typesWithMaxLength = {Types.NCHAR, Types.NVARCHAR, 
Types.CHAR, Types.VARCHAR};
+            int[] typesWithMaxLength = {
+                    Types.NCHAR, Types.NVARCHAR,
+                    Types.CHAR, Types.VARCHAR,
+                    Types.BINARY, Types.VARBINARY
+            };
             for(int type : typesWithMaxLength) {
                 if(original.getType() == type) {
                     return true;