From 466d074a9e786cb821dfc7f015d77fdee94503e5 Mon Sep 17 00:00:00 2001
From: Alejandro Revilla <apr@jpos.org>
Date: Mon, 24 Dec 2018 14:05:28 -0300
Subject: [PATCH] =?UTF-8?q?kludge=20to=20handle=20Hibernate=E2=80=99s=20hb?=
 =?UTF-8?q?m=20incorrect=20generation=20of=20composite=20primary=20keys=20?=
 =?UTF-8?q?in=20certain=20conditions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug and work-around provided by @vsalaman - aka The Expert
---
 .../minigl/src/main/resources/org/jpos/gl/AccountLock.hbm.xml | 4 ++--
 .../src/main/resources/org/jpos/gl/BalanceCache.hbm.xml       | 4 ++--
 .../minigl/src/main/resources/org/jpos/gl/Checkpoint.hbm.xml  | 4 ++--
 modules/minigl/src/main/resources/org/jpos/gl/Layer.hbm.xml   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/minigl/src/main/resources/org/jpos/gl/AccountLock.hbm.xml b/modules/minigl/src/main/resources/org/jpos/gl/AccountLock.hbm.xml
index a63b0b3c8d..f5e42a6809 100644
--- a/modules/minigl/src/main/resources/org/jpos/gl/AccountLock.hbm.xml
+++ b/modules/minigl/src/main/resources/org/jpos/gl/AccountLock.hbm.xml
@@ -28,9 +28,9 @@
     </meta>
     <composite-id unsaved-value="any">
      <key-many-to-one name="journal" class="org.jpos.gl.Journal"
-         foreign-key="FKAccountLockJournal"/>
+         foreign-key="FKAccountLockJournal"  column="journal"/>
      <key-many-to-one name="account" class="org.jpos.gl.Account" 
-         foreign-key="FKAccountLockAccount" />
+         foreign-key="FKAccountLockAccount"  column="account" />
     </composite-id>
   </class>
 </hibernate-mapping>
diff --git a/modules/minigl/src/main/resources/org/jpos/gl/BalanceCache.hbm.xml b/modules/minigl/src/main/resources/org/jpos/gl/BalanceCache.hbm.xml
index 8a1047e53b..b759c64d94 100644
--- a/modules/minigl/src/main/resources/org/jpos/gl/BalanceCache.hbm.xml
+++ b/modules/minigl/src/main/resources/org/jpos/gl/BalanceCache.hbm.xml
@@ -25,9 +25,9 @@
   <class name="org.jpos.gl.BalanceCache" table="balance_cache">
     <composite-id>
      <key-many-to-one name="journal" class="org.jpos.gl.Journal"
-         foreign-key="FKBalanceCacheJournal"/>
+         foreign-key="FKBalanceCacheJournal" column="journal" />
      <key-many-to-one name="account" class="org.jpos.gl.Account" 
-         foreign-key="FKBalanceCacheAccount" />
+         foreign-key="FKBalanceCacheAccount" column="account" />
      <key-property name="layers" type="string" length="32" />
     </composite-id>
     <property name="ref" type="long" />
diff --git a/modules/minigl/src/main/resources/org/jpos/gl/Checkpoint.hbm.xml b/modules/minigl/src/main/resources/org/jpos/gl/Checkpoint.hbm.xml
index 8f8a317fab..ee3632e3fc 100644
--- a/modules/minigl/src/main/resources/org/jpos/gl/Checkpoint.hbm.xml
+++ b/modules/minigl/src/main/resources/org/jpos/gl/Checkpoint.hbm.xml
@@ -30,9 +30,9 @@
      <key-property name="date" type="timestamp" />
      <key-property name="layers" type="string" length="32" />
      <key-many-to-one name="journal" class="org.jpos.gl.Journal"
-         foreign-key="FKCheckpointJournal"/>
+         foreign-key="FKCheckpointJournal" column="journal" />
      <key-many-to-one name="account" class="org.jpos.gl.Account" 
-         foreign-key="FKCheckpointAccount "/>
+         foreign-key="FKCheckpointAccount" column="account" />
     </composite-id>
     <property name="balance" type="big_decimal">
      <column name="balance" sql-type="numeric(14,2)" not-null="true" />
diff --git a/modules/minigl/src/main/resources/org/jpos/gl/Layer.hbm.xml b/modules/minigl/src/main/resources/org/jpos/gl/Layer.hbm.xml
index ced0d999c9..fc25b3c92c 100644
--- a/modules/minigl/src/main/resources/org/jpos/gl/Layer.hbm.xml
+++ b/modules/minigl/src/main/resources/org/jpos/gl/Layer.hbm.xml
@@ -28,7 +28,7 @@
     </meta>
     <composite-id>
      <key-property name="id" type="short" />
-     <key-many-to-one name="journal" class="org.jpos.gl.Journal" />
+     <key-many-to-one name="journal" class="org.jpos.gl.Journal" column="journal" />
     </composite-id>
     <property name="name" type="string" length="80" />
   </class>