ODWRTW/canape
2
2
Fork 0
Code Issues 3 Pull Requests 1 Releases Activity

token table rename users_id to user_id

Browse Source
This commit is contained in:
Nicolas Duhamel 2016-02-24 13:41:54 +01:00
parent e6b60ec1a4
commit c4af945e18
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/0001_initial.up.sql
View File

@ -24,7 +24,7 @@ CREATE TRIGGER update_users_updated_at BEFORE UPDATE ON users FOR EACH ROW EXECU
CREATE TABLE tokens ( CREATE TABLE tokens (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(), id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
value text NOT NULL UNIQUE, value text NOT NULL UNIQUE,
users_id uuid REFERENCES users (id) ON DELETE CASCADE, user_id uuid REFERENCES users (id) ON DELETE CASCADE,
LIKE base INCLUDING DEFAULTS LIKE base INCLUDING DEFAULTS
); );
CREATE TRIGGER update_tokens_updated_at BEFORE UPDATE ON tokens FOR EACH ROW EXECUTE PROCEDURE update_modified_column(); CREATE TRIGGER update_tokens_updated_at BEFORE UPDATE ON tokens FOR EACH ROW EXECUTE PROCEDURE update_modified_column();

8
users/users.go
View File

@ -14,10 +14,10 @@ const (
updateUserQuery = `UPDATE users SET name=:name, hash=:hash RETURNING *;` updateUserQuery = `UPDATE users SET name=:name, hash=:hash RETURNING *;`
deleteUseQuery = `DELETE FROM users WHERE id=:id;` deleteUseQuery = `DELETE FROM users WHERE id=:id;`
addTokenQuery = `INSERT INTO tokens (value, users_id) VALUES ($1, $2) RETURNING id;` addTokenQuery = `INSERT INTO tokens (value, user_id) VALUES ($1, $2) RETURNING id;`
getTokensQuery = `SELECT id, value FROM tokens WHERE users_id=$1;` getTokensQuery = `SELECT id, value FROM tokens WHERE user_id=$1;`
checkTokenQuery = `SELECT count(*) FROM tokens WHERE users_id=$1 AND value=$2;` checkTokenQuery = `SELECT count(*) FROM tokens WHERE user_id=$1 AND value=$2;`
deleteTokenQuery = `DELETE FROM tokens WHERE users_id=$1 AND value=$2;` deleteTokenQuery = `DELETE FROM tokens WHERE user_id=$1 AND value=$2;`
) )
// User represents an user // User represents an user

2
users/users_test.go
View File

@ -142,7 +142,7 @@ func TestTokenAddDelete(t *testing.T) {
// Remove user and test auto delete token // Remove user and test auto delete token
u.Delete(db) u.Delete(db)
q := `SELECT count(*) FROM tokens WHERE users_id=$1;` q := `SELECT count(*) FROM tokens WHERE user_id=$1;`
var count int var count int
err = db.QueryRowx(q, u.ID).Scan(&count) err = db.QueryRowx(q, u.ID).Scan(&count)
if err != nil { if err != nil {