Attachment 81280 Details for Bug 21682 – Bug 21682: Corrections for strict sql in stockrotationrotas

[patch] Bug 21682: Corrections for strict sql in stockrotationrotas

Bug-21682-Corrections-for-strict-sql-in-stockrotat.patch (text/plain), 2.34 KB, created by Martin Renvoize (ashimema) on 2018-10-26 10:59:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2018-10-26 10:59:48 UTC

Size: 2.34 KB

patch

obsolete

>From 9c9f694841b9739bddecd3821d80587e31195b8b Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 26 Oct 2018 11:55:54 +0100
>Subject: [PATCH] Bug 21682: Corrections for strict sql in stockrotationrotas
>
>Test Plan:
>1) Ensure you're database is prior to version 18.06.00.040
>2) Ensure 'strict_sql_modes' is enabled
>3) Run updatedatabase
>4) See no errors during upgrade
>5) Run a fresh install
>6) Note no errors during database installation
>---
> installer/data/mysql/kohastructure.sql | 4 ++--
> installer/data/mysql/updatedatabase.pl | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index 383ea48d1f..f96bcdf9f7 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -4247,9 +4247,9 @@ CREATE TABLE `circulation_rules` (
> --
> 
> CREATE TABLE IF NOT EXISTS stockrotationrotas (
>-    rota_id int(11) auto_increment,          -- Stockrotation rota ID
>+    rota_id int(11) auto_increment,         -- Stockrotation rota ID
>     title varchar(100) NOT NULL,            -- Title for this rota
>-    description text NOT NULL default '',   -- Description for this rota
>+    description text NOT NULL,              -- Description for this rota
>     cyclical tinyint(1) NOT NULL default 0, -- Should items on this rota keep cycling?
>     active tinyint(1) NOT NULL default 0,   -- Is this rota currently active?
>     PRIMARY KEY (`rota_id`)
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 460324b2b9..20366347cb 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -16569,7 +16569,7 @@ if( CheckVersion( $DBversion ) ) {
>           CREATE TABLE `stockrotationrotas` (
>             `rota_id` int(11) auto_increment,         -- Stockrotation rota ID
>             `title` varchar(100) NOT NULL,            -- Title for this rota
>-            `description` text NOT NULL default '',   -- Description for this rota
>+            `description` text NOT NULL,              -- Description for this rota
>             `cyclical` tinyint(1) NOT NULL default 0, -- Should items on this rota keep cycling?
>             `active` tinyint(1) NOT NULL default 0,   -- Is this rota currently active?
>             PRIMARY KEY (`rota_id`),
>-- 
>2.19.1

Actions: View | Diff | Splinter Review

Attachments on bug 21682: 81280 | 81347 | 81348 | 81525 | 81526 | 81527 | 81528 | 81529 | 81769 | 81770 | 81787 | 81788 | 81815