Attachment 52037 Details for Bug 16664 – Bug 16664: fix loaded SQL for strictness

[patch] Bug 16664: fix loaded SQL for strictness

Bug-16664-fix-loaded-SQL-for-strictness.patch (text/plain), 1.94 KB, created by Robin Sheat on 2016-06-04 09:09:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robin Sheat

Created: 2016-06-04 09:09:16 UTC

Size: 1.94 KB

patch

obsolete

>From f1758766a72fb0bf5705cbd314eac5387edcc614 Mon Sep 17 00:00:00 2001
>From: Robin Sheat <robin@kallisti.net.nz>
>Date: Sat, 4 Jun 2016 11:07:58 +0200
>Subject: [PATCH] Bug 16664: fix loaded SQL for strictness
>
>There were some errors in the SQL structure that MySQL got upset at in
>strict mode. This lets the file load.
>---
> installer/data/mysql/kohastructure.sql | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index c5a3f4a..fa12121 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -69,7 +69,7 @@ CREATE TABLE `auth_subfield_structure` (
>   `linkid` tinyint(1) NOT NULL default 0,
>   `kohafield` varchar(45) NULL default '',
>   `frameworkcode` varchar(10) NOT NULL default '',
>-  `defaultvalue` TEXT DEFAULT '',
>+  `defaultvalue` TEXT,
>   PRIMARY KEY  (`authtypecode`,`tagfield`,`tagsubfield`),
>   KEY `tab` (`authtypecode`,`tab`),
>   CONSTRAINT `auth_subfield_structure_ibfk_1` FOREIGN KEY (`authtypecode`) REFERENCES `auth_types` (`authtypecode`) ON DELETE CASCADE ON UPDATE CASCADE
>@@ -2209,7 +2209,7 @@ CREATE TABLE `virtualshelves` ( -- information about lists (or virtual shelves)
>   `category` varchar(1) default NULL, -- type of list (private [1], public [2])
>   `sortfield` varchar(16) default 'title', -- the field this list is sorted on
>   `lastmodified` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- date and time the list was last modified
>-  `created_on` TIMESTAMP NOT NULL, -- creation time
>+  `created_on` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, -- creation time
>   `allow_add` tinyint(1) default 0, -- permission for adding entries to list
>   `allow_delete_own` tinyint(1) default 1, -- permission for deleting entries frm list that you added yourself
>   `allow_delete_other` tinyint(1) default 0, -- permission for deleting entries from list that another person added
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 16664: 52037 | 53119