diff options
| author | Simon Rettberg | 2014-10-07 14:39:49 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-10-07 14:39:49 +0200 |
| commit | f0f414b063905de9051a242abb85f20285451941 (patch) | |
| tree | 6ba27d7266b31a7764ffa193a854741a05561a65 /src/main/java/org/openslx/satellitedaemon/db/DbImage.java | |
| parent | Update thrift usage according to changes to master-sync-shared (diff) | |
| download | satellite-daemon-f0f414b063905de9051a242abb85f20285451941.tar.gz satellite-daemon-f0f414b063905de9051a242abb85f20285451941.tar.xz satellite-daemon-f0f414b063905de9051a242abb85f20285451941.zip | |
Adapt to login@uni format for user-ids, Put asym keys in extra class
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/db/DbImage.java')
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/db/DbImage.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/db/DbImage.java b/src/main/java/org/openslx/satellitedaemon/db/DbImage.java index a7dcbc3..7079380 100644 --- a/src/main/java/org/openslx/satellitedaemon/db/DbImage.java +++ b/src/main/java/org/openslx/satellitedaemon/db/DbImage.java @@ -45,7 +45,7 @@ public class DbImage public static List<DbImage> getAllMarkedForUpload() { return MySQL.findAll( DbImage.class, "SELECT image.GUID_imageID, image.image_name, image.imageVersion, image.image_path," + - " Concat(user.loginName, '@', institution.name) AS userID, image.image_filesize" + + " user.loginName, '@', institution.name) AS userID, image.image_filesize" + " FROM m_VLData_imageInfo image" + " INNER JOIN m_user user ON (image.image_owner = user.userID)" + " INNER JOIN m_institution institution ON (institution.institutionID = user.institution)" + |