Drizzle Client & Protocol Library

Merge lp:~linuxjedi/libdrizzle/5.1-query into lp:libdrizzle

  1. 5.1-query
  2. Merge into libdrizzle-redux
Proposed by Andrew Hutchings
Status: Merged
Approved by: Andrew Hutchings
Approved revision: 86
Merged at revision: 86
Proposed branch: lp:~linuxjedi/libdrizzle/5.1-query
Merge into: lp:libdrizzle
Diff against target: 486 lines (+57/-87)
14 files modified
docs/api/query.rst (+1/-11)
docs/examples/buffered.rst (+2/-2)
docs/examples/unbuffered.rst (+2/-2)
libdrizzle-5.1/query.h (+0/-8)
libdrizzle/binlog.cc (+1/-1)
libdrizzle/query.cc (+2/-14)
tests/unit/column.c (+7/-7)
tests/unit/connect.c (+2/-2)
tests/unit/insert_id.c (+7/-7)
tests/unit/query.c (+7/-7)
tests/unit/row.c (+7/-7)
tests/unit/statement.c (+6/-6)
tests/unit/statement_char.c (+6/-6)
tests/unit/unbuffered_query.c (+7/-7)
To merge this branch: bzr merge lp:~linuxjedi/libdrizzle/5.1-query
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+142799@code.launchpad.net

Description of the change

Removes drizzle_query_str and make drizzle_query with a 0 string length do the same thing.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/api/query.rst'
2--- docs/api/query.rst 2013-01-05 10:27:32 +0000
3+++ docs/api/query.rst 2013-01-10 22:17:22 +0000
4@@ -27,17 +27,7 @@
5
6 :param con: A connection object
7 :param query: The query to execute
8- :param size: The length of the query string
9- :param ret_ptr: A pointer to a :c:type:`drizzle_return_t` to store the return status into
10- :returns: A newly allocated result object
11-
12-.. c:function:: drizzle_result_st* drizzle_query_str(drizzle_st *con, const char *query, drizzle_return_t *ret_ptr)
13-
14- Executes a query using :c:func:`strlen` to calculate the length of the query
15- string and returns a newly allocated result struct
16-
17- :param con: A connection object
18- :param query: The query to execute
19+ :param size: The length of the query string, if set to 0 then :c:func:`strlen` is used to calculate the length
20 :param ret_ptr: A pointer to a :c:type:`drizzle_return_t` to store the return status into
21 :returns: A newly allocated result object
22
23
24=== modified file 'docs/examples/buffered.rst'
25--- docs/examples/buffered.rst 2012-12-24 10:20:04 +0000
26+++ docs/examples/buffered.rst 2013-01-10 22:17:22 +0000
27@@ -4,7 +4,7 @@
28 Introduction
29 ------------
30
31-In this example :c:func:`drizzle_query_str` is used to send a select query to a
32+In this example :c:func:`drizzle_query` is used to send a select query to a
33 MySQL server. The whole result set is then retrieved and stored in memory
34 using :c:func:`drizzle_result_buffer`.
35
36@@ -49,7 +49,7 @@
37 return EXIT_FAILURE;
38 }
39
40- result= drizzle_query_str(con, "select * from libdrizzle.t1", &ret);
41+ result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
42 if (ret != DRIZZLE_RETURN_OK)
43 {
44 printf("Select failure\n");
45
46=== modified file 'docs/examples/unbuffered.rst'
47--- docs/examples/unbuffered.rst 2012-12-24 10:20:04 +0000
48+++ docs/examples/unbuffered.rst 2013-01-10 22:17:22 +0000
49@@ -4,7 +4,7 @@
50 Introduction
51 ------------
52
53-In this example :c:func:`drizzle_query_str` is used to send a select query to a
54+In this example :c:func:`drizzle_query` is used to send a select query to a
55 MySQL server. The first thing that is sent back in the results is a list of
56 columns, so this list needs to be retieved. The simplist way of doing this is
57 to buffer the column data using :c:func:`drizzle_column_buffer`.
58@@ -51,7 +51,7 @@
59 return EXIT_FAILURE;
60 }
61
62- result= drizzle_query_str(con, "select * from libdrizzle.t1", &ret);
63+ result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
64 if (ret != DRIZZLE_RETURN_OK)
65 {
66 printf("Select failure\n");
67
68=== modified file 'libdrizzle-5.1/query.h'
69--- libdrizzle-5.1/query.h 2013-01-05 10:27:32 +0000
70+++ libdrizzle-5.1/query.h 2013-01-10 22:17:22 +0000
71@@ -73,14 +73,6 @@
72 const char *query, size_t size,
73 drizzle_return_t *ret_ptr);
74
75-/**
76- * Send query to server, using strlen to get the size of query buffer..
77- */
78-DRIZZLE_API
79-drizzle_result_st *drizzle_query_str(drizzle_st *con,
80- const char *query,
81- drizzle_return_t *ret_ptr);
82-
83 /*
84 * Escape a string or encode a string in hexadecimal. The return value is the
85 * size of the output string in to.
86
87=== modified file 'libdrizzle/binlog.cc'
88--- libdrizzle/binlog.cc 2013-01-05 15:56:07 +0000
89+++ libdrizzle/binlog.cc 2013-01-10 22:17:22 +0000
90@@ -52,7 +52,7 @@
91 drizzle_result_st *result;
92
93 // Hack in 5.6 to say that client support checksums
94- result= drizzle_query_str(con, "SET @master_binlog_checksum='NONE'", ret_ptr);
95+ result= drizzle_query(con, "SET @master_binlog_checksum='NONE'", 0, ret_ptr);
96 drizzle_result_free(result);
97 if (*ret_ptr != DRIZZLE_RETURN_OK)
98 {
99
100=== modified file 'libdrizzle/query.cc'
101--- libdrizzle/query.cc 2013-01-05 15:56:07 +0000
102+++ libdrizzle/query.cc 2013-01-10 22:17:22 +0000
103@@ -48,26 +48,14 @@
104 const char *query, size_t size,
105 drizzle_return_t *ret_ptr)
106 {
107- return drizzle_command_write(con, NULL, DRIZZLE_COMMAND_QUERY,
108- (unsigned char *)query, size, size, ret_ptr);
109-}
110-
111-drizzle_result_st *drizzle_query_str(drizzle_st *con,
112- const char *query,
113- drizzle_return_t *ret_ptr)
114-{
115- if (query == NULL)
116+ if (size == 0)
117 {
118- return NULL;
119+ size= strlen(query);
120 }
121-
122- size_t size= strlen(query);
123-
124 return drizzle_command_write(con, NULL, DRIZZLE_COMMAND_QUERY,
125 (unsigned char *)query, size, size, ret_ptr);
126 }
127
128-
129 ssize_t drizzle_escape_string(char *to, const size_t max_to_size, const char *from, const size_t from_size)
130 {
131 const char *end;
132
133=== modified file 'tests/unit/column.c'
134--- tests/unit/column.c 2013-01-05 11:41:26 +0000
135+++ tests/unit/column.c 2013-01-10 22:17:22 +0000
136@@ -65,22 +65,22 @@
137 }
138 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s(%s)", drizzle_error(con), strerror(ret));
139
140- drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
141+ drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
142 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
143
144- drizzle_query_str(con, "CREATE SCHEMA libdrizzle", &ret);
145+ drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
146 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
147
148 ret= drizzle_select_db(con, "libdrizzle");
149 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
150
151- drizzle_query_str(con, "create table libdrizzle.t1 (a int primary key auto_increment, b varchar(255), c timestamp default current_timestamp)", &ret);
152+ drizzle_query(con, "create table libdrizzle.t1 (a int primary key auto_increment, b varchar(255), c timestamp default current_timestamp)", 0, &ret);
153 ASSERT_TRUE_(ret == DRIZZLE_RETURN_OK, "create table libdrizzle.t1 (a int primary key auto_increment, b varchar(255), c timestamp default current_timestamp)");
154
155- drizzle_query_str(con, "insert into libdrizzle.t1 (b) values ('this'),('is'),('war')", &ret);
156+ drizzle_query(con, "insert into libdrizzle.t1 (b) values ('this'),('is'),('war')", 0, &ret);
157 ASSERT_TRUE_(ret == DRIZZLE_RETURN_OK, "insert into libdrizzle.t1 (b) values ('this'),('is'),('war')");
158
159- drizzle_result_st *result= drizzle_query_str(con, "select * from libdrizzle.t1", &ret);
160+ drizzle_result_st *result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
161 ASSERT_TRUE_(ret == DRIZZLE_RETURN_OK, "select * from libdrizzle.t1");
162
163 drizzle_result_buffer(result);
164@@ -115,10 +115,10 @@
165
166 drizzle_result_free(result);
167
168- drizzle_query_str(con, "DROP TABLE libdrizzle.t1", &ret);
169+ drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
170 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
171
172- drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
173+ drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
174 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
175
176 ret= drizzle_quit(con);
177
178=== modified file 'tests/unit/connect.c'
179--- tests/unit/connect.c 2012-12-31 00:06:53 +0000
180+++ tests/unit/connect.c 2013-01-10 22:17:22 +0000
181@@ -63,7 +63,7 @@
182 }
183 ASSERT_EQ(DRIZZLE_RETURN_OK, ret);
184
185- drizzle_query_str(con, "SELECT 1", &ret);
186+ drizzle_query(con, "SELECT 1", 0, &ret);
187 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "SELECT 1 (%s)", drizzle_error(con));
188
189 // Now that we know everything is good... lets push it.
190@@ -75,7 +75,7 @@
191 ret= drizzle_connect(con);
192 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s(%s)", drizzle_error(con), drizzle_strerror(ret));
193
194- drizzle_query_str(con, "SELECT 1", &ret);
195+ drizzle_query(con, "SELECT 1", 0, &ret);
196 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "SELECT 1 (%s)", drizzle_error(con));
197
198 // Now that we know everything is good... lets push it.
199
200=== modified file 'tests/unit/insert_id.c'
201--- tests/unit/insert_id.c 2013-01-05 11:41:26 +0000
202+++ tests/unit/insert_id.c 2013-01-10 22:17:22 +0000
203@@ -64,35 +64,35 @@
204 }
205 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
206
207- drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
208+ drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
209 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
210
211- drizzle_query_str(con, "CREATE SCHEMA libdrizzle", &ret);
212+ drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
213 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
214
215 ret= drizzle_select_db(con, "libdrizzle");
216 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
217
218- drizzle_query_str(con, "create table libdrizzle.t1 (a int primary key auto_increment, b int)", &ret);
219+ drizzle_query(con, "create table libdrizzle.t1 (a int primary key auto_increment, b int)", 0, &ret);
220 ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "create table libdrizzle.t1 (a int primary key auto_increment, b int)");
221
222- drizzle_result_st *result= drizzle_query_str(con, "insert into libdrizzle.t1 (b) values (1),(2),(3)", &ret);
223+ drizzle_result_st *result= drizzle_query(con, "insert into libdrizzle.t1 (b) values (1),(2),(3)", 0, &ret);
224 ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "insert into libdrizzle.t1 (b) values (1),(2),(3)");
225 ASSERT_TRUE(result);
226
227 ASSERT_EQ_(drizzle_result_insert_id(result), 1, "Got bad insert_id (expected 1, got %"PRIu64")", drizzle_result_insert_id(result));
228 drizzle_result_free(result);
229
230- result= drizzle_query_str(con, "INSERT INTO libdrizzle.t1 (b) VALUES (4),(5),(6)", &ret);
231+ result= drizzle_query(con, "INSERT INTO libdrizzle.t1 (b) VALUES (4),(5),(6)", 0, &ret);
232 ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "INSERT INTO libdrizzle.t1 (b) VALUES (4),(5),(6)");
233
234 ASSERT_EQ_(drizzle_result_insert_id(result), 4, "Got bad insert_id (expected 4, got %"PRIu64")", drizzle_result_insert_id(result));
235 drizzle_result_free(result);
236
237- drizzle_query_str(con, "DROP TABLE libdrizzle.t1", &ret);
238+ drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
239 ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "dROP TABLE failure");
240
241- drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
242+ drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
243 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
244
245 ret= drizzle_quit(con);
246
247=== modified file 'tests/unit/query.c'
248--- tests/unit/query.c 2013-01-05 11:41:26 +0000
249+++ tests/unit/query.c 2013-01-10 22:17:22 +0000
250@@ -65,30 +65,30 @@
251 }
252 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
253
254- drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
255+ drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
256 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
257
258- drizzle_query_str(con, "CREATE SCHEMA libdrizzle", &ret);
259+ drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
260 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
261
262 ret= drizzle_select_db(con, "libdrizzle");
263 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
264
265- drizzle_query_str(con, "create table libdrizzle.t1 (a int)", &ret);
266+ drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret);
267 if (ret != DRIZZLE_RETURN_OK)
268 {
269 printf("Create table failure\n");
270 return EXIT_FAILURE;
271 }
272
273- drizzle_query_str(con, "insert into libdrizzle.t1 values (1),(2),(3)", &ret);
274+ drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret);
275 if (ret != DRIZZLE_RETURN_OK)
276 {
277 printf("Insert failure\n");
278 return EXIT_FAILURE;
279 }
280
281- drizzle_result_st *result= drizzle_query_str(con, "select * from libdrizzle.t1", &ret);
282+ drizzle_result_st *result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
283 if (ret != DRIZZLE_RETURN_OK)
284 {
285 printf("Select failure\n");
286@@ -123,10 +123,10 @@
287
288 drizzle_result_free(result);
289
290- drizzle_query_str(con, "DROP TABLE libdrizzle.t1", &ret);
291+ drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
292 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
293
294- drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
295+ drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
296 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
297
298 ret= drizzle_quit(con);
299
300=== modified file 'tests/unit/row.c'
301--- tests/unit/row.c 2013-01-05 15:56:07 +0000
302+++ tests/unit/row.c 2013-01-10 22:17:22 +0000
303@@ -65,30 +65,30 @@
304 }
305 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
306
307- drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
308+ drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
309 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
310
311- drizzle_query_str(con, "CREATE SCHEMA libdrizzle", &ret);
312+ drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
313 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
314
315 ret= drizzle_select_db(con, "libdrizzle");
316 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
317
318- drizzle_query_str(con, "create table libdrizzle.t1 (a int)", &ret);
319+ drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret);
320 if (ret != DRIZZLE_RETURN_OK)
321 {
322 printf("Create table failure\n");
323 return EXIT_FAILURE;
324 }
325
326- drizzle_query_str(con, "insert into libdrizzle.t1 values (1),(2),(3)", &ret);
327+ drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret);
328 if (ret != DRIZZLE_RETURN_OK)
329 {
330 printf("Insert failure\n");
331 return EXIT_FAILURE;
332 }
333
334- drizzle_result_st *result= drizzle_query_str(con, "select * from libdrizzle.t1", &ret);
335+ drizzle_result_st *result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
336 if (ret != DRIZZLE_RETURN_OK)
337 {
338 printf("Select failure\n");
339@@ -147,10 +147,10 @@
340
341 drizzle_result_free(result);
342
343- drizzle_query_str(con, "DROP TABLE libdrizzle.t1", &ret);
344+ drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
345 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
346
347- drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
348+ drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
349 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
350
351 ret= drizzle_quit(con);
352
353=== modified file 'tests/unit/statement.c'
354--- tests/unit/statement.c 2013-01-05 11:41:26 +0000
355+++ tests/unit/statement.c 2013-01-10 22:17:22 +0000
356@@ -67,19 +67,19 @@
357 }
358 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
359
360- drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
361+ drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
362 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
363
364- drizzle_query_str(con, "CREATE SCHEMA libdrizzle", &ret);
365+ drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
366 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
367
368 ret= drizzle_select_db(con, "libdrizzle");
369 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
370
371- drizzle_query_str(con, "create table libdrizzle.t1 (a int)", &ret);
372+ drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret);
373 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "create table libdrizzle.t1 (a int): %s", drizzle_error(con));
374
375- drizzle_query_str(con, "insert into libdrizzle.t1 values (1),(2),(3)", &ret);
376+ drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret);
377 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
378
379 const char *query= "select * from libdrizzle.t1 where a > ?";
380@@ -159,10 +159,10 @@
381 return EXIT_FAILURE;
382 }
383
384- drizzle_query_str(con, "DROP TABLE libdrizzle.t1", &ret);
385+ drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
386 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
387
388- drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
389+ drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
390 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
391
392 ret= drizzle_quit(con);
393
394=== modified file 'tests/unit/statement_char.c'
395--- tests/unit/statement_char.c 2013-01-05 11:41:26 +0000
396+++ tests/unit/statement_char.c 2013-01-10 22:17:22 +0000
397@@ -68,19 +68,19 @@
398 }
399 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
400
401- drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
402+ drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
403 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
404
405- drizzle_query_str(con, "CREATE SCHEMA libdrizzle", &ret);
406+ drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
407 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
408
409 ret= drizzle_select_db(con, "libdrizzle");
410 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
411
412- drizzle_query_str(con, "create table libdrizzle.t1 (a varchar(50))", &ret);
413+ drizzle_query(con, "create table libdrizzle.t1 (a varchar(50))", 0, &ret);
414 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "create table libdrizzle.t1 (a int): %s", drizzle_error(con));
415
416- drizzle_query_str(con, "insert into libdrizzle.t1 values ('hello'),('drizzle'),('people')", &ret);
417+ drizzle_query(con, "insert into libdrizzle.t1 values ('hello'),('drizzle'),('people')", 0, &ret);
418 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
419
420 const char *query= "select * from libdrizzle.t1 where a = ?";
421@@ -143,10 +143,10 @@
422 return EXIT_FAILURE;
423 }
424
425- drizzle_query_str(con, "DROP TABLE libdrizzle.t1", &ret);
426+ drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
427 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
428
429- drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
430+ drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
431 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
432
433 ret= drizzle_quit(con);
434
435=== modified file 'tests/unit/unbuffered_query.c'
436--- tests/unit/unbuffered_query.c 2013-01-05 11:41:26 +0000
437+++ tests/unit/unbuffered_query.c 2013-01-10 22:17:22 +0000
438@@ -65,30 +65,30 @@
439 }
440 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
441
442- drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
443+ drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
444 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
445
446- drizzle_query_str(con, "CREATE SCHEMA libdrizzle", &ret);
447+ drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
448 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
449
450 ret= drizzle_select_db(con, "libdrizzle");
451 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
452
453- drizzle_query_str(con, "create table libdrizzle.t1 (a int)", &ret);
454+ drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret);
455 if (ret != DRIZZLE_RETURN_OK)
456 {
457 printf("Create table failure\n");
458 return EXIT_FAILURE;
459 }
460
461- drizzle_query_str(con, "insert into libdrizzle.t1 values (1),(2),(3)", &ret);
462+ drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret);
463 if (ret != DRIZZLE_RETURN_OK)
464 {
465 printf("Insert failure\n");
466 return EXIT_FAILURE;
467 }
468
469- drizzle_result_st *result= drizzle_query_str(con, "select * from libdrizzle.t1", &ret);
470+ drizzle_result_st *result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
471 if (ret != DRIZZLE_RETURN_OK)
472 {
473 printf("Select failure\n");
474@@ -141,10 +141,10 @@
475
476 drizzle_result_free(result);
477
478- drizzle_query_str(con, "DROP TABLE libdrizzle.t1", &ret);
479+ drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
480 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
481
482- drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
483+ drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
484 ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
485
486 ret= drizzle_quit(con);

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: