From bfe312aa8179543b6c36f002019bdbc11e731295 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Fri, 20 Jul 2012 16:26:46 -0400 Subject: [PATCH] Collate as utf8_unicode_ci --- earwigbot/tasks/schema/afc_copyvios.sql | 14 +++++++++----- earwigbot/tasks/schema/afc_history.sql | 10 +++++++--- earwigbot/tasks/schema/afc_statistics.sql | 30 +++++++++++++++++------------- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/earwigbot/tasks/schema/afc_copyvios.sql b/earwigbot/tasks/schema/afc_copyvios.sql index 344346a..37a6729 100644 --- a/earwigbot/tasks/schema/afc_copyvios.sql +++ b/earwigbot/tasks/schema/afc_copyvios.sql @@ -4,6 +4,10 @@ -- ------------------------------------------------------ -- Server version 5.1.59 +CREATE DATABASE `u_earwig_afc_copyvios` + DEFAULT CHARACTER SET utf8 + DEFAULT COLLATE utf8_unicode_ci; + -- -- Table structure for table `cache` -- @@ -11,13 +15,13 @@ DROP TABLE IF EXISTS `cache`; CREATE TABLE `cache` ( `cache_id` int(10) unsigned NOT NULL, - `cache_hash` char(64) DEFAULT NULL, - `cache_url` varchar(512) DEFAULT NULL, + `cache_hash` char(64) COLLATE utf8_unicode_ci DEFAULT NULL, + `cache_url` varchar(512) COLLATE utf8_unicode_ci DEFAULT NULL, `cache_time` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', `cache_queries` int(4) DEFAULT NULL, `cache_process_time` float DEFAULT NULL, PRIMARY KEY (`cache_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- -- Table structure for table `processed` @@ -27,6 +31,6 @@ DROP TABLE IF EXISTS `processed`; CREATE TABLE `processed` ( `page_id` int(10) unsigned NOT NULL, PRIMARY KEY (`page_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; --- Dump completed on 2012-07-20 18:04:20 +-- Dump completed on 2012-07-20 20:21:00 diff --git a/earwigbot/tasks/schema/afc_history.sql b/earwigbot/tasks/schema/afc_history.sql index 8c0d7b7..4fa20fd 100644 --- a/earwigbot/tasks/schema/afc_history.sql +++ b/earwigbot/tasks/schema/afc_history.sql @@ -4,6 +4,10 @@ -- ------------------------------------------------------ -- Server version 5.1.59 +CREATE DATABASE `u_earwig_afc_history` + DEFAULT CHARACTER SET utf8 + DEFAULT COLLATE utf8_unicode_ci; + -- -- Table structure for table `page` -- @@ -11,9 +15,9 @@ DROP TABLE IF EXISTS `page`; CREATE TABLE `page` ( `page_id` int(10) unsigned NOT NULL, - `page_date` varchar(50) DEFAULT NULL, + `page_date` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, `page_status` tinyint(3) unsigned DEFAULT NULL, PRIMARY KEY (`page_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; --- Dump completed on 2012-07-20 18:03:11 +-- Dump completed on 2012-07-20 20:20:39 diff --git a/earwigbot/tasks/schema/afc_statistics.sql b/earwigbot/tasks/schema/afc_statistics.sql index 6c5465a..6e6e2dd 100644 --- a/earwigbot/tasks/schema/afc_statistics.sql +++ b/earwigbot/tasks/schema/afc_statistics.sql @@ -4,6 +4,10 @@ -- ------------------------------------------------------ -- Server version 5.1.59 +CREATE DATABASE `u_earwig_afc_statistics` + DEFAULT CHARACTER SET utf8 + DEFAULT COLLATE utf8_unicode_ci; + -- -- Table structure for table `chart` -- @@ -11,10 +15,10 @@ DROP TABLE IF EXISTS `chart`; CREATE TABLE `chart` ( `chart_id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT, - `chart_title` varchar(255) DEFAULT NULL, - `chart_special_title` varchar(255) DEFAULT NULL, + `chart_title` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, + `chart_special_title` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`chart_id`) -) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- -- Dumping data for table `chart` @@ -38,7 +42,7 @@ CREATE TABLE `row` ( `row_id` int(10) unsigned NOT NULL, `row_chart` tinyint(3) unsigned DEFAULT NULL, PRIMARY KEY (`row_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- -- Table structure for table `page` @@ -47,18 +51,18 @@ CREATE TABLE `row` ( DROP TABLE IF EXISTS `page`; CREATE TABLE `page` ( `page_id` int(10) unsigned NOT NULL, - `page_status` varchar(16) DEFAULT NULL, - `page_title` varchar(512) DEFAULT NULL, - `page_short` varchar(512) DEFAULT NULL, - `page_size` varchar(16) DEFAULT NULL, - `page_notes` tinytext, - `page_modify_user` varchar(255) DEFAULT NULL, + `page_status` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL, + `page_title` varchar(512) COLLATE utf8_unicode_ci DEFAULT NULL, + `page_short` varchar(512) COLLATE utf8_unicode_ci DEFAULT NULL, + `page_size` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL, + `page_notes` tinytext COLLATE utf8_unicode_ci, + `page_modify_user` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `page_modify_time` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', `page_modify_oldid` int(10) unsigned DEFAULT NULL, - `page_special_user` varchar(255) DEFAULT NULL, + `page_special_user` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `page_special_time` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', `page_special_oldid` int(10) unsigned DEFAULT NULL, PRIMARY KEY (`page_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; --- Dump completed on 2012-07-20 17:57:36 +-- Dump completed on 2012-07-20 20:25:10