Model::Users: fix update() for latest generic_update()

diff --git a/src/newslash_web/lib/Newslash/Model/Users.pm b/src/newslash_web/lib/Newslash/Model/Users.pm
index 7e2a10d..d143c1e 100644 (file)
--- a/src/newslash_web/lib/Newslash/Model/Users.pm
+++ b/src/newslash_web/lib/Newslash/Model/Users.pm
@@ -848,8 +848,9 @@ sub update {
                       sig seclev journal_last_entry_date author)];
 
     return $self->generic_update(table => "users",
-                                  others => $columns,
-                                  params => $params);
+                                 updatable_keys => $columns,
+                                 condition_keys => [qw(uid)],
+                                 params => $params);
 }
 
 sub update_acl2_by_srcid {
@@ -1087,9 +1088,10 @@ sub update_info {
                    csq_bonuses)];
 
     return $self->generic_update(table => "users_info",
-                                  addables => $addables,
-                                  others => $others,
-                                  params => $params);
+                                 addable_keys => $addables,
+                                 updatable_keys => $others,
+                                 condition_keys => [qw(uid)],
+                                 params => $params);
 }
 
 1;

diff --git a/src/newslash_web/t/models/users.t b/src/newslash_web/t/models/users.t
index 39e3cb7..bcdb8b3 100644 (file)
--- a/src/newslash_web/t/models/users.t
+++ b/src/newslash_web/t/models/users.t
@@ -40,6 +40,7 @@ subtest 'select/update users' => sub {
                             seclev => 10000,
                             author => 1);
     ok($rs, "update users table");
+    warn $users->last_error if (!$rs);
 
     $user = $users->select(uid => $uid);
     ok($user->{uid} == $uid, "select method returns valid uid");