Continued:

- added unique index for confirmation key
- updated jars
- updated .gitignore

diff --git a/.gitignore b/.gitignore
index 1cd7a864ebb8bea89250b3347abbb6064e2db0fc..0383bcc9e4d5d046929d1f5b3102c94012efafb2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 /nbproject/private/
+/nbproject/*~
 /manifest.mf
 /build/
 /dist/
+/data/*
 /*.properties

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index 98ca617007e9f5e8090f6843513e80bec85acfa1..855385dcf75d9ff7c6acb19cddb65dde39bd5bc0 100644 (file)
Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 57a3b6cecdc73685710c2cf6d6760b52b39a09d7..1a75fc00ef1f570f9b3af2edf1b0065404ef10eb 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 3900e4e429207d9bb6bf44a793b20eb1fcd3c033..76ac2d386eba9d82637d0b52fdc62d0932179b5e 100644 (file)
Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ

diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java
index 19ab30ac76e312b267890ea880dc45e75b82d1a9..3c7b78a639eaccd8eaa9a2caef247c357b23e66e 100644 (file)
--- a/src/org/mxchange/jusercore/model/user/LoginUser.java
+++ b/src/org/mxchange/jusercore/model/user/LoginUser.java
@@ -26,6 +26,7 @@ import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
@@ -43,7 +44,15 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus;
  * @author Roland Haeder<roland@mxchange.org>
  */
 @Entity (name = "users")
-@Table (name = "users")
+@Table (
+               name = "users",
+               indexes =
+               @Index (
+                               name = "confirmation_key",
+                               unique = true,
+                               columnList = "user_confirm_key"
+               )
+)
 @NamedQueries (
                {
                        @NamedQuery (name = "AllUserNames", query = "SELECT DISTINCT u.userName FROM users AS u ORDER BY u.userId ASC"),
@@ -76,8 +85,8 @@ public class LoginUser implements User {
        /**
         * Id number from "contacts" table
         */
-       @JoinColumn (name = "contact_id", nullable = false, updatable = false)
-       @OneToOne (cascade = CascadeType.ALL, targetEntity = UserContact.class, optional = false)
+       @JoinColumn (name = "user_contact_id", nullable = false, updatable = false)
+       @OneToOne (targetEntity = UserContact.class, optional = false, cascade = CascadeType.ALL)
        private Contact userContact;
 
        /**