Attachment 35250 Details for Bug 11944 – Bug 11944: (follow-up) Convert DB tables to utf8_unicode_ci

[patch] Bug 11944: (follow-up) Convert DB tables to utf8_unicode_ci

Bug-11944-follow-up-Convert-DB-tables-to-utf8unico.patch (text/plain), 2.60 KB, created by Jonathan Druart on 2015-01-14 15:45:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-01-14 15:45:22 UTC

Size: 2.60 KB

patch

obsolete

>From 93dc76069aa81407a83076b9f30120a366f5a254 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Fri, 29 Aug 2014 17:38:33 +0200
>Subject: [PATCH] Bug 11944: (follow-up) Convert DB tables to utf8_unicode_ci
>
>Some lines didn't match the regex I used!
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
>---
> installer/data/mysql/kohastructure.sql | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index 9af37ac..facde44 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -502,7 +502,7 @@ CREATE TABLE collections (
>   colDesc text NOT NULL,
>   colBranchcode varchar(10) DEFAULT NULL, -- 'branchcode for branch where item should be held.'
>   PRIMARY KEY (colId)
>-) ENGINE=InnoDB DEFAULT CHARACTER SET utf8;
>+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
> 
> --
> -- Constraints for table `collections`
>@@ -519,7 +519,7 @@ CREATE TABLE collections_tracking (
>   colId integer(11) NOT NULL DEFAULT 0 comment 'collections.colId',
>   itemnumber integer(11) NOT NULL DEFAULT 0 comment 'items.itemnumber',
>   PRIMARY KEY (collections_tracking_id)
>-) ENGINE=InnoDB DEFAULT CHARACTER SET utf8;
>+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
> 
> --
> -- Table structure for table `courses`
>@@ -983,7 +983,7 @@ CREATE TABLE `export_format` (
>   `encoding` varchar(255) NOT NULL,
>   `type` varchar(255) DEFAULT 'marc',
>   PRIMARY KEY  (`export_format_id`)
>-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Used for CSV export';
>+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Used for CSV export';
> 
> 
> --
>@@ -1948,7 +1948,7 @@ CREATE TABLE IF NOT EXISTS `search_history` ( -- patron's opac search history
>   `time` timestamp NOT NULL default CURRENT_TIMESTAMP, -- the date and time the search was run
>   KEY `userid` (`userid`),
>   KEY `sessionid` (`sessionid`)
>-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Opac search history results';
>+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Opac search history results';
> 
> 
> --
>@@ -3031,7 +3031,7 @@ CREATE TABLE `aqcontract` (
>   PRIMARY KEY  (`contractnumber`),
>   CONSTRAINT `booksellerid_fk1` FOREIGN KEY (`booksellerid`)
>        REFERENCES `aqbooksellers` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
>-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
>+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
> 
> --
> -- Table structure for table `aqorders`
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 11944: 26364 | 26365 | 26366 | 26367 | 26368 | 26369 | 26370 | 26371 | 26372 | 26407 | 26408 | 26409 | 26737 | 26738 | 26739 | 26740 | 26741 | 26742 | 26743 | 26744 | 26745 | 26746 | 26747 | 26748 | 26794 | 26857 | 26858 | 26859 | 26860 | 26861 | 26862 | 26863 | 26864 | 26865 | 26866 | 26867 | 26868 | 26869 | 26870 | 26871 | 26895 | 26921 | 27021 | 27080 | 27094 | 27158 | 27159 | 27161 | 27193 | 27194 | 27195 | 27196 | 27198 | 27199 | 27200 | 27201 | 27202 | 27203 | 27204 | 27205 | 27206 | 27207 | 27208 | 27209 | 27210 | 27211 | 27212 | 27213 | 27214 | 27215 | 27216 | 27585 | 27586 | 27587 | 27588 | 27589 | 27590 | 27591 | 27592 | 27593 | 27594 | 27595 | 27596 | 27597 | 27598 | 27599 | 27600 | 27601 | 27602 | 27603 | 27880 | 27881 | 27882 | 27883 | 27884 | 27885 | 27886 | 27887 | 27888 | 27889 | 27890 | 27891 | 27892 | 27893 | 27894 | 27895 | 27896 | 27897 | 27898 | 28046 | 28047 | 28048 | 28049 | 28050 | 28051 | 28052 | 28053 | 28054 | 28055 | 28056 | 28057 | 28058 | 28059 | 28060 | 28061 | 28062 | 28063 | 28064 | 28065 | 28066 | 28097 | 28245 | 28246 | 28247 | 28248 | 28249 | 28250 | 28251 | 28252 | 28253 | 28732 | 29981 | 29982 | 29983 | 29984 | 29985 | 29986 | 29987 | 29988 | 29989 | 29990 | 29991 | 29992 | 29993 | 29994 | 29995 | 29996 | 29997 | 29998 | 29999 | 30000 | 30001 | 30002 | 30003 | 30004 | 30005 | 30006 | 30012 | 30016 | 30945 | 31299 | 35223 | 35224 | 35225 | 35226 | 35227 | 35228 | 35229 | 35230 | 35231 | 35232 | 35233 | 35234 | 35235 | 35236 | 35237 | 35238 | 35239 | 35240 | 35241 | 35242 | 35243 | 35244 | 35245 | 35246 | 35247 | 35248 | 35249 | 35250 | 35251 | 35252 | 35253