From a82f46c84697dc2265d856ab342ea9ced769e146 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@goolemail.com>
Date: Sun, 17 May 2020 18:56:57 +0200
Subject: [PATCH] More edits for refactoring embedded entities into JSON cols

---
 .../librecms/profilesite/ProfileSiteItem.java | 74 ++++++++++---------
 ccm-core/pom.xml                              |  8 +-
 .../libreccm/testutils/DatasetsVerifier.java  |  2 +-
 pom.xml                                       |  4 +-
 4 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/ccm-cms-profile/src/main/java/org/librecms/profilesite/ProfileSiteItem.java b/ccm-cms-profile/src/main/java/org/librecms/profilesite/ProfileSiteItem.java
index 698eae250..1685dc532 100644
--- a/ccm-cms-profile/src/main/java/org/librecms/profilesite/ProfileSiteItem.java
+++ b/ccm-cms-profile/src/main/java/org/librecms/profilesite/ProfileSiteItem.java
@@ -11,6 +11,7 @@ import com.arsdigita.cms.contenttypes.ui.ProfileSiteItemMiscStep;
 import com.arsdigita.cms.contenttypes.ui.ProfileSiteItemPositionStep;
 import com.arsdigita.cms.contenttypes.ui.ProfileSiteItemPropertiesStep;
 
+import org.hibernate.annotations.Type;
 import org.libreccm.l10n.LocalizedString;
 import org.librecms.assets.Person;
 import org.librecms.contentsection.ContentItem;
@@ -21,6 +22,7 @@ import org.librecms.contenttypes.ContentTypeDescription;
 import java.util.Objects;
 
 import javax.persistence.AssociationOverride;
+import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
@@ -85,43 +87,49 @@ public class ProfileSiteItem extends ContentItem {
     @JoinColumn(name = "OWNER_ID")
     private Person owner;
 
-    @Embedded
-    @AssociationOverride(
-        name = "values",
-        joinTable = @JoinTable(
-            name = "PROFILE_SITE_ITEMS_POSITION",
-            schema = DB_SCHEMA,
-            joinColumns = {
-                @JoinColumn(name = "PROFILE_SITE_ITEM_ID")
-            }
-        )
-    )
+//    @Embedded
+//    @AssociationOverride(
+//        name = "values",
+//        joinTable = @JoinTable(
+//            name = "PROFILE_SITE_ITEMS_POSITION",
+//            schema = DB_SCHEMA,
+//            joinColumns = {
+//                @JoinColumn(name = "PROFILE_SITE_ITEM_ID")
+//            }
+//        )
+//    )
+    @Column(name = "POSITION")
+    @Type(type = "org.libreccm.l10n.LocalizedStringType")
     private LocalizedString position;
 
-    @Embedded
-    @AssociationOverride(
-        name = "values",
-        joinTable = @JoinTable(
-            name = "PROFILE_SITE_ITEMS_INTERESTS",
-            schema = DB_SCHEMA,
-            joinColumns = {
-                @JoinColumn(name = "PROFILE_SITE_ITEM_ID")
-            }
-        )
-    )
+//    @Embedded
+//    @AssociationOverride(
+//        name = "values",
+//        joinTable = @JoinTable(
+//            name = "PROFILE_SITE_ITEMS_INTERESTS",
+//            schema = DB_SCHEMA,
+//            joinColumns = {
+//                @JoinColumn(name = "PROFILE_SITE_ITEM_ID")
+//            }
+//        )
+//    )
+    @Column(name = "INTERESTS")
+    @Type(type = "org.libreccm.l10n.LocalizedStringType")
     private LocalizedString interests;
 
-    @Embedded
-    @AssociationOverride(
-        name = "values",
-        joinTable = @JoinTable(
-            name = "PROFILE_SITE_ITEMS_MISC",
-            schema = DB_SCHEMA,
-            joinColumns = {
-                @JoinColumn(name = "PROFILE_SITE_ITEM_ID")
-            }
-        )
-    )
+//    @Embedded
+//    @AssociationOverride(
+//        name = "values",
+//        joinTable = @JoinTable(
+//            name = "PROFILE_SITE_ITEMS_MISC",
+//            schema = DB_SCHEMA,
+//            joinColumns = {
+//                @JoinColumn(name = "PROFILE_SITE_ITEM_ID")
+//            }
+//        )
+//    )
+    @Column(name = "MISC")
+    @Type(type = "org.libreccm.l10n.LocalizedStringType")
     private LocalizedString misc;
 
     public ProfileSiteItem() {
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 8c09637e8..1a938a091 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -333,11 +333,15 @@
                 <groupId>de.jpdigital</groupId>
                 <artifactId>hibernate53-ddl-maven-plugin</artifactId>
                 <configuration>
-                    <dialects>
+<!--                    <dialects>
                         <param>h2</param>
                         <param>oracle12c</param>
                         <param>postgresql9</param>
-                    </dialects>
+                    </dialects>-->
+                    <customDialects>
+                        <param>org.libreccm.hibernate.dialects.LibreCcmH2Dialect</param>
+                        <param>org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect</param>
+                    </customDialects>
                     <packages>
                         <param>org.libreccm.categorization</param>
                         <param>org.libreccm.core</param>
diff --git a/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java b/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java
index 1e7ad323d..0974b90b6 100644
--- a/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java
+++ b/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java
@@ -184,7 +184,7 @@ public class DatasetsVerifier {
     }
 
     protected String[] getDdlFiles() {
-        return new String[]{"/sql/ddl/auto/h2.sql"};
+        return new String[]{"/sql/ddl/auto/libreccmh2.sql"};
     }
 
     private void processDdlFile(final Connection connection,
diff --git a/pom.xml b/pom.xml
index f3cbc5039..f05806985 100644
--- a/pom.xml
+++ b/pom.xml
@@ -814,7 +814,7 @@
             <dependency>
                 <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>
-                <version>1.4.199</version>
+                <version>1.4.200</version>
             </dependency>
 
             <!-- WebJars -->
@@ -841,4 +841,4 @@
         </dependencies>
     </dependencyManagement>
 
-</project>
\ No newline at end of file
+</project>