Mercurial > dive4elements > framework
changeset 407:08731e7403b5
Update sql user queries to add the account column
artifacts/trunk@5243 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Bjoern Ricks <bjoern.ricks@intevation.de> |
|---|---|
| date | Thu, 23 Aug 2012 13:35:16 +0000 |
| parents | 10aa92f2eca0 |
| children | 7cdd63310d5c |
| 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, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Aug 23 13:33:27 2012 +0000 +++ b/ChangeLog Thu Aug 23 13:35:16 2012 +0000 @@ -1,3 +1,9 @@ +2012-08-23 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: + Update sql user queries to add the account column. + 2012-08-23 Björn Ricks <bjoern.ricks@intevation.de> * artifact-database/doc/schema-pg.sql,
--- a/artifact-database/src/main/resources/sql/org-h2-driver.properties Thu Aug 23 13:33:27 2012 +0000 +++ b/artifact-database/src/main/resources/sql/org-h2-driver.properties Thu Aug 23 13:35:16 2012 +0000 @@ -33,16 +33,16 @@ 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, account, role) VALUES (?, ?, ?, ?, ?) users.select.id.by.gid=SELECT id FROM users WHERE gid = ? -users.select.gid=SELECT id, name, role FROM users WHERE gid = ? +users.select.gid=SELECT id, name, account, role FROM users WHERE gid = ? users.delete.id=DELETE FROM users WHERE id = ? users.delete.collections=DELETE FROM collections where owner_id = ? -users.select.all=SELECT id, gid, name, role FROM users +users.select.all=SELECT id, gid, name, account, role FROM users collection.check.artifact=SELECT id FROM collection_items \ WHERE artifact_id = ? AND collection_id = ?
--- a/artifact-database/src/main/resources/sql/org-postgresql-driver.properties Thu Aug 23 13:33:27 2012 +0000 +++ b/artifact-database/src/main/resources/sql/org-postgresql-driver.properties Thu Aug 23 13:35:16 2012 +0000 @@ -33,16 +33,16 @@ users.id.nextval=SELECT NEXTVAL('USERS_ID_SEQ') -users.insert=INSERT INTO users (id, gid, name, role) VALUES (?, ?::uuid, ?, ?) +users.insert=INSERT INTO users (id, gid, name, account, role) VALUES (?, ?::uuid, ?, ?, ?) users.select.id.by.gid=SELECT id FROM users WHERE gid = ?::uuid -users.select.gid=SELECT id, name, role FROM users WHERE gid = ?::uuid +users.select.gid=SELECT id, name, account, role FROM users WHERE gid = ?::uuid users.delete.id=DELETE FROM users WHERE id = ? users.delete.collections=DELETE FROM collections where owner_id = ? -users.select.all=SELECT id, gid, name, role FROM users +users.select.all=SELECT id, gid, name, account, role FROM users collection.check.artifact=SELECT id FROM collection_items \ WHERE artifact_id = ? AND collection_id = ?