Browse Source

Fix UTF8 to handle 4 byte sequences in the tests

Maurits van der Schee 8 years ago
parent
commit
239a8e61a2
1 changed files with 14 additions and 14 deletions
  1. 14
    14
      tests/blog_mysql.sql

+ 14
- 14
tests/blog_mysql.sql View File

@@ -11,7 +11,7 @@ CREATE TABLE `categories` (
11 11
   `name` varchar(255) NOT NULL,
12 12
   `icon` blob NULL,
13 13
   PRIMARY KEY (`id`)
14
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
14
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
15 15
 
16 16
 INSERT INTO `categories` (`id`, `name`, `icon`) VALUES
17 17
 (1,	'announcement',	NULL),
@@ -21,11 +21,11 @@ DROP TABLE IF EXISTS `comments`;
21 21
 CREATE TABLE `comments` (
22 22
   `id` int(11) NOT NULL AUTO_INCREMENT,
23 23
   `post_id` int(11) NOT NULL,
24
-  `message` varchar(255) COLLATE utf8_general_ci NOT NULL,
24
+  `message` varchar(255) NOT NULL,
25 25
   PRIMARY KEY (`id`),
26 26
   KEY `post_id` (`post_id`),
27 27
   CONSTRAINT `comments_ibfk_1` FOREIGN KEY (`post_id`) REFERENCES `posts` (`id`)
28
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
28
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
29 29
 
30 30
 INSERT INTO `comments` (`id`, `post_id`, `message`) VALUES
31 31
 (1,	1,	'great'),
@@ -38,13 +38,13 @@ CREATE TABLE `posts` (
38 38
   `id` int(11) NOT NULL AUTO_INCREMENT,
39 39
   `user_id` int(11) NOT NULL,
40 40
   `category_id` int(11) NOT NULL,
41
-  `content` varchar(255) COLLATE utf8_general_ci NOT NULL,
41
+  `content` varchar(255) NOT NULL,
42 42
   PRIMARY KEY (`id`),
43 43
   KEY `category_id` (`category_id`),
44 44
   KEY `user_id` (`user_id`),
45 45
   CONSTRAINT `posts_ibfk_3` FOREIGN KEY (`category_id`) REFERENCES `categories` (`id`),
46 46
   CONSTRAINT `posts_ibfk_4` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
47
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
47
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
48 48
 
49 49
 INSERT INTO `posts` (`id`, `user_id`, `category_id`, `content`) VALUES
50 50
 (1,	1,	1,	'blog started'),
@@ -60,7 +60,7 @@ CREATE TABLE `post_tags` (
60 60
   KEY `tag_id` (`tag_id`),
61 61
   CONSTRAINT `post_tags_ibfk_1` FOREIGN KEY (`post_id`) REFERENCES `posts` (`id`),
62 62
   CONSTRAINT `post_tags_ibfk_2` FOREIGN KEY (`tag_id`) REFERENCES `tags` (`id`)
63
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
63
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
64 64
 
65 65
 INSERT INTO `post_tags` (`id`, `post_id`, `tag_id`) VALUES
66 66
 (1,	1,	1),
@@ -71,9 +71,9 @@ INSERT INTO `post_tags` (`id`, `post_id`, `tag_id`) VALUES
71 71
 DROP TABLE IF EXISTS `tags`;
72 72
 CREATE TABLE `tags` (
73 73
   `id` int(11) NOT NULL AUTO_INCREMENT,
74
-  `name` varchar(255) COLLATE utf8_general_ci NOT NULL,
74
+  `name` varchar(255) NOT NULL,
75 75
   PRIMARY KEY (`id`)
76
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
76
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
77 77
 
78 78
 INSERT INTO `tags` (`id`, `name`) VALUES
79 79
 (1,	'funny'),
@@ -82,11 +82,11 @@ INSERT INTO `tags` (`id`, `name`) VALUES
82 82
 DROP TABLE IF EXISTS `users`;
83 83
 CREATE TABLE `users` (
84 84
   `id` int(11) NOT NULL AUTO_INCREMENT,
85
-  `username` varchar(255) COLLATE utf8_general_ci NOT NULL,
86
-  `password` varchar(255) COLLATE utf8_general_ci NOT NULL,
85
+  `username` varchar(255) NOT NULL,
86
+  `password` varchar(255) NOT NULL,
87 87
   `location` point NULL,
88 88
   PRIMARY KEY (`id`)
89
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
89
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
90 90
 
91 91
 INSERT INTO `users` (`id`, `username`, `password`, `location`) VALUES
92 92
 (1,	'user1',	'pass1', null),
@@ -98,7 +98,7 @@ CREATE TABLE `countries` (
98 98
   `name` varchar(255) NOT NULL,
99 99
   `shape` polygon NOT NULL,
100 100
   PRIMARY KEY (`id`)
101
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
101
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
102 102
 
103 103
 INSERT INTO `countries` (`id`, `name`, `shape`) VALUES
104 104
 (1,	'Left',	ST_GeomFromText('POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))')),
@@ -110,7 +110,7 @@ CREATE TABLE `events` (
110 110
   `name` varchar(255) NOT NULL,
111 111
   `datetime` datetime(3) NOT NULL,
112 112
   PRIMARY KEY (`id`)
113
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
113
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
114 114
 
115 115
 INSERT INTO `events` (`id`, `name`, `datetime`) VALUES
116 116
 (1,	'Launch', '2016-01-01 13:01:01.111');
@@ -124,7 +124,7 @@ CREATE TABLE `products` (
124 124
   `name` varchar(255) NOT NULL,
125 125
   `price` decimal(10,2) NOT NULL,
126 126
   PRIMARY KEY (`id`)
127
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
127
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
128 128
 
129 129
 INSERT INTO `products` (`id`, `name`, `price`) VALUES
130 130
 (1,	'Calculator', '23.01');

Loading…
Cancel
Save