Drizzle

Merge lp:~linuxjedi/drizzle/drizzle-bug-634374-embedded-innodb into lp:~drizzle-trunk/drizzle/development

  1. drizzle-bug-634374-embedded-innodb
  2. Merge into development
Proposed by Andrew Hutchings
Status: Merged
Approved by: Lee Bieber
Approved revision: 1756
Merged at revision: 1757
Proposed branch: lp:~linuxjedi/drizzle/drizzle-bug-634374-embedded-innodb
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 288 lines (+42/-39)
8 files modified
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/type_blob.result (+3/-3)
plugin/schema_dictionary/tests/r/show.result (+20/-20)
plugin/show_dictionary/show_columns.cc (+8/-5)
plugin/show_dictionary/show_columns.h (+1/-1)
tests/r/type_blob.result (+3/-3)
tests/r/type_datetime.result (+2/-2)
tests/r/type_ranges.result (+3/-3)
tests/r/union.result (+2/-2)
To merge this branch: bzr merge lp:~linuxjedi/drizzle/drizzle-bug-634374-embedded-innodb
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Drizzle Merge Team Pending
Review via email: mp+35175@code.launchpad.net

Description of the change

Fix embedded test which broken when merging drizzle-bug-634374

To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/type_blob.result'
2--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/type_blob.result 2010-09-08 10:02:37 +0000
3+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/type_blob.result 2010-09-10 22:17:06 +0000
4@@ -3,10 +3,10 @@
5 show columns from t1;
6 Field Type Null Default Default_is_NULL On_Update
7 a BLOB YES YES
8-b BLOB YES YES
9+b TEXT YES YES
10 c BLOB YES YES
11-d BLOB YES YES
12-e BLOB YES YES
13+d TEXT YES YES
14+e TEXT YES YES
15 CREATE TABLE t2 (a varchar(255), b blob, c blob);
16 CREATE TABLE t4 (c varchar(16383) not null);
17 show columns from t2;
18
19=== modified file 'plugin/schema_dictionary/tests/r/show.result'
20--- plugin/schema_dictionary/tests/r/show.result 2010-09-02 18:35:05 +0000
21+++ plugin/schema_dictionary/tests/r/show.result 2010-09-10 22:17:06 +0000
22@@ -677,27 +677,27 @@
23 show columns from container;
24 Field Type Null Default Default_is_NULL On_Update
25 container_id INTEGER NO NO
26-context BLOB YES YES
27+context TEXT YES YES
28 parent_container INTEGER YES YES
29 show columns from document;
30 Field Type Null Default Default_is_NULL On_Update
31 document_id INTEGER NO NO
32-doctext BLOB YES YES
33+doctext TEXT YES YES
34 show columns from genstats_attributes;
35 Field Type Null Default Default_is_NULL On_Update
36 genstats_attributes_id INTEGER NO 0 NO
37-predicates BLOB NO NO
38-attributes BLOB NO NO
39+predicates TEXT NO NO
40+attributes TEXT NO NO
41 show columns from htmlcode;
42 Field Type Null Default Default_is_NULL On_Update
43 htmlcode_id INTEGER NO NO
44-code BLOB YES YES
45+code TEXT YES YES
46 show columns from htmlpage;
47 Field Type Null Default Default_is_NULL On_Update
48 htmlpage_id INTEGER NO NO
49 pagetype_nodetype INTEGER YES YES
50 displaytype VARCHAR YES YES
51-page BLOB YES YES
52+page TEXT YES YES
53 parent_container INTEGER YES YES
54 ownedby_theme INTEGER NO 0 NO
55 permissionneeded VARCHAR NO r NO
56@@ -708,17 +708,17 @@
57 src VARCHAR YES YES
58 alt VARCHAR YES YES
59 thumbsrc VARCHAR YES YES
60-description BLOB YES YES
61+description TEXT YES YES
62 show columns from javascript;
63 Field Type Null Default Default_is_NULL On_Update
64 javascript_id INTEGER NO 0 NO
65-code BLOB NO NO
66-comment BLOB NO NO
67+code TEXT NO NO
68+comment TEXT NO NO
69 dynamic INTEGER NO 0 NO
70 show columns from knowledge_item;
71 Field Type Null Default Default_is_NULL On_Update
72 knowledge_item_id INTEGER NO 0 NO
73-item BLOB NO NO
74+item TEXT NO NO
75 question INTEGER NO 0 NO
76 show columns from links;
77 Field Type Null Default Default_is_NULL On_Update
78@@ -763,8 +763,8 @@
79 show columns from nodelet;
80 Field Type Null Default Default_is_NULL On_Update
81 nodelet_id INTEGER NO NO
82-nltext BLOB YES YES
83-nlcode BLOB YES YES
84+nltext TEXT YES YES
85+nlcode TEXT YES YES
86 nlgoto INTEGER YES YES
87 parent_container INTEGER YES YES
88 lastupdate INTEGER NO 0 NO
89@@ -774,7 +774,7 @@
90 Field Type Null Default Default_is_NULL On_Update
91 nodemethod_id INTEGER NO 0 NO
92 supports_nodetype INTEGER NO 0 NO
93-code BLOB NO NO
94+code TEXT NO NO
95 show columns from nodetype;
96 Field Type Null Default Default_is_NULL On_Update
97 nodetype_id INTEGER NO NO
98@@ -797,12 +797,12 @@
99 show columns from project;
100 Field Type Null Default Default_is_NULL On_Update
101 project_id INTEGER NO 0 NO
102-description BLOB NO NO
103+description TEXT NO NO
104 last_update TIMESTAMP NO CURRENT_TIMESTAMP NO CURRENT_TIMESTAMP
105 short_description VARCHAR NO NO
106 url_cvs VARCHAR NO NO
107 url_faq VARCHAR NO NO
108-long_description BLOB NO NO
109+long_description TEXT NO NO
110 show columns from project_document;
111 Field Type Null Default Default_is_NULL On_Update
112 project_document_id INTEGER NO 0 NO
113@@ -814,16 +814,16 @@
114 project_id INTEGER NO 0 NO
115 rank INTEGER NO 0 NO
116 orderby INTEGER NO 0 NO
117-description BLOB NO NO
118+description TEXT NO NO
119 show columns from redirects;
120 Field Type Null Default Default_is_NULL On_Update
121 redirects_id INTEGER NO 0 NO
122-url BLOB NO NO
123+url TEXT NO NO
124 show columns from releases;
125 Field Type Null Default Default_is_NULL On_Update
126 releases_id INTEGER NO 0 NO
127 branch_id INTEGER NO 0 NO
128-description BLOB YES YES
129+description TEXT YES YES
130 url_targz VARCHAR NO NO
131 url_osx VARCHAR NO NO
132 url_rpm VARCHAR NO NO
133@@ -836,12 +836,12 @@
134 node_id INTEGER NO 0 NO
135 inside_workspace INTEGER NO 0 NO
136 revision_id INTEGER NO 0 NO
137-xml BLOB NO NO
138+xml TEXT NO NO
139 tstamp TIMESTAMP NO CURRENT_TIMESTAMP NO CURRENT_TIMESTAMP
140 show columns from setting;
141 Field Type Null Default Default_is_NULL On_Update
142 setting_id INTEGER NO NO
143-vars BLOB NO NO
144+vars TEXT NO NO
145 show columns from symlink;
146 Field Type Null Default Default_is_NULL On_Update
147 symlink_id INTEGER NO 0 NO
148
149=== modified file 'plugin/show_dictionary/show_columns.cc'
150--- plugin/show_dictionary/show_columns.cc 2010-07-30 19:21:23 +0000
151+++ plugin/show_dictionary/show_columns.cc 2010-09-10 22:17:06 +0000
152@@ -21,14 +21,17 @@
153 #include "config.h"
154 #include "plugin/show_dictionary/dictionary.h"
155 #include "drizzled/identifier.h"
156-
157+#include <string>
158
159 using namespace std;
160 using namespace drizzled;
161
162 static const string VARCHAR("VARCHAR");
163+/* VARBINARY already defined elsewhere */
164+static const string VARBIN("VARBINARY");
165 static const string DOUBLE("DOUBLE");
166 static const string BLOB("BLOB");
167+static const string TEXT("TEXT");
168 static const string ENUM("ENUM");
169 static const string INTEGER("INTEGER");
170 static const string BIGINT("BIGINT");
171@@ -112,19 +115,19 @@
172 return true;
173 }
174
175-void ShowColumns::Generator::pushType(message::Table::Field::FieldType type)
176+void ShowColumns::Generator::pushType(message::Table::Field::FieldType type, const string collation)
177 {
178 switch (type)
179 {
180 default:
181 case message::Table::Field::VARCHAR:
182- push(VARCHAR);
183+ push(collation.compare("binary") ? VARCHAR : VARBIN);
184 break;
185 case message::Table::Field::DOUBLE:
186 push(DOUBLE);
187 break;
188 case message::Table::Field::BLOB:
189- push(BLOB);
190+ push(collation.compare("binary") ? TEXT : BLOB);
191 break;
192 case message::Table::Field::ENUM:
193 push(ENUM);
194@@ -157,7 +160,7 @@
195 push(column.name());
196
197 /* Type */
198- pushType(column.type());
199+ pushType(column.type(), column.string_options().collation());
200
201 /* Null */
202 push(column.constraints().is_nullable());
203
204=== modified file 'plugin/show_dictionary/show_columns.h'
205--- plugin/show_dictionary/show_columns.h 2010-03-31 23:39:12 +0000
206+++ plugin/show_dictionary/show_columns.h 2010-09-10 22:17:06 +0000
207@@ -55,7 +55,7 @@
208 return table_name;
209 }
210
211- void pushType(drizzled::message::Table::Field::FieldType type);
212+ void pushType(drizzled::message::Table::Field::FieldType type, const std::string collation);
213
214 void fill();
215
216
217=== modified file 'tests/r/type_blob.result'
218--- tests/r/type_blob.result 2010-09-02 18:35:05 +0000
219+++ tests/r/type_blob.result 2010-09-10 22:17:06 +0000
220@@ -3,10 +3,10 @@
221 show columns from t1;
222 Field Type Null Default Default_is_NULL On_Update
223 a BLOB YES YES
224-b BLOB YES YES
225+b TEXT YES YES
226 c BLOB YES YES
227-d BLOB YES YES
228-e BLOB YES YES
229+d TEXT YES YES
230+e TEXT YES YES
231 CREATE TABLE t2 (a varchar(255), b blob, c blob);
232 CREATE TABLE t4 (c varchar(16383) not null);
233 show columns from t2;
234
235=== modified file 'tests/r/type_datetime.result'
236--- tests/r/type_datetime.result 2010-09-02 18:35:05 +0000
237+++ tests/r/type_datetime.result 2010-09-10 22:17:06 +0000
238@@ -354,11 +354,11 @@
239 create table t5 as select coalesce(f1,f3) as f4 from t1;
240 desc t5;
241 Field Type Null Default Default_is_NULL On_Update
242-f4 VARCHAR YES YES
243+f4 VARBINARY YES YES
244 create table t6 as select coalesce(f2,f3) as f4 from t1;
245 desc t6;
246 Field Type Null Default Default_is_NULL On_Update
247-f4 VARCHAR YES YES
248+f4 VARBINARY YES YES
249 create table t7 as select coalesce(makedate(1997,1),f2) as f4 from t1;
250 desc t7;
251 Field Type Null Default Default_is_NULL On_Update
252
253=== modified file 'tests/r/type_ranges.result'
254--- tests/r/type_ranges.result 2010-08-10 22:19:02 +0000
255+++ tests/r/type_ranges.result 2010-09-10 22:17:06 +0000
256@@ -190,11 +190,11 @@
257 t1 INTEGER NO NO
258 t2 VARCHAR NO NO
259 t3 VARCHAR YES YES
260-t4 VARCHAR YES YES
261-t5 BLOB YES YES
262+t4 VARBINARY YES YES
263+t5 TEXT YES YES
264 t6 BLOB YES YES
265 t7 VARCHAR NO NO
266-t8 VARCHAR YES YES
267+t8 VARBINARY YES YES
268 select t1,t2,length(t3),length(t4),length(t5),length(t6),t7,t8 from t2;
269 t1 t2 length(t3) length(t4) length(t5) length(t6) t7 t8
270 1 a 256 256 4096 4096
271
272=== modified file 'tests/r/union.result'
273--- tests/r/union.result 2010-09-02 18:35:05 +0000
274+++ tests/r/union.result 2010-09-10 22:17:06 +0000
275@@ -1441,11 +1441,11 @@
276 CREATE TABLE t4 SELECT NULL;
277 DESC t4;
278 Field Type Null Default Default_is_NULL On_Update
279-NULL VARCHAR YES YES
280+NULL VARBINARY YES YES
281 CREATE TABLE t5 SELECT NULL UNION SELECT NULL;
282 DESC t5;
283 Field Type Null Default Default_is_NULL On_Update
284-NULL VARCHAR YES YES
285+NULL VARBINARY YES YES
286 CREATE TABLE t6
287 SELECT * FROM (SELECT * FROM (SELECT NULL)a) b UNION SELECT a FROM t1;
288 DESC t6;