From a7d809ee21da2c245a8b3df85551ea64c3d15fc6 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 10 Oct 2015 22:08:33 +0200 Subject: [PATCH] Continued: - added unique index for confirmation key - updated jars - updated .gitignore --- .gitignore | 2 ++ lib/jcontacts-core.jar | Bin 18101 -> 19800 bytes lib/jcore.jar | Bin 13656 -> 13656 bytes lib/jcoreee.jar | Bin 17973 -> 17973 bytes .../jusercore/model/user/LoginUser.java | 15 ++++++++++++--- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1cd7a86..0383bcc 100644 --- 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 GIT binary patch literal 19800 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 Ov)fz@!S#Jy#{U5Yz|DUE delta 5439 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 j%xTt~tnaEFWOPq1PH%0A;k^U?;1-WWeuvpKNm`!)iezsq diff --git a/lib/jcore.jar b/lib/jcore.jar index 57a3b6cecdc73685710c2cf6d6760b52b39a09d7..1a75fc00ef1f570f9b3af2edf1b0065404ef10eb 100644 GIT binary patch delta 415 zcmcbSbt8*6z?+$ci-CcIfq{Fy*F;_oW-cIQF`pU4yCn~%{%C-x$?A-HU^;@)3QTh{ zsZ2ItVV`_}kqgW}%V-G|HwDvUxZto@SqRIte8EL{tb zk0vkGwFgN|ey*zzrX}?(z;uY79hjb~=LM!8>A8YwEqzZgU8WD=@6&e!^Vto8z;uj3 zIGEmM5C*3C4Wq$yu3UxZto@SqRIte8EL{tb zk0vkGwFgN|ey*zzrX}?(z;uY79hjb~=LM!8>A8YwEqzZgU8WD=@6&e!^Vto8z;uj3 zIGEmM5C*3C4Wq$yu3+A{d!7IQ delta 389 zcmdnm!??AFkvG7bnT3mifrEiTajoY>UJYgiAZ0NhOx=+T5erNyy diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java index 19ab30a..3c7b78a 100644 --- 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 */ @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; /** -- 2.39.5