From 0d81bc1d276251a56e381f24d70f550416a0ef0b Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 18 Mar 2020 11:07:14 +0100
Subject: [PATCH] Bug 24722: reserves.priority must default to 1 at DB level

https://bugs.koha-community.org/show_bug.cgi?id=22821
---
 installer/data/mysql/kohastructure.sql | 4 ++--
 installer/data/mysql/updatedatabase.pl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 9545b67cce..a7d756a6fd 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1757,7 +1757,7 @@ CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha
   `reminderdate` date default NULL, -- currently unused
   `cancellationdate` date default NULL, -- the date this hold was cancelled
   `reservenotes` LONGTEXT, -- notes related to this hold
-  `priority` smallint(6) NOT NULL, -- where in the queue the patron sits
+  `priority` smallint(6) NOT NULL DEFAULT 1, -- where in the queue the patron sits
   `found` varchar(1) default NULL, -- a one letter code defining what the status is of the hold is after it has been confirmed
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this hold was last updated
   `itemnumber` int(11) default NULL, -- foreign key from the items table defining the specific item the patron has placed on hold or the item this hold was filled with
@@ -1797,7 +1797,7 @@ CREATE TABLE `old_reserves` ( -- this table holds all holds/reserves that have b
   `reminderdate` date default NULL, -- currently unused
   `cancellationdate` date default NULL, -- the date this hold was cancelled
   `reservenotes` LONGTEXT, -- notes related to this hold
-  `priority` smallint(6) NOT NULL, -- where in the queue the patron sits
+  `priority` smallint(6) NOT NULL DEFAULT 1, -- where in the queue the patron sits
   `found` varchar(1) default NULL, -- a one letter code defining what the status is of the hold is after it has been confirmed
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this hold was last updated
   `itemnumber` int(11) default NULL, -- foreign key from the items table defining the specific item the patron has placed on hold or the item this hold was filled with
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index a26f409609..f511d84dab 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -21109,7 +21109,7 @@ if( CheckVersion( $DBversion ) ) {
     |);
 
     $dbh->do(q|
-        ALTER TABLE reserves MODIFY priority SMALLINT(6) NOT NULL
+        ALTER TABLE reserves MODIFY priority SMALLINT(6) NOT NULL DEFAULT 1
     |);
 
     $dbh->do(q|
@@ -21117,7 +21117,7 @@ if( CheckVersion( $DBversion ) ) {
     |);
 
     $dbh->do(q|
-        ALTER TABLE old_reserves MODIFY priority SMALLINT(6) NOT NULL
+        ALTER TABLE old_reserves MODIFY priority SMALLINT(6) NOT NULL DEFAULT 1
     |);
 
     SetVersion( $DBversion );
-- 
2.20.1