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:52:22 UTC
[1/3] cayenne git commit: Fix issue with Frontbase PK generation
Repository: cayenne
Updated Branches:
refs/heads/STABLE-3.1 b7e44c91b -> 814de6546
Fix issue with Frontbase PK generation
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/cda048d0
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/cda048d0
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/cda048d0
Branch: refs/heads/STABLE-3.1
Commit: cda048d0caa50dd9575d952d24e50ce8678580af
Parents: b7e44c9
Author: Amedeo Mantica <am...@gmail.com>
Authored: Sun Feb 12 23:48:25 2017 +0100
Committer: Amedeo Mantica <am...@gmail.com>
Committed: Sun Feb 12 23:48:25 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cda048d0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
----------------------------------------------------------------------
diff --git a/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java b/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
index 2761bfe..2fa82f8 100644
--- a/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
+++ b/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
@@ -246,7 +246,7 @@ public class JdbcPkGenerator implements PkGenerator {
if (pkGenerator != null && pkGenerator.getKeyCacheSize() != null)
cacheSize = pkGenerator.getKeyCacheSize().intValue();
else
- cacheSize = pkCacheSize;
+ cacheSize = getPkCacheSize();
long value;
[3/3] cayenne git commit: CAY-2226 PK generation for Frontbase: PK
cache size must be ignored
Posted by aa...@apache.org.
CAY-2226 PK generation for Frontbase: PK cache size must be ignored
* after PR #173...
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/814de654
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/814de654
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/814de654
Branch: refs/heads/STABLE-3.1
Commit: 814de6546f03e5276d2d100b4c79fe2d4062d5f6
Parents: 48aafa7
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Mon Feb 13 07:51:54 2017 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Mon Feb 13 07:52:00 2017 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
.../cayenne/dba/frontbase/FrontBasePkGenerator.java | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/814de654/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 a7113a5..37c6509 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -16,6 +16,7 @@ Bug Fixes Since 3.1.1:
CAY-2084 ObjectIdQuery - no cache access polymorphism
CAY-2101 DataContext.currentSnapshot() doesn't set snapshot entity name
+CAY-2226 PK generation for Frontbase: PK cache size must be ignored
----------------------------------
Release: 3.1.1
http://git-wip-us.apache.org/repos/asf/cayenne/blob/814de654/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
----------------------------------------------------------------------
diff --git a/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java b/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
index 1547626..863fb05 100644
--- a/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
+++ b/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
@@ -19,11 +19,6 @@
package org.apache.cayenne.dba.frontbase;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.QueryResult;
@@ -33,6 +28,11 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.SQLTemplate;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
/**
* @since 1.2
*/
@@ -43,7 +43,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() {
[2/3] cayenne git commit: Merge branch '173' into STABLE-3.1
Posted by aa...@apache.org.
Merge branch '173' into STABLE-3.1
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/48aafa7c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/48aafa7c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/48aafa7c
Branch: refs/heads/STABLE-3.1
Commit: 48aafa7ce5d27e0c8e31a124f0201f10f7098e70
Parents: b7e44c9 cda048d
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Mon Feb 13 07:48:37 2017 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Mon Feb 13 07:48:37 2017 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------