[ros-diffs] [dgoette] 409: set default collation, fixes mixed collations after convert

Author: dgoette
Date: Fri May  8 00:50:40 2009
New Revision: 409

URL: http://svn.reactos.org/svn/reactos?rev=409&view=rev
Log:
set default collation, fixes mixed collations after convert

Modified:
    branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql

Modified: branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/ro...
==============================================================================
--- branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql [iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql [iso-8859-1] Fri May  8 00:50:40 2009
@@ -156,13 +156,13 @@
 -- --------------------------------------------------------
 CREATE TABLE roscms_entries_areas (
   id bigint(20) unsigned NOT NULL auto_increment,
-  name varchar(30) NOT NULL,
-  name_short varchar(15) NOT NULL,
-  description varchar(255) NOT NULL,
+  name varchar(30) collate utf8_unicode_ci NOT NULL,
+  name_short varchar(15) collate utf8_unicode_ci NOT NULL,
+  description varchar(255) collate utf8_unicode_ci NOT NULL,
   PRIMARY KEY  (id),
   UNIQUE KEY name_short (name_short),
   UNIQUE KEY `name` (name)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

INSERT INTO roscms_entries_areas VALUES
 (1, 'Translate', 'translate', 'user can translate this entry to the lang he has set in his profile'),
@@ -187,7 +187,7 @@
   group_id bigint(20) unsigned NOT NULL COMMENT '->groups(id)',
   PRIMARY KEY  (id),
   UNIQUE KEY right_id (right_id,access_id,group_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

-- convert table
 INSERT INTO roscms_rel_acl
@@ -232,13 +232,13 @@
 -- --------------------------------------------------------
 CREATE TABLE roscms_area (
   id bigint(20) NOT NULL auto_increment,
-  `name` varchar(30) NOT NULL,
-  name_short varchar(18) NOT NULL,
-  description varchar(255) NOT NULL,
-  PRIMARY KEY  (id),
-  UNIQUE KEY `name` (`name`),
+  name varchar(30) collate utf8_unicode_ci NOT NULL,
+  name_short varchar(18) collate utf8_unicode_ci NOT NULL,
+  description varchar(255) collate utf8_unicode_ci NOT NULL,
+  PRIMARY KEY (id),
+  UNIQUE KEY name (name),
   UNIQUE KEY name_short (name_short)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

INSERT INTO roscms_area VALUES
 (1, 'System Tags', 'system_tags', 'Can the user modify/see system tags'),
@@ -288,7 +288,7 @@
   group_id bigint(20) NOT NULL,
   area_id bigint(20) NOT NULL,
   PRIMARY KEY  (group_id,area_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

INSERT INTO roscms_rel_groups_area
 SELECT DISTINCT g.id, a.id