LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

More edits for refactoring embedded entities into JSON cols 

Former-commit-id: a82f46c846
embedded-to-json
Jens Pelzetter 2020-05-17 18:56:57 +02:00
parent a369979f79
commit a50e1fb99b
4 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
ccm-cms-profile/src/main/java/org/librecms/profilesite/ProfileSiteItem.java
View File

@ -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() {

8
ccm-core/pom.xml
View File

@ -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>

2
ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java
View File

@ -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,

4
pom.xml
View File

@ -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>
</project>