From 3f63352bcf05dc954ac04cca39f01ba9ca8bad04 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Fri, 8 Sep 2017 12:56:49 -0400
Subject: [PATCH] Bug 17047 [QA Followup] - Fix up database schema change, add
 to kohastructure.sql

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 .../data/mysql/atomicupdate/mana_01-add_mana_id_in_subscription.sql   | 4 ++--
 installer/data/mysql/kohastructure.sql                                | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/atomicupdate/mana_01-add_mana_id_in_subscription.sql b/installer/data/mysql/atomicupdate/mana_01-add_mana_id_in_subscription.sql
index 66c23ac..a7443db 100644
--- a/installer/data/mysql/atomicupdate/mana_01-add_mana_id_in_subscription.sql
+++ b/installer/data/mysql/atomicupdate/mana_01-add_mana_id_in_subscription.sql
@@ -1,2 +1,2 @@
-ALTER TABLE subscription ADD mana_id int(11);
-ALTER TABLE saved_sql ADD mana_id int(11);
+ALTER TABLE subscription ADD mana_id int(11) NULL DEFAULT NULL;
+ALTER TABLE saved_sql ADD mana_id int(11) NULL DEFAULT NULL;
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index e227125..a264f9e 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1464,6 +1464,7 @@ CREATE TABLE saved_sql ( -- saved sql reports
     report_area varchar(6) default NULL,
     report_group varchar(80) default NULL,
     report_subgroup varchar(80) default NULL,
+    `mana_id` int(11) NULL DEFAULT NULL,
    PRIMARY KEY  (`id`),
    KEY sql_area_group_idx (report_group, report_subgroup),
    KEY boridx (`borrowernumber`)
@@ -2121,6 +2122,7 @@ CREATE TABLE `subscription` ( -- information related to the subscription
   `reneweddate` date default NULL, -- date of last renewal for the subscription
   `itemtype` VARCHAR( 10 ) NULL,
   `previousitemtype` VARCHAR( 10 ) NULL,
+  `mana_id` int(11) NULL DEFAULT NULL,
   PRIMARY KEY  (`subscriptionid`),
   CONSTRAINT subscription_ibfk_1 FOREIGN KEY (periodicity) REFERENCES subscription_frequencies (id) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT subscription_ibfk_2 FOREIGN KEY (numberpattern) REFERENCES subscription_numberpatterns (id) ON DELETE SET NULL ON UPDATE CASCADE
-- 
2.10.2