diff options
| author | Björn Hagemeister | 2014-10-09 15:46:28 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-10-09 15:46:28 +0200 |
| commit | de692b132919bbae023c9c6021b91477481cd222 (patch) | |
| tree | 495b755e43a2c3e9324e350ba77549e2b746a0a9 /src/main/java/org/openslx/imagemaster/db/DbUser.java | |
| parent | Implemented publishUser(sessionId, UserInfo) in ApiServer. (diff) | |
| download | masterserver-de692b132919bbae023c9c6021b91477481cd222.tar.gz masterserver-de692b132919bbae023c9c6021b91477481cd222.tar.xz masterserver-de692b132919bbae023c9c6021b91477481cd222.zip | |
Added update option in DbUser.java plus added deleted globals.properties.example file again.
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db/DbUser.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/db/DbUser.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/DbUser.java b/src/main/java/org/openslx/imagemaster/db/DbUser.java index 1806f1d..23ee6d5 100644 --- a/src/main/java/org/openslx/imagemaster/db/DbUser.java +++ b/src/main/java/org/openslx/imagemaster/db/DbUser.java @@ -85,7 +85,7 @@ public class DbUser extends User public static boolean insertOrUpdate(UserInfo userInfo) { log.debug( "Inserted user '" + userInfo.userId + "' into db." ); int ret = MySQL.update( - "INSERT INTO user (organizationid, firstname, lastname, email) VALUES (?, ?, ?, ?)", + "INSERT INTO user (organizationid, firstname, lastname, email) VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE organizationid=VALUES(organizationid), firstname=VALUES(firstname), lastname=VALUES(lastname), email=VALUES(email)", userInfo.organizationId, userInfo.firstName, userInfo.lastName, userInfo.eMail ); return (ret != 0); } |