From 9fa16e205359646e1d02663f64e440dac6191b57 Mon Sep 17 00:00:00 2001 From: Joe Nelson Date: Sun, 8 Nov 2015 10:47:30 -0800 Subject: [PATCH] Handle missing "active" key in logins update The default value of underlying column gets clobbered by triggers --- schema-templates/basic-auth.sql | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/schema-templates/basic-auth.sql b/schema-templates/basic-auth.sql index c17e071f4..d76e0d22c 100644 --- a/schema-templates/basic-auth.sql +++ b/schema-templates/basic-auth.sql @@ -260,7 +260,7 @@ begin insert into basic_auth.logins (username, role, pass, email, active, more) values (new.username, new.role, new.pass, new.email, - new.active, new.more); + coalesce(new.active, false), new.more); return new; elsif tg_op = 'UPDATE' then -- no need to check clearance for old.role because @@ -270,7 +270,8 @@ begin update basic_auth.logins set username = new.username, role = new.role, pass = new.pass, email = new.email, - active = new.active, more = new.more + active = coalesce(new.active, old.active, false), + more = new.more where username = old.username; return new; elsif tg_op = 'DELETE' then