summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/satellitedaemon/db/DbUser.java
diff options
context:
space:
mode:
authorBjörn Hagemeister2014-10-22 16:37:32 +0200
committerBjörn Hagemeister2014-10-22 16:37:32 +0200
commitd12670ce84bd74feeb82e3d9c7a3f9a944bfed9e (patch)
tree9720a0c0714f97e7270af51ca48d41379d8aa63f /src/main/java/org/openslx/satellitedaemon/db/DbUser.java
parentAdded usage info in case of invalid given arguments. (diff)
downloadsatellite-daemon-d12670ce84bd74feeb82e3d9c7a3f9a944bfed9e.tar.gz
satellite-daemon-d12670ce84bd74feeb82e3d9c7a3f9a944bfed9e.tar.xz
satellite-daemon-d12670ce84bd74feeb82e3d9c7a3f9a944bfed9e.zip
Fixed several things for successful up and download of images after using all arguments of database.
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/db/DbUser.java')
-rw-r--r--src/main/java/org/openslx/satellitedaemon/db/DbUser.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/db/DbUser.java b/src/main/java/org/openslx/satellitedaemon/db/DbUser.java
index deebd66..3aa57d2 100644
--- a/src/main/java/org/openslx/satellitedaemon/db/DbUser.java
+++ b/src/main/java/org/openslx/satellitedaemon/db/DbUser.java
@@ -24,8 +24,8 @@ public class DbUser
*/
public static DbUser getUserById(String userId) {
return MySQL.findUniqueOrNull( DbUser.class, "SELECT user.userID, user.Vorname AS firstName, " +
- "user.Nachname AS lastName, user.mail AS email, user.institution" +
- "FROM m_user user" +
+ "user.Nachname AS lastName, user.mail AS email, user.institution " +
+ "FROM m_user user " +
"WHERE userID = ?", userId );
}
}