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

[Andrew Hutchings]

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

=== modified file 'docs/api/query.rst'
--- docs/api/query.rst	2013-01-05 10:27:32 +0000
+++ docs/api/query.rst	2013-01-10 22:17:22 +0000
@@ -27,17 +27,7 @@
 
    :param con: A connection object
    :param query: The query to execute
-   :param size: The length of the query string
-   :param ret_ptr: A pointer to a :c:type:`drizzle_return_t` to store the return status into
-   :returns: A newly allocated result object
-
-.. c:function:: drizzle_result_st* drizzle_query_str(drizzle_st *con, const char *query, drizzle_return_t *ret_ptr)
-
-   Executes a query using :c:func:`strlen` to calculate the length of the query
-   string and returns a newly allocated result struct
-
-   :param con: A connection object
-   :param query: The query to execute
+   :param size: The length of the query string, if set to 0 then :c:func:`strlen` is used to calculate the length
    :param ret_ptr: A pointer to a :c:type:`drizzle_return_t` to store the return status into
    :returns: A newly allocated result object
 
 
=== modified file 'docs/examples/buffered.rst'
--- docs/examples/buffered.rst	2012-12-24 10:20:04 +0000
+++ docs/examples/buffered.rst	2013-01-10 22:17:22 +0000
@@ -4,7 +4,7 @@
 Introduction
 ------------
 
-In this example :c:func:`drizzle_query_str` is used to send a select query to a
+In this example :c:func:`drizzle_query` is used to send a select query to a
 MySQL server.  The whole result set is then retrieved and stored in memory
 using :c:func:`drizzle_result_buffer`.
 
@@ -49,7 +49,7 @@
         return EXIT_FAILURE;
       }
 
-      result= drizzle_query_str(con, "select * from libdrizzle.t1", &ret);
+      result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
       if (ret != DRIZZLE_RETURN_OK)
       {
         printf("Select failure\n");
 
=== modified file 'docs/examples/unbuffered.rst'
--- docs/examples/unbuffered.rst	2012-12-24 10:20:04 +0000
+++ docs/examples/unbuffered.rst	2013-01-10 22:17:22 +0000
@@ -4,7 +4,7 @@
 Introduction
 ------------
 
-In this example :c:func:`drizzle_query_str` is used to send a select query to a
+In this example :c:func:`drizzle_query` is used to send a select query to a
 MySQL server.  The first thing that is sent back in the results is a list of
 columns, so this list needs to be retieved.  The simplist way of doing this is
 to buffer the column data using :c:func:`drizzle_column_buffer`.
@@ -51,7 +51,7 @@
         return EXIT_FAILURE;
       }
 
-      result= drizzle_query_str(con, "select * from libdrizzle.t1", &ret);
+      result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
       if (ret != DRIZZLE_RETURN_OK)
       {
         printf("Select failure\n");
 
=== modified file 'libdrizzle-5.1/query.h'
--- libdrizzle-5.1/query.h	2013-01-05 10:27:32 +0000
+++ libdrizzle-5.1/query.h	2013-01-10 22:17:22 +0000
@@ -73,14 +73,6 @@
                                  const char *query, size_t size,
                                  drizzle_return_t *ret_ptr);
 
-/**
- * Send query to server, using strlen to get the size of query buffer..
- */
-DRIZZLE_API
-drizzle_result_st *drizzle_query_str(drizzle_st *con,
-                                     const char *query,
-                                     drizzle_return_t *ret_ptr);
-
 /*
  * Escape a string or encode a string in hexadecimal. The return value is the
  * size of the output string in to.
 
=== modified file 'libdrizzle/binlog.cc'
--- libdrizzle/binlog.cc	2013-01-05 15:56:07 +0000
+++ libdrizzle/binlog.cc	2013-01-10 22:17:22 +0000
@@ -52,7 +52,7 @@
   drizzle_result_st *result;
 
   // Hack in 5.6 to say that client support checksums
-  result= drizzle_query_str(con, "SET @master_binlog_checksum='NONE'", ret_ptr);
+  result= drizzle_query(con, "SET @master_binlog_checksum='NONE'", 0, ret_ptr);
   drizzle_result_free(result);
   if (*ret_ptr != DRIZZLE_RETURN_OK)
   {
 
=== modified file 'libdrizzle/query.cc'
--- libdrizzle/query.cc	2013-01-05 15:56:07 +0000
+++ libdrizzle/query.cc	2013-01-10 22:17:22 +0000
@@ -48,26 +48,14 @@
                                  const char *query, size_t size,
                                  drizzle_return_t *ret_ptr)
 {
-  return drizzle_command_write(con, NULL, DRIZZLE_COMMAND_QUERY,
-                                   (unsigned char *)query, size, size, ret_ptr);
-}
-
-drizzle_result_st *drizzle_query_str(drizzle_st *con,
-                                     const char *query, 
-                                     drizzle_return_t *ret_ptr)
-{
-  if (query == NULL)
+  if (size == 0)
   {
-    return NULL;
+    size= strlen(query);
   }
-
-  size_t size= strlen(query);
-
   return drizzle_command_write(con, NULL, DRIZZLE_COMMAND_QUERY,
                                    (unsigned char *)query, size, size, ret_ptr);
 }
 
-
 ssize_t drizzle_escape_string(char *to, const size_t max_to_size, const char *from, const size_t from_size)
 {
   const char *end;
 
=== modified file 'tests/unit/column.c'
--- tests/unit/column.c	2013-01-05 11:41:26 +0000
+++ tests/unit/column.c	2013-01-10 22:17:22 +0000
@@ -65,22 +65,22 @@
   }
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s(%s)", drizzle_error(con), strerror(ret));
 
-  drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
 
-  drizzle_query_str(con, "CREATE SCHEMA libdrizzle", &ret);
+  drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
 
   ret= drizzle_select_db(con, "libdrizzle");
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
 
-  drizzle_query_str(con, "create table libdrizzle.t1 (a int primary key auto_increment, b varchar(255), c timestamp default current_timestamp)", &ret);
+  drizzle_query(con, "create table libdrizzle.t1 (a int primary key auto_increment, b varchar(255), c timestamp default current_timestamp)", 0, &ret);
   ASSERT_TRUE_(ret == DRIZZLE_RETURN_OK, "create table libdrizzle.t1 (a int primary key auto_increment, b varchar(255), c timestamp default current_timestamp)");
 
-  drizzle_query_str(con, "insert into libdrizzle.t1 (b) values ('this'),('is'),('war')", &ret);
+  drizzle_query(con, "insert into libdrizzle.t1 (b) values ('this'),('is'),('war')", 0, &ret);
   ASSERT_TRUE_(ret == DRIZZLE_RETURN_OK, "insert into libdrizzle.t1 (b) values ('this'),('is'),('war')");
 
-  drizzle_result_st *result= drizzle_query_str(con, "select * from libdrizzle.t1", &ret);
+  drizzle_result_st *result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
   ASSERT_TRUE_(ret == DRIZZLE_RETURN_OK, "select * from libdrizzle.t1");
 
   drizzle_result_buffer(result);
@@ -115,10 +115,10 @@
 
   drizzle_result_free(result);
 
-  drizzle_query_str(con, "DROP TABLE libdrizzle.t1", &ret);
+  drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
 
-  drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
 
   ret= drizzle_quit(con);
 
=== modified file 'tests/unit/connect.c'
--- tests/unit/connect.c	2012-12-31 00:06:53 +0000
+++ tests/unit/connect.c	2013-01-10 22:17:22 +0000
@@ -63,7 +63,7 @@
   }
   ASSERT_EQ(DRIZZLE_RETURN_OK, ret);
 
-  drizzle_query_str(con, "SELECT 1", &ret);
+  drizzle_query(con, "SELECT 1", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "SELECT 1 (%s)", drizzle_error(con));
 
   // Now that we know everything is good... lets push it.
@@ -75,7 +75,7 @@
     ret= drizzle_connect(con);
     ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s(%s)", drizzle_error(con), drizzle_strerror(ret));
 
-    drizzle_query_str(con, "SELECT 1", &ret);
+    drizzle_query(con, "SELECT 1", 0, &ret);
     ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "SELECT 1 (%s)", drizzle_error(con));
 
     // Now that we know everything is good... lets push it.
 
=== modified file 'tests/unit/insert_id.c'
--- tests/unit/insert_id.c	2013-01-05 11:41:26 +0000
+++ tests/unit/insert_id.c	2013-01-10 22:17:22 +0000
@@ -64,35 +64,35 @@
   }
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
 
-  drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
 
-  drizzle_query_str(con, "CREATE SCHEMA libdrizzle", &ret);
+  drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
 
   ret= drizzle_select_db(con, "libdrizzle");
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
 
-  drizzle_query_str(con, "create table libdrizzle.t1 (a int primary key auto_increment, b int)", &ret);
+  drizzle_query(con, "create table libdrizzle.t1 (a int primary key auto_increment, b int)", 0, &ret);
   ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "create table libdrizzle.t1 (a int primary key auto_increment, b int)");
 
-  drizzle_result_st *result= drizzle_query_str(con, "insert into libdrizzle.t1 (b) values (1),(2),(3)", &ret);
+  drizzle_result_st *result= drizzle_query(con, "insert into libdrizzle.t1 (b) values (1),(2),(3)", 0, &ret);
   ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "insert into libdrizzle.t1 (b) values (1),(2),(3)");
   ASSERT_TRUE(result);
 
   ASSERT_EQ_(drizzle_result_insert_id(result), 1, "Got bad insert_id (expected 1, got %"PRIu64")", drizzle_result_insert_id(result));
   drizzle_result_free(result);
 
-  result= drizzle_query_str(con, "INSERT INTO libdrizzle.t1 (b) VALUES (4),(5),(6)", &ret);
+  result= drizzle_query(con, "INSERT INTO libdrizzle.t1 (b) VALUES (4),(5),(6)", 0, &ret);
   ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "INSERT INTO libdrizzle.t1 (b) VALUES (4),(5),(6)");
 
   ASSERT_EQ_(drizzle_result_insert_id(result), 4, "Got bad insert_id (expected 4, got %"PRIu64")", drizzle_result_insert_id(result));
   drizzle_result_free(result);
 
-  drizzle_query_str(con, "DROP TABLE libdrizzle.t1", &ret);
+  drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
   ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "dROP TABLE failure");
 
-  drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
 
   ret= drizzle_quit(con);
 
=== modified file 'tests/unit/query.c'
--- tests/unit/query.c	2013-01-05 11:41:26 +0000
+++ tests/unit/query.c	2013-01-10 22:17:22 +0000
@@ -65,30 +65,30 @@
   }
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
 
-  drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
 
-  drizzle_query_str(con, "CREATE SCHEMA libdrizzle", &ret);
+  drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
 
   ret= drizzle_select_db(con, "libdrizzle");
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
 
-  drizzle_query_str(con, "create table libdrizzle.t1 (a int)", &ret);
+  drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Create table failure\n");
     return EXIT_FAILURE;
   }
 
-  drizzle_query_str(con, "insert into libdrizzle.t1 values (1),(2),(3)", &ret);
+  drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Insert failure\n");
     return EXIT_FAILURE;
   }
 
-  drizzle_result_st *result= drizzle_query_str(con, "select * from libdrizzle.t1", &ret);
+  drizzle_result_st *result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Select failure\n");
@@ -123,10 +123,10 @@
 
   drizzle_result_free(result);
 
-  drizzle_query_str(con, "DROP TABLE libdrizzle.t1", &ret);
+  drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
 
-  drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
 
   ret= drizzle_quit(con);
 
=== modified file 'tests/unit/row.c'
--- tests/unit/row.c	2013-01-05 15:56:07 +0000
+++ tests/unit/row.c	2013-01-10 22:17:22 +0000
@@ -65,30 +65,30 @@
   }
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
 
-  drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
 
-  drizzle_query_str(con, "CREATE SCHEMA libdrizzle", &ret);
+  drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
 
   ret= drizzle_select_db(con, "libdrizzle");
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
 
-  drizzle_query_str(con, "create table libdrizzle.t1 (a int)", &ret);
+  drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Create table failure\n");
     return EXIT_FAILURE;
   }
 
-  drizzle_query_str(con, "insert into libdrizzle.t1 values (1),(2),(3)", &ret);
+  drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Insert failure\n");
     return EXIT_FAILURE;
   }
 
-  drizzle_result_st *result= drizzle_query_str(con, "select * from libdrizzle.t1", &ret);
+  drizzle_result_st *result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Select failure\n");
@@ -147,10 +147,10 @@
 
   drizzle_result_free(result);
 
-  drizzle_query_str(con, "DROP TABLE libdrizzle.t1", &ret);
+  drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
 
-  drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
 
   ret= drizzle_quit(con);
 
=== modified file 'tests/unit/statement.c'
--- tests/unit/statement.c	2013-01-05 11:41:26 +0000
+++ tests/unit/statement.c	2013-01-10 22:17:22 +0000
@@ -67,19 +67,19 @@
   }
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
 
-  drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
 
-  drizzle_query_str(con, "CREATE SCHEMA libdrizzle", &ret);
+  drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
 
   ret= drizzle_select_db(con, "libdrizzle");
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
 
-  drizzle_query_str(con, "create table libdrizzle.t1 (a int)", &ret);
+  drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "create table libdrizzle.t1 (a int): %s", drizzle_error(con));
 
-  drizzle_query_str(con, "insert into libdrizzle.t1 values (1),(2),(3)", &ret);
+  drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
 
   const char *query= "select * from libdrizzle.t1 where a > ?";
@@ -159,10 +159,10 @@
     return EXIT_FAILURE;
   }
 
-  drizzle_query_str(con, "DROP TABLE libdrizzle.t1", &ret);
+  drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
 
-  drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
 
   ret= drizzle_quit(con);
 
=== modified file 'tests/unit/statement_char.c'
--- tests/unit/statement_char.c	2013-01-05 11:41:26 +0000
+++ tests/unit/statement_char.c	2013-01-10 22:17:22 +0000
@@ -68,19 +68,19 @@
   }
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
 
-  drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
 
-  drizzle_query_str(con, "CREATE SCHEMA libdrizzle", &ret);
+  drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
 
   ret= drizzle_select_db(con, "libdrizzle");
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
 
-  drizzle_query_str(con, "create table libdrizzle.t1 (a varchar(50))", &ret);
+  drizzle_query(con, "create table libdrizzle.t1 (a varchar(50))", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "create table libdrizzle.t1 (a int): %s", drizzle_error(con));
 
-  drizzle_query_str(con, "insert into libdrizzle.t1 values ('hello'),('drizzle'),('people')", &ret);
+  drizzle_query(con, "insert into libdrizzle.t1 values ('hello'),('drizzle'),('people')", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
 
   const char *query= "select * from libdrizzle.t1 where a = ?";
@@ -143,10 +143,10 @@
     return EXIT_FAILURE;
   }
 
-  drizzle_query_str(con, "DROP TABLE libdrizzle.t1", &ret);
+  drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
 
-  drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
 
   ret= drizzle_quit(con);
 
=== modified file 'tests/unit/unbuffered_query.c'
--- tests/unit/unbuffered_query.c	2013-01-05 11:41:26 +0000
+++ tests/unit/unbuffered_query.c	2013-01-10 22:17:22 +0000
@@ -65,30 +65,30 @@
   }
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret));
 
-  drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
 
-  drizzle_query_str(con, "CREATE SCHEMA libdrizzle", &ret);
+  drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con));
 
   ret= drizzle_select_db(con, "libdrizzle");
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle");
 
-  drizzle_query_str(con, "create table libdrizzle.t1 (a int)", &ret);
+  drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Create table failure\n");
     return EXIT_FAILURE;
   }
 
-  drizzle_query_str(con, "insert into libdrizzle.t1 values (1),(2),(3)", &ret);
+  drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Insert failure\n");
     return EXIT_FAILURE;
   }
 
-  drizzle_result_st *result= drizzle_query_str(con, "select * from libdrizzle.t1", &ret);
+  drizzle_result_st *result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Select failure\n");
@@ -141,10 +141,10 @@
 
   drizzle_result_free(result);
 
-  drizzle_query_str(con, "DROP TABLE libdrizzle.t1", &ret);
+  drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");
 
-  drizzle_query_str(con, "DROP SCHEMA IF EXISTS libdrizzle", &ret);
+  drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
 
   ret= drizzle_quit(con);