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 6715e35 CAY-2690 dbimport skips length changes for BINARY and VARBINARY columns 6715e35 is described below commit 6715e35b20f4981b79b35520ba309997bb4a8ad3 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 --- RELEASE-NOTES.txt | 1 + .../java/org/apache/cayenne/dbsync/merge/DbAttributeMerger.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index efbbd65..abaf4de 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -20,6 +20,7 @@ Bug Fixes: CAY-2683 Don't use DISTINCT for joins on to-one related tables CAY-2685 JsonType should use the actual JDBC type, not OTHER CAY-2686 SQL translator incorrectly quotes fully qualified tables' names +CAY-2690 dbimport skips length changes for BINARY and VARBINARY columns ---------------------------------- Release: 4.2.M2 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 1df920d..2f796e0 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;