From 5ae37a5cc4e15e29df6d6274bc51933f366bb052 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 4 Aug 2017 09:03:43 +0200 Subject: [PATCH] Bug 6758: [QA Follow-up] Typo and field order Content-Type: text/plain; charset=utf-8 In the borrowers table lang is added with 16.12.00.033 after lastseen and login_attempts is added with 16.12.00.037 after lastseen (so inserted BEFORE lang). This makes kohastructure.sql reflect that too in line with the DBIx schema changes. (Same for deletedborrowers.) Typo popular resolved. Signed-off-by: Marcel de Rooy --- installer/data/mysql/kohastructure.sql | 4 ++-- t/db_dependent/Koha/Patrons.t | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 268b25e..8c3d97d 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -635,8 +635,8 @@ CREATE TABLE `deletedborrowers` ( -- stores data related to the patrons/borrower `checkprevcheckout` varchar(7) NOT NULL default 'inherit', -- produce a warning for this patron if this item has previously been checked out to this patron if 'yes', not if 'no', defer to category setting if 'inherit'. `updated_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- time of last change could be useful for synchronization with external systems (among others) `lastseen` datetime default NULL, -- last time a patron has been seen (connected at the OPAC or staff interface) - `lang` varchar(25) NOT NULL default 'default', -- lang to use to send notices to this patron `login_attempts` int(4) default 0, -- number of failed login attemps + `lang` varchar(25) NOT NULL default 'default', -- lang to use to send notices to this patron `overdrive_auth_token` text default NULL, -- persist OverDrive auth token KEY borrowernumber (borrowernumber), KEY `cardnumber` (`cardnumber`), @@ -1673,8 +1673,8 @@ CREATE TABLE `borrowers` ( -- this table includes information about your patrons `checkprevcheckout` varchar(7) NOT NULL default 'inherit', -- produce a warning for this patron if this item has previously been checked out to this patron if 'yes', not if 'no', defer to category setting if 'inherit'. `updated_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- time of last change could be useful for synchronization with external systems (among others) `lastseen` datetime default NULL, -- last time a patron has been seen (connected at the OPAC or staff interface) - `lang` varchar(25) NOT NULL default 'default', -- lang to use to send notices to this patron `login_attempts` int(4) default 0, -- number of failed login attemps + `lang` varchar(25) NOT NULL default 'default', -- lang to use to send notices to this patron `overdrive_auth_token` text default NULL, -- persist OverDrive auth token UNIQUE KEY `cardnumber` (`cardnumber`), PRIMARY KEY `borrowernumber` (`borrowernumber`), diff --git a/t/db_dependent/Koha/Patrons.t b/t/db_dependent/Koha/Patrons.t index 2dc4a94..30b369b 100644 --- a/t/db_dependent/Koha/Patrons.t +++ b/t/db_dependent/Koha/Patrons.t @@ -261,7 +261,7 @@ subtest 'renew_account' => sub { value => { dateexpiry => $a_month_ago, categorycode => $patron_category->{categorycode}, - date_renewed => undef, # Force builder to not popular the column for new patron + date_renewed => undef, # Force builder to not populate the column for new patron } } ); -- 2.1.4