diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gracha.go | 26 | ||||
| -rw-r--r-- | tests/queries.sql | 15 |
2 files changed, 5 insertions, 36 deletions
diff --git a/tests/gracha.go b/tests/gracha.go index 3c834ef..6991e56 100644 --- a/tests/gracha.go +++ b/tests/gracha.go @@ -432,32 +432,6 @@ func test_byEmailStmt() { user2.confirmed = true g.TAssertEqual(user2, user3) }) - - g.Testing("if there is metadata content it is included", func() { - u := newUser() - - _, err := register(u.userID, u.email, u.salt, u.pwhash) - g.TErrorIf(err) - - user1, err := byEmail(u.email) - g.TErrorIf(err) - g.TAssertEqual(user1.metadata == nil, true) - - const tmpl_write = ` - UPDATE "%s_users" - SET METADATA = '{ "key": "value" }' - WHERE uuid = ?; - ` - qWrite := fmt.Sprintf(tmpl_write, prefix) - _, err = db.Exec(qWrite, u.userID[:]) - g.TErrorIf(err) - - expected := map[string]interface{}{"key": "value"} - - user2, err := byEmail(u.email) - g.TErrorIf(err) - g.TAssertEqual(user2.metadata, expected) - }) } func test_loginStmt() { diff --git a/tests/queries.sql b/tests/queries.sql index c44a6c5..7e20ae9 100644 --- a/tests/queries.sql +++ b/tests/queries.sql @@ -7,8 +7,7 @@ uuid BLOB NOT NULL UNIQUE, email TEXT NOT NULL UNIQUE, salt BLOB NOT NULL UNIQUE, - pwhash BLOB NOT NULL, - metadata TEXT + pwhash BLOB NOT NULL ); CREATE TABLE IF NOT EXISTS "gracha_confirmation_attempts" ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -43,7 +42,6 @@ id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, user_id INTEGER NOT NULL REFERENCES "gracha_users"(id), role TEXT NOT NULL, - metadata TEXT, UNIQUE (user_id, role) ); CREATE TABLE IF NOT EXISTS "gracha_role_changes" ( @@ -57,19 +55,17 @@ id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, timestamp TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%f000000Z', 'now')), uuid BLOB NOT NULL UNIQUE, - user_id INTEGER NOT NULL REFERENCES "gracha_users"(id), + user_id INTEGER NOT NULL REFERENCES "gracha_users"(id) -- type TEXT NOT NULL, -- revoked_at TEXT, -- revoker_id INTEGER REFERENCES "gracha_users"(id), -- FIXME: add provenance: login, refresh, confirmation, etc. - metadata TEXT ); CREATE TABLE IF NOT EXISTS "gracha_attempts" ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, timestamp TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%f000000Z', 'now')), user_id INTEGER REFERENCES "gracha_users"(id), - session_id INTEGER REFERENCES "gracha_sessions"(id), - metadata TEXT + session_id INTEGER REFERENCES "gracha_sessions"(id) ); CREATE TABLE IF NOT EXISTS "gracha_audit" ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -77,8 +73,7 @@ uuid BLOB NOT NULL UNIQUE, attribute TEXT NOT NULL, value TEXT NOT NULL, - op BOOLEAN NOT NULL, - metadata TEXT + op BOOLEAN NOT NULL ); @@ -88,7 +83,7 @@ -- write: -- read: - SELECT id, timestamp, uuid, salt, pwhash, metadata, ( + SELECT id, timestamp, uuid, salt, pwhash, ( CASE WHEN EXISTS ( SELECT id FROM "gracha_user_confirmations" WHERE user_id = ( |