From de692b132919bbae023c9c6021b91477481cd222 Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Thu, 9 Oct 2014 15:46:28 +0200
Subject: Added update option in DbUser.java plus added deleted
 globals.properties.example file again.

---
 src/main/java/org/openslx/imagemaster/db/DbUser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/org/openslx/imagemaster/db/DbUser.java')

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);
 	}
-- 
cgit v1.2.3-55-g7522