Assume that Benki entities are in the “benki” schema.
Since PostgreSQL does not support multiplexing access to several
databases through one connection, everything is easier if all data
lives in separate schemas in the same database. This change modifies
the Hibernate entities accordingly.
Change-Id: Ibe410ab340d77f35549208daf59a15520805c23a
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/OpenId.java b/src/main/java/eu/mulk/mulkcms2/benki/users/OpenId.java
index fe2c905..bb41dda 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/users/OpenId.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/users/OpenId.java
@@ -7,8 +7,10 @@
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
+import javax.persistence.Table;
@Entity(name = "BenkiOpenId")
+@Table(name = "openids", schema = "benki")
public class OpenId extends PanacheEntityBase {
@Id
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/RsaKey.java b/src/main/java/eu/mulk/mulkcms2/benki/users/RsaKey.java
index 85bda62..9dd7931 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/users/RsaKey.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/users/RsaKey.java
@@ -12,7 +12,7 @@
import javax.persistence.Table;
@Entity
-@Table(name = "rsa_keys", schema = "public", catalog = "benki")
+@Table(name = "rsa_keys", schema = "benki")
@IdClass(RsaKeyPK.class)
public class RsaKey extends PanacheEntityBase {
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/User.java b/src/main/java/eu/mulk/mulkcms2/benki/users/User.java
index 45e775c..e16a111 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/users/User.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/users/User.java
@@ -21,7 +21,7 @@
import javax.persistence.Table;
@Entity(name = "BenkiUser")
-@Table(name = "users", schema = "public", catalog = "benki")
+@Table(name = "users", schema = "benki")
public class User extends PanacheEntityBase {
@Id
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/UserDefaultTarget.java b/src/main/java/eu/mulk/mulkcms2/benki/users/UserDefaultTarget.java
index 16807aa..94efef1 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/users/UserDefaultTarget.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/users/UserDefaultTarget.java
@@ -12,7 +12,7 @@
import javax.persistence.Table;
@Entity
-@Table(name = "user_default_target", schema = "public", catalog = "benki")
+@Table(name = "user_default_target", schema = "benki")
@IdClass(UserDefaultTargetPK.class)
public class UserDefaultTarget extends PanacheEntityBase {
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/UserEmailAddress.java b/src/main/java/eu/mulk/mulkcms2/benki/users/UserEmailAddress.java
index 21148b8..383c382 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/users/UserEmailAddress.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/users/UserEmailAddress.java
@@ -10,7 +10,7 @@
import javax.persistence.Table;
@Entity
-@Table(name = "user_email_addresses", schema = "public", catalog = "benki")
+@Table(name = "user_email_addresses", schema = "benki")
public class UserEmailAddress extends PanacheEntityBase {
@Id
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/UserJid.java b/src/main/java/eu/mulk/mulkcms2/benki/users/UserJid.java
index b2100a9..867583c 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/users/UserJid.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/users/UserJid.java
@@ -11,7 +11,7 @@
import javax.persistence.Table;
@Entity
-@Table(name = "user_jids", schema = "public", catalog = "benki")
+@Table(name = "user_jids", schema = "benki")
@IdClass(UserJidPK.class)
public class UserJid extends PanacheEntityBase {
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/UserNickname.java b/src/main/java/eu/mulk/mulkcms2/benki/users/UserNickname.java
index c31c8a1..05a8004 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/users/UserNickname.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/users/UserNickname.java
@@ -10,7 +10,7 @@
import javax.persistence.Table;
@Entity
-@Table(name = "user_nicknames", schema = "public", catalog = "benki")
+@Table(name = "user_nicknames", schema = "benki")
public class UserNickname extends PanacheEntityBase {
@Id
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/UserRole.java b/src/main/java/eu/mulk/mulkcms2/benki/users/UserRole.java
index 7d48b64..7d2c2ea 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/users/UserRole.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/users/UserRole.java
@@ -12,7 +12,7 @@
import javax.persistence.Table;
@Entity
-@Table(name = "user_roles", schema = "public", catalog = "benki")
+@Table(name = "user_roles", schema = "benki")
@IdClass(UserRolePK.class)
public class UserRole extends PanacheEntityBase {
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/UserRsaKey.java b/src/main/java/eu/mulk/mulkcms2/benki/users/UserRsaKey.java
index 806c1b8..7e99791 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/users/UserRsaKey.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/users/UserRsaKey.java
@@ -13,7 +13,7 @@
import javax.persistence.Table;
@Entity
-@Table(name = "user_rsa_keys", schema = "public", catalog = "benki")
+@Table(name = "user_rsa_keys", schema = "benki")
@IdClass(UserRsaKeyPK.class)
public class UserRsaKey extends PanacheEntityBase {
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/WebId.java b/src/main/java/eu/mulk/mulkcms2/benki/users/WebId.java
index 246a448..9a8728c 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/users/WebId.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/users/WebId.java
@@ -10,7 +10,7 @@
import javax.persistence.Table;
@Entity
-@Table(name = "webids", schema = "public", catalog = "benki")
+@Table(name = "webids", schema = "benki")
public class WebId extends PanacheEntityBase {
@Id