You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2017/02/13 04:54:49 UTC
cayenne git commit: CAY-2226 PK generation for Frontbase: PK cache
size must be ignored
Repository: cayenne
Updated Branches:
refs/heads/master 871574bcc -> bf046a22d
CAY-2226 PK generation for Frontbase: PK cache size must be ignored
* porting fix from 3.1
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/bf046a22
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/bf046a22
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/bf046a22
Branch: refs/heads/master
Commit: bf046a22d92972e2293266a772c60d777c23d352
Parents: 871574b
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Mon Feb 13 07:54:43 2017 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Mon Feb 13 07:54:43 2017 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java | 2 +-
.../org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java | 2 +-
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bf046a22/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
index 553283b..38cee0e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
@@ -206,7 +206,7 @@ public class JdbcPkGenerator implements PkGenerator {
if (pkGenerator != null && pkGenerator.getKeyCacheSize() != null) {
cacheSize = pkGenerator.getKeyCacheSize();
} else {
- cacheSize = pkCacheSize;
+ cacheSize = getPkCacheSize();
}
Long value;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bf046a22/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
index 8162066..9fb1df9 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
@@ -45,7 +45,7 @@ public class FrontBasePkGenerator extends JdbcPkGenerator {
}
/**
- * Retruns zero as PK caching is not supported by FrontBaseAdapter.
+ * Returns zero as PK caching is not supported by FrontBaseAdapter.
*/
@Override
public int getPkCacheSize() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bf046a22/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index 7ea7ac7..fd1c44a 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -113,6 +113,7 @@ CAY-2150 UI bug: PK generation custom sequence is getting reset
CAY-2151 Migrate Database Schema: issue when no db is specified
CAY-2153 Modeler Exception in save action after reverse engineering some complex DB schema
CAY-2154 Migrate db: queries order
+CAY-2226 PK generation for Frontbase: PK cache size must be ignored
----------------------------------
Release: 4.0.M3