You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2020/11/12 09:07:32 UTC
[cayenne] branch STABLE-4.1 updated (8690799 -> a22851b)
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a change to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git.
from 8690799 CAY-2676 Degradation: Custom class generation templates are not working anymore
new f0b2af8 Flag "--no-module-directories" is for JDK 9+
new a22851b CAY-2690 dbimport skips length changes for BINARY and VARBINARY columns
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
RELEASE-NOTES.txt | 4 ++--
.../java/org/apache/cayenne/dbsync/merge/DbAttributeMerger.java | 6 +++++-
pom.xml | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
[cayenne] 01/02: Flag "--no-module-directories" is for JDK 9+
Posted by nt...@apache.org.
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 f0b2af802ee76c169ba795d9a2b016e234afe2bb
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Nov 12 12:06:03 2020 +0300
Flag "--no-module-directories" is for JDK 9+
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8065d9a..c7f60ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1724,7 +1724,7 @@
</activation>
<properties>
<javadoc.doclint>none</javadoc.doclint>
- <javadoc.additionalOptions>--no-module-directories</javadoc.additionalOptions>
+ <javadoc.additionalOptions/>
</properties>
</profile>
<profile>
[cayenne] 02/02: CAY-2690 dbimport skips length changes for BINARY
and VARBINARY columns
Posted by nt...@apache.org.
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 <st...@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;