[openjpa] branch master updated (e4197b0 -> f27a0b9)

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[openjpa] branch master updated (e4197b0 -> f27a0b9)

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

struberg pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git.


    from e4197b0  [OPENJPA-2748] commons-collection4 is updated to release version
     new 037a2dc  OPENJPA-2775 fix hsql metadata handling
     new 238449e  hsqldb seems to have a bug with concurrent access to the underlying DB.
     new f27a0b9  add debugging instruction with hsqldb

The 3 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:
 .../org/apache/openjpa/jdbc/sql/HSQLDictionary.java     |  4 ++--
 .../callbacks/TestMultiEmEntityListeners.java           | 17 +++++++++++++++++
 openjpa-project/BUILDING.txt                            |  3 +++
 3 files changed, 22 insertions(+), 2 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[openjpa] 01/03: OPENJPA-2775 fix hsql metadata handling

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

struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git

commit 037a2dc4c0e4d09487455d0f9b3848db2d1caec7
Author: Mark Struberg <[hidden email]>
AuthorDate: Wed Feb 6 10:20:19 2019 +0100

    OPENJPA-2775 fix hsql metadata handling
---
 .../src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
index 1369957..8c4f23c 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
@@ -82,8 +82,8 @@ public class HSQLDictionary extends DBDictionary {
 
         doubleTypeName = "NUMERIC";
 
-        supportsNullTableForGetPrimaryKeys = true;
-        supportsNullTableForGetIndexInfo = true;
+        supportsNullTableForGetPrimaryKeys = false;
+        supportsNullTableForGetIndexInfo = false;
 
         requiresCastForMathFunctions = true;
         requiresCastForComparisons = true;

Reply | Threaded
Open this post in threaded view
|

[openjpa] 02/03: hsqldb seems to have a bug with concurrent access to the underlying DB.

struberg
In reply to this post by struberg
This is an automated email from the ASF dual-hosted git repository.

struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git

commit 238449e155b9e70915b17a9f8f4cf6ef40e2bf9f
Author: Mark Struberg <[hidden email]>
AuthorDate: Wed Feb 6 10:22:24 2019 +0100

    hsqldb seems to have a bug with concurrent access to the underlying DB.
---
 .../callbacks/TestMultiEmEntityListeners.java           | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMultiEmEntityListeners.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMultiEmEntityListeners.java
index c136cf4..4eab45a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMultiEmEntityListeners.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMultiEmEntityListeners.java
@@ -18,20 +18,33 @@
  */
 package org.apache.openjpa.persistence.callbacks;
 
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.jdbc.sql.HSQLDictionary;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestMultiEmEntityListeners extends SingleEMFTestCase {
+    private boolean skipped = false;
 
     @Override
     public void setUp() {
         setUp(CLEAR_TABLES, ListenerInEntity.class, AddListenerEntity.class
 //                , "openjpa.Compatibility", "SingletonLifecycleEventManager=true"
             );
+        DBDictionary dict = ((JDBCConfiguration) emf.getConfiguration()).getDBDictionaryInstance();
+        if (dict instanceof HSQLDictionary) {
+            getLog().warn("Skipping test " + getClass().getSimpleName() + " because of a known bug in the Database");
+            skipped = true;
+        }
     }
 
     public void testListenerInEntity1() {
+        if (skipped) {
+            return;
+        }
+
         OpenJPAEntityManager em1 = null;
         OpenJPAEntityManager em2 = null;
         try {
@@ -133,6 +146,10 @@ public class TestMultiEmEntityListeners extends SingleEMFTestCase {
     }
 
     public void testAddListenerEntity1() {
+        if (skipped) {
+            return;
+        }
+
         OpenJPAEntityManager em1 = null;
         OpenJPAEntityManager em2 = null;
         try {

Reply | Threaded
Open this post in threaded view
|

[openjpa] 03/03: add debugging instruction with hsqldb

struberg
In reply to this post by struberg
This is an automated email from the ASF dual-hosted git repository.

struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git

commit f27a0b91244158e99e9ba0213521b01d5ee89d41
Author: Mark Struberg <[hidden email]>
AuthorDate: Wed Feb 6 10:23:02 2019 +0100

    add debugging instruction with hsqldb
---
 openjpa-project/BUILDING.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openjpa-project/BUILDING.txt b/openjpa-project/BUILDING.txt
index c973078..d59310b 100644
--- a/openjpa-project/BUILDING.txt
+++ b/openjpa-project/BUILDING.txt
@@ -209,6 +209,9 @@ For running against a MariaDB Docker installation:
 For running against a h2 based installation:
  -ea -Dopenjpa.ConnectionDriverName=org.h2.Driver -Dopenjpa.ConnectionURL=jdbc:h2:./target/database/openjpa-h2-database -Dopenjpa.ConnectionUserName=root -Dopenjpa.ConnectionPassword=openjpatst
 
+For running against a hsqldb based installation:
+ -ea -Dopenjpa.ConnectionDriverName=org.hsqldb.Driver -Dopenjpa.ConnectionURL=jdbc:hsqldb:mem:openjpa20-hsqldb-database -Dopenjpa.ConnectionUserName=sa -Dopenjpa.ConnectionPassword=
+
 TODO: finish!
 
 For starting tests in `openjpa-persistence-jdbc` inside a compiler you can also trigger all the enhancement manually via: