# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1347023351 0
# Node ID a8b6b4924f4e6c3c433f9dd7d4dae249c9854275
# Parent  92b51af2d02d4ea1ad5f451b7347a06211aa0e9b
Merged revisions 5376,5383 via svnmerge from
file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/artifacts/trunk

........
  r5376 | ingo | 2012-09-07 11:28:43 +0200 (Fr, 07 Sep 2012) | 1 line

  Tagged 'artifacts' as 2.9
........
  r5383 | bricks | 2012-09-07 15:01:43 +0200 (Fr, 07 Sep 2012) | 2 lines

  Fix queries for finding a user
........


artifacts/tags/2.9@5386 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 92b51af2d02d -r a8b6b4924f4e ChangeLog
--- a/ChangeLog	Thu Aug 30 00:09:14 2012 +0000
+++ b/ChangeLog	Fri Sep 07 13:09:11 2012 +0000
@@ -1,3 +1,13 @@
+2012-09-07	Björn Ricks	<bjoern.ricks@intevation.de>
+
+	* artifact-database/src/main/resources/sql/org-h2-driver.properties,
+	  artifact-database/src/main/resources/sql/org-postgresql-driver.properties:
+	  Fix queries for finding a user.
+
+2012-09-07  Ingo Weinzierl <ingo@intevation.de>
+
+	Tagged RELEASE 2.9
+
 2012-08-30	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* artifact-database/src/main/java/de/intevation/artifactdatabase/state/DefaultSection.java:
diff -r 92b51af2d02d -r a8b6b4924f4e artifact-database/src/main/resources/sql/org-h2-driver.properties
--- a/artifact-database/src/main/resources/sql/org-h2-driver.properties	Thu Aug 30 00:09:14 2012 +0000
+++ b/artifact-database/src/main/resources/sql/org-h2-driver.properties	Fri Sep 07 13:09:11 2012 +0000
@@ -37,7 +37,7 @@
 
 users.select.id.by.gid=SELECT id FROM users WHERE gid = ?
 users.select.gid=SELECT id, name, account, role FROM users WHERE gid = ?
-users.select.account=SELECT id, name, account, role FROM users WHERE account = ?
+users.select.account=SELECT gid, name, account, role FROM users WHERE account = ?
 
 users.delete.id=DELETE FROM users WHERE id = ?
 
diff -r 92b51af2d02d -r a8b6b4924f4e artifact-database/src/main/resources/sql/org-postgresql-driver.properties
--- a/artifact-database/src/main/resources/sql/org-postgresql-driver.properties	Thu Aug 30 00:09:14 2012 +0000
+++ b/artifact-database/src/main/resources/sql/org-postgresql-driver.properties	Fri Sep 07 13:09:11 2012 +0000
@@ -37,7 +37,7 @@
 
 users.select.id.by.gid=SELECT id FROM users WHERE gid = ?::uuid
 users.select.gid=SELECT id, name, account, role FROM users WHERE gid = ?::uuid
-users.select.account=SELECT id, name, account, role FROM users WHERE account = ?
+users.select.account=SELECT gid, name, account, role FROM users WHERE account = ?
 
 users.delete.id=DELETE FROM users WHERE id = ?