Mercurial > dive4elements > framework
changeset 173:940ed629419f
Solve the SQL problem with the collection listings.
artifacts/trunk@1399 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Fri, 04 Mar 2011 14:06:56 +0000 |
| parents | 8ce06db80857 |
| children | 25d472a67a9f |
| files | ChangeLog artifact-database/src/main/resources/sql/org-h2-driver.properties artifact-database/src/main/resources/sql/org-postgresql-driver.properties |
| diffstat | 3 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Mar 04 11:47:27 2011 +0000 +++ b/ChangeLog Fri Mar 04 14:06:56 2011 +0000 @@ -1,3 +1,9 @@ +2011-03-04 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * artifact-database/src/main/resources/sql/org-h2-driver.properties, + artifact-database/src/main/resources/sql/org-postgresql-driver.properties: + Argh! s/OUTER LEFT/LEFT OUTER/ solves the collection listing problem. + 2011-03-04 Ingo Weinzierl <ingo@intevation.de> * artifacts-common/src/main/java/de/intevation/artifacts/common/utils/ClientProtocolUtils.java:
--- a/artifact-database/src/main/resources/sql/org-h2-driver.properties Fri Mar 04 11:47:27 2011 +0000 +++ b/artifact-database/src/main/resources/sql/org-h2-driver.properties Fri Mar 04 14:06:56 2011 +0000 @@ -27,7 +27,7 @@ users.id.nextval=SELECT NEXTVAL('USERS_ID_SEQ') -users.insert=INSERT INTO USERS (id, gid, name, role) VALUES (?, ?, ?, ?) +users.insert=INSERT INTO users (id, gid, name, role) VALUES (?, ?, ?, ?) users.select.id.by.gid=SELECT id FROM users WHERE gid = ? users.select.gid=SELECT id, name, role FROM users WHERE gid = ?
--- a/artifact-database/src/main/resources/sql/org-postgresql-driver.properties Fri Mar 04 11:47:27 2011 +0000 +++ b/artifact-database/src/main/resources/sql/org-postgresql-driver.properties Fri Mar 04 14:06:56 2011 +0000 @@ -53,12 +53,12 @@ collections.select.user= \ SELECT c.gid, c.name, c.creation, u.gid FROM \ - collections c OUTER LEFT JOIN users u ON c.owner_id = u.id \ + collections c LEFT OUTER JOIN users u ON c.owner_id = u.id \ WHERE u.gid = ?::uuid collections.select.all= \ SELECT c.gid, c.name, c.creation, u.gid FROM \ - collections c OUTER LEFT JOIN users u ON c.owner_id = u.id + collections c LEFT OUTER JOIN users u ON c.owner_id = u.id users.collections=SELECT collection_id, gid, name FROM collections WHERE owner_id = ? users.collection.ids=SELECT collection_id FROM collections WHERE owner_id = ?