Merge lp:~linuxjedi/libdrizzle/5.1-test-fixes into lp:libdrizzle
- 5.1-test-fixes
- Merge into libdrizzle-redux
Proposed by
Andrew Hutchings
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Andrew Hutchings | ||||||||
| Approved revision: | 118 | ||||||||
| Merged at revision: | 118 | ||||||||
| Proposed branch: | lp:~linuxjedi/libdrizzle/5.1-test-fixes | ||||||||
| Merge into: | lp:libdrizzle | ||||||||
| Diff against target: |
682 lines (+161/-152) 13 files modified
.bzrignore (+1/-0) tests/unit/column.c (+10/-10) tests/unit/common.c (+13/-7) tests/unit/common.h (+2/-2) tests/unit/datetypes.c (+13/-11) tests/unit/insert_id.c (+14/-14) tests/unit/nulls.c (+15/-15) tests/unit/numbers.c (+11/-11) tests/unit/query.c (+14/-14) tests/unit/row.c (+16/-16) tests/unit/statement.c (+18/-18) tests/unit/statement_char.c (+18/-18) tests/unit/unbuffered_query.c (+16/-16) |
||||||||
| To merge this branch: | bzr merge lp:~linuxjedi/libdrizzle/5.1-test-fixes | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Trunk | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
Fix test cases
1. Datetypes test needs 5.6.4 onwards (so broke Ubuntu 12.04 builder)
2. Automake 1.13 test running works in parallel so test now support this
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 '.bzrignore' | |||
| 2 | --- .bzrignore 2012-12-28 10:37:41 +0000 | |||
| 3 | +++ .bzrignore 2013-04-26 19:01:27 +0000 | |||
| 4 | @@ -40,3 +40,4 @@ | |||
| 5 | 40 | docs/changes/ | 40 | docs/changes/ |
| 6 | 41 | docs/latex/ | 41 | docs/latex/ |
| 7 | 42 | libdrizzle-config | 42 | libdrizzle-config |
| 8 | 43 | test-suite.log | ||
| 9 | 43 | 44 | ||
| 10 | === modified file 'tests/unit/column.c' | |||
| 11 | --- tests/unit/column.c 2013-03-19 20:38:59 +0000 | |||
| 12 | +++ tests/unit/column.c 2013-04-26 19:01:27 +0000 | |||
| 13 | @@ -56,13 +56,13 @@ | |||
| 14 | 56 | 56 | ||
| 15 | 57 | set_up_connection(); | 57 | set_up_connection(); |
| 16 | 58 | CHECKED_QUERY("SET CHARACTER SET latin1"); /* Or any other one-byte-per-character character set */ | 58 | CHECKED_QUERY("SET CHARACTER SET latin1"); /* Or any other one-byte-per-character character set */ |
| 24 | 59 | set_up_schema(); | 59 | set_up_schema("test_column"); |
| 25 | 60 | 60 | ||
| 26 | 61 | CHECKED_QUERY("create table libdrizzle.t1 (a int primary key auto_increment, b varchar(255), c timestamp default current_timestamp)"); | 61 | CHECKED_QUERY("create table test_column.t1 (a int primary key auto_increment, b varchar(255), c timestamp default current_timestamp)"); |
| 27 | 62 | 62 | ||
| 28 | 63 | CHECKED_QUERY("insert into libdrizzle.t1 (b) values ('this'),('is'),('war')"); | 63 | CHECKED_QUERY("insert into test_column.t1 (b) values ('this'),('is'),('war')"); |
| 29 | 64 | 64 | ||
| 30 | 65 | CHECKED_QUERY("select * from libdrizzle.t1"); | 65 | CHECKED_QUERY("select * from test_column.t1"); |
| 31 | 66 | 66 | ||
| 32 | 67 | drizzle_result_buffer(result); | 67 | drizzle_result_buffer(result); |
| 33 | 68 | num_fields= drizzle_result_column_count(result); | 68 | num_fields= drizzle_result_column_count(result); |
| 34 | @@ -82,7 +82,7 @@ | |||
| 35 | 82 | while ((column= drizzle_column_next(result))) | 82 | while ((column= drizzle_column_next(result))) |
| 36 | 83 | { | 83 | { |
| 37 | 84 | cur_column++; | 84 | cur_column++; |
| 39 | 85 | ASSERT_EQ_(strcmp(drizzle_column_db(column), "libdrizzle"), 0, "Column has bad DB name"); | 85 | ASSERT_EQ_(strcmp(drizzle_column_db(column), "test_column"), 0, "Column has bad DB name"); |
| 40 | 86 | ASSERT_EQ_(strcmp(drizzle_column_table(column), "t1"), 0, "Column had bad table name"); | 86 | ASSERT_EQ_(strcmp(drizzle_column_table(column), "t1"), 0, "Column had bad table name"); |
| 41 | 87 | switch (cur_column) { | 87 | switch (cur_column) { |
| 42 | 88 | case 1: | 88 | case 1: |
| 43 | @@ -105,9 +105,9 @@ | |||
| 44 | 105 | 105 | ||
| 45 | 106 | drizzle_result_free(result); | 106 | drizzle_result_free(result); |
| 46 | 107 | 107 | ||
| 48 | 108 | CHECKED_QUERY("DROP TABLE libdrizzle.t1"); | 108 | CHECKED_QUERY("DROP TABLE test_column.t1"); |
| 49 | 109 | 109 | ||
| 51 | 110 | tear_down_schema(); | 110 | tear_down_schema("test_column"); |
| 52 | 111 | 111 | ||
| 53 | 112 | return EXIT_SUCCESS; | 112 | return EXIT_SUCCESS; |
| 54 | 113 | } | 113 | } |
| 55 | 114 | 114 | ||
| 56 | === modified file 'tests/unit/common.c' | |||
| 57 | --- tests/unit/common.c 2013-04-21 21:56:39 +0000 | |||
| 58 | +++ tests/unit/common.c 2013-04-26 19:01:27 +0000 | |||
| 59 | @@ -73,21 +73,27 @@ | |||
| 60 | 73 | ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "%s(%s)", drizzle_error(con), drizzle_strerror(driz_ret)); | 73 | ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "%s(%s)", drizzle_error(con), drizzle_strerror(driz_ret)); |
| 61 | 74 | } | 74 | } |
| 62 | 75 | 75 | ||
| 64 | 76 | void set_up_schema(void) | 76 | void set_up_schema(const char *schema) |
| 65 | 77 | { | 77 | { |
| 66 | 78 | drizzle_result_st VARIABLE_IS_NOT_USED *result; | 78 | drizzle_result_st VARIABLE_IS_NOT_USED *result; |
| 67 | 79 | drizzle_return_t driz_ret; | 79 | drizzle_return_t driz_ret; |
| 72 | 80 | 80 | char sch_query[128]; | |
| 73 | 81 | CHECKED_QUERY("DROP SCHEMA IF EXISTS libdrizzle"); | 81 | |
| 74 | 82 | CHECKED_QUERY("CREATE SCHEMA libdrizzle"); | 82 | snprintf(sch_query, 127, "DROP SCHEMA IF EXISTS %s", schema); |
| 75 | 83 | CHECK(drizzle_select_db(con, "libdrizzle")); | 83 | |
| 76 | 84 | CHECKED_QUERY(sch_query); | ||
| 77 | 85 | snprintf(sch_query, 127, "CREATE SCHEMA %s", schema); | ||
| 78 | 86 | CHECKED_QUERY(sch_query); | ||
| 79 | 87 | CHECK(drizzle_select_db(con, schema)); | ||
| 80 | 84 | } | 88 | } |
| 81 | 85 | 89 | ||
| 83 | 86 | void tear_down_schema(void) | 90 | void tear_down_schema(const char *schema) |
| 84 | 87 | { | 91 | { |
| 85 | 88 | drizzle_result_st VARIABLE_IS_NOT_USED *result; | 92 | drizzle_result_st VARIABLE_IS_NOT_USED *result; |
| 86 | 89 | drizzle_return_t driz_ret; | 93 | drizzle_return_t driz_ret; |
| 87 | 94 | char sch_query[128]; | ||
| 88 | 90 | 95 | ||
| 90 | 91 | CHECKED_QUERY("DROP SCHEMA IF EXISTS libdrizzle"); | 96 | snprintf(sch_query, 127, "DROP SCHEMA IF EXISTS %s", schema); |
| 91 | 97 | CHECKED_QUERY(sch_query); | ||
| 92 | 92 | } | 98 | } |
| 93 | 93 | 99 | ||
| 94 | 94 | 100 | ||
| 95 | === modified file 'tests/unit/common.h' | |||
| 96 | --- tests/unit/common.h 2013-04-21 21:41:39 +0000 | |||
| 97 | +++ tests/unit/common.h 2013-04-26 19:01:27 +0000 | |||
| 98 | @@ -61,8 +61,8 @@ | |||
| 99 | 61 | extern void close_connection_on_exit(void); | 61 | extern void close_connection_on_exit(void); |
| 100 | 62 | 62 | ||
| 101 | 63 | /* For unit tests that make tables, etc.: delete-and-recreate the schema on setup, and delete the schema on teardown. */ | 63 | /* For unit tests that make tables, etc.: delete-and-recreate the schema on setup, and delete the schema on teardown. */ |
| 104 | 64 | extern void set_up_schema(void); | 64 | extern void set_up_schema(const char* schema); |
| 105 | 65 | extern void tear_down_schema(void); | 65 | extern void tear_down_schema(const char* schema); |
| 106 | 66 | 66 | ||
| 107 | 67 | /* Perform a query; assign the result to 'result' and the returncode to 'driz_ret'; assert that the returncode is DRIZZLE_RETURN_OK. */ | 67 | /* Perform a query; assign the result to 'result' and the returncode to 'driz_ret'; assert that the returncode is DRIZZLE_RETURN_OK. */ |
| 108 | 68 | #define CHECKED_QUERY(cmd) result = drizzle_query(con, cmd, 0, &driz_ret); \ | 68 | #define CHECKED_QUERY(cmd) result = drizzle_query(con, cmd, 0, &driz_ret); \ |
| 109 | 69 | 69 | ||
| 110 | === modified file 'tests/unit/datetypes.c' | |||
| 111 | --- tests/unit/datetypes.c 2013-04-25 10:15:18 +0000 | |||
| 112 | +++ tests/unit/datetypes.c 2013-04-26 19:01:27 +0000 | |||
| 113 | @@ -85,20 +85,22 @@ | |||
| 114 | 85 | unsigned rows_in_table; | 85 | unsigned rows_in_table; |
| 115 | 86 | 86 | ||
| 116 | 87 | set_up_connection(); | 87 | set_up_connection(); |
| 120 | 88 | set_up_schema(); | 88 | set_up_schema("test_datetime"); |
| 121 | 89 | 89 | ||
| 122 | 90 | CHECKED_QUERY("create table libdrizzle.dt1 (a int primary key not null, b date, c year(4), d timestamp(0), e timestamp(6), f time(0), g time(6), h datetime(0), i datetime(6))"); | 90 | SKIP_IF_(drizzle_server_version_number(con) < 50604, "Test requires MySQL 5.6.4 or higher"); |
| 123 | 91 | |||
| 124 | 92 | CHECKED_QUERY("create table test_datetime.dt1 (a int primary key not null, b date, c year(4), d timestamp(0), e timestamp(6), f time(0), g time(6), h datetime(0), i datetime(6))"); | ||
| 125 | 91 | rows_in_table = 0; | 93 | rows_in_table = 0; |
| 126 | 92 | 94 | ||
| 127 | 93 | /* Insert rows with pk 1 and 2 */ | 95 | /* Insert rows with pk 1 and 2 */ |
| 129 | 94 | CHECKED_QUERY("insert into libdrizzle.dt1 (a,b,c,d,e,f,g,h,i) values " | 96 | CHECKED_QUERY("insert into test_datetime.dt1 (a,b,c,d,e,f,g,h,i) values " |
| 130 | 95 | "(1, '1970-01-01', '2112', '2013-03-13 09:22:00.001', '2013-03-13 09:22:00.001', '6:15:03', '23:59:59.75', '1642-12-25 12:15:01', '1642-12-25 12:12:00.125')," | 97 | "(1, '1970-01-01', '2112', '2013-03-13 09:22:00.001', '2013-03-13 09:22:00.001', '6:15:03', '23:59:59.75', '1642-12-25 12:15:01', '1642-12-25 12:12:00.125')," |
| 131 | 96 | "(2, '84-02-29', '12', NOW(), NOW(), '3 6:15:03', '23:59:59.0625', '1642-12-25 12:15:01', '1642-12-25 12:12:00.000000');"); | 98 | "(2, '84-02-29', '12', NOW(), NOW(), '3 6:15:03', '23:59:59.0625', '1642-12-25 12:15:01', '1642-12-25 12:12:00.000000');"); |
| 132 | 97 | ASSERT_EQ(drizzle_result_affected_rows(result), 2); | 99 | ASSERT_EQ(drizzle_result_affected_rows(result), 2); |
| 133 | 98 | rows_in_table += 2; | 100 | rows_in_table += 2; |
| 134 | 99 | 101 | ||
| 135 | 100 | /* Insert row with pk 3 and 4 - test marshaling values we transmit */ | 102 | /* Insert row with pk 3 and 4 - test marshaling values we transmit */ |
| 137 | 101 | query = "insert into libdrizzle.dt1 (a,b,c,d,e,f,g,h,i) values (?,?,?,?,?,?,?,?,?)"; | 103 | query = "insert into test_datetime.dt1 (a,b,c,d,e,f,g,h,i) values (?,?,?,?,?,?,?,?,?)"; |
| 138 | 102 | sth = drizzle_stmt_prepare(con, query, strlen(query), &driz_ret); | 104 | sth = drizzle_stmt_prepare(con, query, strlen(query), &driz_ret); |
| 139 | 103 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), query); | 105 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), query); |
| 140 | 104 | 106 | ||
| 141 | @@ -139,7 +141,7 @@ | |||
| 142 | 139 | CHECK(drizzle_stmt_close(sth)); | 141 | CHECK(drizzle_stmt_close(sth)); |
| 143 | 140 | 142 | ||
| 144 | 141 | /* Read the table back, with values sent over the wire in text form */ | 143 | /* Read the table back, with values sent over the wire in text form */ |
| 146 | 142 | CHECKED_QUERY("select * from libdrizzle.dt1 order by a"); | 144 | CHECKED_QUERY("select * from test_datetime.dt1 order by a"); |
| 147 | 143 | 145 | ||
| 148 | 144 | drizzle_result_buffer(result); | 146 | drizzle_result_buffer(result); |
| 149 | 145 | num_fields= drizzle_result_column_count(result); | 147 | num_fields= drizzle_result_column_count(result); |
| 150 | @@ -163,7 +165,7 @@ | |||
| 151 | 163 | while ((column= drizzle_column_next(result))) | 165 | while ((column= drizzle_column_next(result))) |
| 152 | 164 | { | 166 | { |
| 153 | 165 | cur_column++; | 167 | cur_column++; |
| 155 | 166 | ASSERT_EQ_(strcmp(drizzle_column_db(column), "libdrizzle"), 0, "Column has bad DB name"); | 168 | ASSERT_EQ_(strcmp(drizzle_column_db(column), "test_datetime"), 0, "Column has bad DB name"); |
| 156 | 167 | ASSERT_EQ_(strcmp(drizzle_column_table(column), "dt1"), 0, "Column %d had bad table name", cur_column); | 169 | ASSERT_EQ_(strcmp(drizzle_column_table(column), "dt1"), 0, "Column %d had bad table name", cur_column); |
| 157 | 168 | ASSERT_EQ(drizzle_column_current(result), cur_column); | 170 | ASSERT_EQ(drizzle_column_current(result), cur_column); |
| 158 | 169 | ASSERT_STREQ_(drizzle_column_name(column), column_names[cur_column], "Column %d name", cur_column); | 171 | ASSERT_STREQ_(drizzle_column_name(column), column_names[cur_column], "Column %d name", cur_column); |
| 159 | @@ -200,7 +202,7 @@ | |||
| 160 | 200 | drizzle_result_free(result); | 202 | drizzle_result_free(result); |
| 161 | 201 | 203 | ||
| 162 | 202 | /* Read the table back, with values sent over the wire in binary form */ | 204 | /* Read the table back, with values sent over the wire in binary form */ |
| 164 | 203 | query = "select a,b,c,d,e,f,g,h,i from libdrizzle.dt1 order by a"; | 205 | query = "select a,b,c,d,e,f,g,h,i from test_datetime.dt1 order by a"; |
| 165 | 204 | sth = drizzle_stmt_prepare(con, query, strlen(query), &driz_ret); | 206 | sth = drizzle_stmt_prepare(con, query, strlen(query), &driz_ret); |
| 166 | 205 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), query); | 207 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), query); |
| 167 | 206 | driz_ret = drizzle_stmt_execute(sth); | 208 | driz_ret = drizzle_stmt_execute(sth); |
| 168 | @@ -279,7 +281,7 @@ | |||
| 169 | 279 | const char *col_name = column_names[checking_column]; | 281 | const char *col_name = column_names[checking_column]; |
| 170 | 280 | char query_buf[128]; | 282 | char query_buf[128]; |
| 171 | 281 | int VARIABLE_IS_NOT_USED unused; | 283 | int VARIABLE_IS_NOT_USED unused; |
| 173 | 282 | unused = snprintf(query_buf, 128, "select a, %s, cast(%s as char) from libdrizzle.dt1", | 284 | unused = snprintf(query_buf, 128, "select a, %s, cast(%s as char) from test_datetime.dt1", |
| 174 | 283 | col_name, col_name); | 285 | col_name, col_name); |
| 175 | 284 | query = query_buf; | 286 | query = query_buf; |
| 176 | 285 | 287 | ||
| 177 | @@ -323,9 +325,9 @@ | |||
| 178 | 323 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s", drizzle_strerror(driz_ret), drizzle_error(con)); | 325 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s", drizzle_strerror(driz_ret), drizzle_error(con)); |
| 179 | 324 | } | 326 | } |
| 180 | 325 | 327 | ||
| 182 | 326 | CHECKED_QUERY("DROP TABLE libdrizzle.dt1"); | 328 | CHECKED_QUERY("DROP TABLE test_datetime.dt1"); |
| 183 | 327 | 329 | ||
| 185 | 328 | tear_down_schema(); | 330 | tear_down_schema("test_datetime"); |
| 186 | 329 | 331 | ||
| 187 | 330 | return EXIT_SUCCESS; | 332 | return EXIT_SUCCESS; |
| 188 | 331 | } | 333 | } |
| 189 | 332 | 334 | ||
| 190 | === modified file 'tests/unit/insert_id.c' | |||
| 191 | --- tests/unit/insert_id.c 2013-03-04 22:11:55 +0000 | |||
| 192 | +++ tests/unit/insert_id.c 2013-04-26 19:01:27 +0000 | |||
| 193 | @@ -68,31 +68,31 @@ | |||
| 194 | 68 | } | 68 | } |
| 195 | 69 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con)); | 69 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con)); |
| 196 | 70 | 70 | ||
| 207 | 71 | CHECKED_QUERY("DROP SCHEMA IF EXISTS libdrizzle"); | 71 | CHECKED_QUERY("DROP SCHEMA IF EXISTS test_insert"); |
| 208 | 72 | 72 | ||
| 209 | 73 | CHECKED_QUERY("CREATE SCHEMA libdrizzle"); | 73 | CHECKED_QUERY("CREATE SCHEMA test_insert"); |
| 210 | 74 | 74 | ||
| 211 | 75 | ret= drizzle_select_db(con, "libdrizzle"); | 75 | ret= drizzle_select_db(con, "test_insert"); |
| 212 | 76 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle"); | 76 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE test_insert"); |
| 213 | 77 | 77 | ||
| 214 | 78 | CHECKED_QUERY("create table libdrizzle.t1 (a int primary key auto_increment, b int)"); | 78 | CHECKED_QUERY("create table test_insert.t1 (a int primary key auto_increment, b int)"); |
| 215 | 79 | 79 | ||
| 216 | 80 | drizzle_result_st *result= drizzle_query(con, "insert into libdrizzle.t1 (b) values (1),(2),(3)", 0, &ret); | 80 | drizzle_result_st *result= drizzle_query(con, "insert into test_insert.t1 (b) values (1),(2),(3)", 0, &ret); |
| 217 | 81 | ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "insert into libdrizzle.t1 (b) values (1),(2),(3): %s", drizzle_error(con)); | 81 | ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "insert into libdrizzle.t1 (b) values (1),(2),(3): %s", drizzle_error(con)); |
| 218 | 82 | ASSERT_TRUE(result); | 82 | ASSERT_TRUE(result); |
| 219 | 83 | 83 | ||
| 220 | 84 | ASSERT_EQ_(drizzle_result_insert_id(result), 1, "Got bad insert_id (expected 1, got %"PRIu64")", drizzle_result_insert_id(result)); | 84 | ASSERT_EQ_(drizzle_result_insert_id(result), 1, "Got bad insert_id (expected 1, got %"PRIu64")", drizzle_result_insert_id(result)); |
| 221 | 85 | drizzle_result_free(result); | 85 | drizzle_result_free(result); |
| 222 | 86 | 86 | ||
| 225 | 87 | result= drizzle_query(con, "INSERT INTO libdrizzle.t1 (b) VALUES (4),(5),(6)", 0, &ret); | 87 | result= drizzle_query(con, "INSERT INTO test_insert.t1 (b) VALUES (4),(5),(6)", 0, &ret); |
| 226 | 88 | ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "INSERT INTO libdrizzle.t1 (b) VALUES (4),(5),(6): %s", drizzle_error(con)); | 88 | ASSERT_EQ_(ret, DRIZZLE_RETURN_OK, "INSERT INTO test_insert.t1 (b) VALUES (4),(5),(6): %s", drizzle_error(con)); |
| 227 | 89 | 89 | ||
| 228 | 90 | ASSERT_EQ_(drizzle_result_insert_id(result), 4, "Got bad insert_id (expected 4, got %"PRIu64")", drizzle_result_insert_id(result)); | 90 | ASSERT_EQ_(drizzle_result_insert_id(result), 4, "Got bad insert_id (expected 4, got %"PRIu64")", drizzle_result_insert_id(result)); |
| 229 | 91 | drizzle_result_free(result); | 91 | drizzle_result_free(result); |
| 230 | 92 | 92 | ||
| 232 | 93 | CHECKED_QUERY("DROP TABLE libdrizzle.t1"); | 93 | CHECKED_QUERY("DROP TABLE test_insert.t1"); |
| 233 | 94 | 94 | ||
| 235 | 95 | CHECKED_QUERY("DROP SCHEMA libdrizzle"); | 95 | CHECKED_QUERY("DROP SCHEMA test_insert"); |
| 236 | 96 | 96 | ||
| 237 | 97 | ret= drizzle_quit(con); | 97 | ret= drizzle_quit(con); |
| 238 | 98 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret)); | 98 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret)); |
| 239 | 99 | 99 | ||
| 240 | === modified file 'tests/unit/nulls.c' | |||
| 241 | --- tests/unit/nulls.c 2013-04-22 19:14:35 +0000 | |||
| 242 | +++ tests/unit/nulls.c 2013-04-26 19:01:27 +0000 | |||
| 243 | @@ -85,19 +85,19 @@ | |||
| 244 | 85 | } | 85 | } |
| 245 | 86 | ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(driz_ret)); | 86 | ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(driz_ret)); |
| 246 | 87 | 87 | ||
| 255 | 88 | CHECKED_QUERY("DROP SCHEMA IF EXISTS libdrizzle"); | 88 | CHECKED_QUERY("DROP SCHEMA IF EXISTS test_nulls"); |
| 256 | 89 | 89 | ||
| 257 | 90 | CHECKED_QUERY("CREATE SCHEMA libdrizzle"); | 90 | CHECKED_QUERY("CREATE SCHEMA test_nulls"); |
| 258 | 91 | 91 | ||
| 259 | 92 | driz_ret= drizzle_select_db(con, "libdrizzle"); | 92 | driz_ret= drizzle_select_db(con, "test_nulls"); |
| 260 | 93 | ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "USE libdrizzle"); | 93 | ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "USE test_nulls"); |
| 261 | 94 | 94 | ||
| 262 | 95 | CHECKED_QUERY("create table libdrizzle.t1 (a int, b int, c int, d int, e int, f int, g int, h int, i int, j int, k int)"); | 95 | CHECKED_QUERY("create table test_nulls.t1 (a int, b int, c int, d int, e int, f int, g int, h int, i int, j int, k int)"); |
| 263 | 96 | 96 | ||
| 264 | 97 | #define NCOLS 11 | 97 | #define NCOLS 11 |
| 265 | 98 | 98 | ||
| 266 | 99 | char *querybuf = calloc(256 + 60*64, 1); | 99 | char *querybuf = calloc(256 + 60*64, 1); |
| 268 | 100 | strcpy(querybuf, "insert into libdrizzle.t1 values "); | 100 | strcpy(querybuf, "insert into test_nulls.t1 values "); |
| 269 | 101 | char *p = querybuf + strlen(querybuf); | 101 | char *p = querybuf + strlen(querybuf); |
| 270 | 102 | 102 | ||
| 271 | 103 | for(int sym = 0; sym < 64; sym++) { | 103 | for(int sym = 0; sym < 64; sym++) { |
| 272 | @@ -121,7 +121,7 @@ | |||
| 273 | 121 | CHECKED_QUERY(querybuf); | 121 | CHECKED_QUERY(querybuf); |
| 274 | 122 | 122 | ||
| 275 | 123 | #ifdef TEST_PREPARED_STATEMENTS | 123 | #ifdef TEST_PREPARED_STATEMENTS |
| 277 | 124 | strcpy(querybuf, "insert into libdrizzle.t1 values (?,?,?,?,?,?,?,?,?,?,?)"); | 124 | strcpy(querybuf, "insert into test_nulls.t1 values (?,?,?,?,?,?,?,?,?,?,?)"); |
| 278 | 125 | sth = drizzle_stmt_prepare(con, querybuf, strlen(querybuf), &driz_ret); | 125 | sth = drizzle_stmt_prepare(con, querybuf, strlen(querybuf), &driz_ret); |
| 279 | 126 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), querybuf); | 126 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), querybuf); |
| 280 | 127 | 127 | ||
| 281 | @@ -161,7 +161,7 @@ | |||
| 282 | 161 | table_size = 64; | 161 | table_size = 64; |
| 283 | 162 | #endif | 162 | #endif |
| 284 | 163 | 163 | ||
| 286 | 164 | CHECKED_QUERY("select a,b,c,d,e,f,g,h,i,j,k from libdrizzle.t1 order by e"); | 164 | CHECKED_QUERY("select a,b,c,d,e,f,g,h,i,j,k from test_nulls.t1 order by e"); |
| 287 | 165 | drizzle_result_buffer(result); | 165 | drizzle_result_buffer(result); |
| 288 | 166 | num_fields= drizzle_result_column_count(result); | 166 | num_fields= drizzle_result_column_count(result); |
| 289 | 167 | ASSERT_EQ_(num_fields, NCOLS, "Bad number of fields, expected %d, got %d", 11, num_fields); | 167 | ASSERT_EQ_(num_fields, NCOLS, "Bad number of fields, expected %d, got %d", 11, num_fields); |
| 290 | @@ -208,7 +208,7 @@ | |||
| 291 | 208 | drizzle_result_free(result); | 208 | drizzle_result_free(result); |
| 292 | 209 | 209 | ||
| 293 | 210 | #ifdef TEST_PREPARED_STATEMENTS | 210 | #ifdef TEST_PREPARED_STATEMENTS |
| 295 | 211 | strcpy(querybuf, "select a,b,c,d,e,f,g,h,i,j,k from libdrizzle.t1 order by e"); | 211 | strcpy(querybuf, "select a,b,c,d,e,f,g,h,i,j,k from test_nulls.t1 order by e"); |
| 296 | 212 | sth = drizzle_stmt_prepare(con, querybuf, strlen(querybuf), &driz_ret); | 212 | sth = drizzle_stmt_prepare(con, querybuf, strlen(querybuf), &driz_ret); |
| 297 | 213 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), querybuf); | 213 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), querybuf); |
| 298 | 214 | driz_ret = drizzle_stmt_execute(sth); | 214 | driz_ret = drizzle_stmt_execute(sth); |
| 299 | @@ -266,10 +266,10 @@ | |||
| 300 | 266 | ASSERT_EQ(drizzle_stmt_close(sth), DRIZZLE_RETURN_OK); | 266 | ASSERT_EQ(drizzle_stmt_close(sth), DRIZZLE_RETURN_OK); |
| 301 | 267 | #endif | 267 | #endif |
| 302 | 268 | 268 | ||
| 305 | 269 | CHECKED_QUERY("DROP TABLE libdrizzle.t1"); | 269 | CHECKED_QUERY("DROP TABLE test_nulls.t1"); |
| 306 | 270 | ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "DROP TABLE libdrizzle.t1"); | 270 | ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "DROP TABLE test_nulls.t1"); |
| 307 | 271 | 271 | ||
| 309 | 272 | CHECKED_QUERY("DROP SCHEMA IF EXISTS libdrizzle"); | 272 | CHECKED_QUERY("DROP SCHEMA IF EXISTS test_nulls"); |
| 310 | 273 | 273 | ||
| 311 | 274 | driz_ret= drizzle_quit(con); | 274 | driz_ret= drizzle_quit(con); |
| 312 | 275 | ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "%s", drizzle_strerror(driz_ret)); | 275 | ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "%s", drizzle_strerror(driz_ret)); |
| 313 | 276 | 276 | ||
| 314 | === modified file 'tests/unit/numbers.c' | |||
| 315 | --- tests/unit/numbers.c 2013-04-21 21:41:39 +0000 | |||
| 316 | +++ tests/unit/numbers.c 2013-04-26 19:01:27 +0000 | |||
| 317 | @@ -89,20 +89,20 @@ | |||
| 318 | 89 | int num_fields; | 89 | int num_fields; |
| 319 | 90 | 90 | ||
| 320 | 91 | set_up_connection(); | 91 | set_up_connection(); |
| 322 | 92 | set_up_schema(); | 92 | set_up_schema("test_numbers"); |
| 323 | 93 | 93 | ||
| 325 | 94 | CHECKED_QUERY("create table libdrizzle.t1 (a int primary key auto_increment, b tinyint, c smallint, d mediumint, e int, f bigint, g float, h double)"); | 94 | CHECKED_QUERY("create table test_numbers.t1 (a int primary key auto_increment, b tinyint, c smallint, d mediumint, e int, f bigint, g float, h double)"); |
| 326 | 95 | 95 | ||
| 327 | 96 | /* Insert rows with pk 1 and 2 */ | 96 | /* Insert rows with pk 1 and 2 */ |
| 329 | 97 | CHECKED_QUERY("insert into libdrizzle.t1 (b,c,d,e,f,g,h) values (1,1,1,1,1,1,1), (127,32687,8388351,2147352575,9222246136947920895,443664,291.2711110711098);"); | 97 | CHECKED_QUERY("insert into test_numbers.t1 (b,c,d,e,f,g,h) values (1,1,1,1,1,1,1), (127,32687,8388351,2147352575,9222246136947920895,443664,291.2711110711098);"); |
| 330 | 98 | ASSERT_EQ(drizzle_result_affected_rows(result), 2); | 98 | ASSERT_EQ(drizzle_result_affected_rows(result), 2); |
| 331 | 99 | 99 | ||
| 332 | 100 | /* Insert row with pk 3 */ | 100 | /* Insert row with pk 3 */ |
| 334 | 101 | CHECKED_QUERY("insert into libdrizzle.t1 (b,c,d,e,f,g,h) ( select 0-b, 0-c, 0-d, 0-e, 0-f, g+1.015625, h+1 from t1 where a = 2 );"); | 101 | CHECKED_QUERY("insert into test_numbers.t1 (b,c,d,e,f,g,h) ( select 0-b, 0-c, 0-d, 0-e, 0-f, g+1.015625, h+1 from t1 where a = 2 );"); |
| 335 | 102 | ASSERT_EQ(drizzle_result_affected_rows(result), 1); | 102 | ASSERT_EQ(drizzle_result_affected_rows(result), 1); |
| 336 | 103 | 103 | ||
| 337 | 104 | /* Insert row with pk 4 - test marshaling values we transmit */ | 104 | /* Insert row with pk 4 - test marshaling values we transmit */ |
| 339 | 105 | query = "insert into libdrizzle.t1 (b,c,d,e,f,g,h) values (?,?,?,?,?,?,?)"; | 105 | query = "insert into test_numbers.t1 (b,c,d,e,f,g,h) values (?,?,?,?,?,?,?)"; |
| 340 | 106 | sth = drizzle_stmt_prepare(con, query, strlen(query), &driz_ret); | 106 | sth = drizzle_stmt_prepare(con, query, strlen(query), &driz_ret); |
| 341 | 107 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), query); | 107 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), query); |
| 342 | 108 | CHECK(drizzle_stmt_set_tiny(sth, 0, 127, 0)); | 108 | CHECK(drizzle_stmt_set_tiny(sth, 0, 127, 0)); |
| 343 | @@ -121,7 +121,7 @@ | |||
| 344 | 121 | /* TODO: Also send some negative values of each type */ | 121 | /* TODO: Also send some negative values of each type */ |
| 345 | 122 | 122 | ||
| 346 | 123 | /* Read the table back, with values sent over the wire in text form */ | 123 | /* Read the table back, with values sent over the wire in text form */ |
| 348 | 124 | CHECKED_QUERY("select * from libdrizzle.t1 order by b, a"); | 124 | CHECKED_QUERY("select * from test_numbers.t1 order by b, a"); |
| 349 | 125 | 125 | ||
| 350 | 126 | drizzle_result_buffer(result); | 126 | drizzle_result_buffer(result); |
| 351 | 127 | num_fields= drizzle_result_column_count(result); | 127 | num_fields= drizzle_result_column_count(result); |
| 352 | @@ -147,7 +147,7 @@ | |||
| 353 | 147 | while ((column= drizzle_column_next(result))) | 147 | while ((column= drizzle_column_next(result))) |
| 354 | 148 | { | 148 | { |
| 355 | 149 | cur_column++; | 149 | cur_column++; |
| 357 | 150 | ASSERT_EQ_(strcmp(drizzle_column_db(column), "libdrizzle"), 0, "Column has bad DB name"); | 150 | ASSERT_EQ_(strcmp(drizzle_column_db(column), "test_numbers"), 0, "Column has bad DB name"); |
| 358 | 151 | ASSERT_EQ_(strcmp(drizzle_column_table(column), "t1"), 0, "Column had bad table name"); | 151 | ASSERT_EQ_(strcmp(drizzle_column_table(column), "t1"), 0, "Column had bad table name"); |
| 359 | 152 | ASSERT_EQ(drizzle_column_current(result), cur_column); | 152 | ASSERT_EQ(drizzle_column_current(result), cur_column); |
| 360 | 153 | ASSERT_STREQ(drizzle_column_name(column), column_names[cur_column]); | 153 | ASSERT_STREQ(drizzle_column_name(column), column_names[cur_column]); |
| 361 | @@ -187,7 +187,7 @@ | |||
| 362 | 187 | drizzle_result_free(result); | 187 | drizzle_result_free(result); |
| 363 | 188 | 188 | ||
| 364 | 189 | /* Read the table back, with values sent over the wire in binary form */ | 189 | /* Read the table back, with values sent over the wire in binary form */ |
| 366 | 190 | query = "select a,b,c,d,e,f,g,h from libdrizzle.t1"; | 190 | query = "select a,b,c,d,e,f,g,h from test_numbers.t1"; |
| 367 | 191 | sth = drizzle_stmt_prepare(con, query, strlen(query), &driz_ret); | 191 | sth = drizzle_stmt_prepare(con, query, strlen(query), &driz_ret); |
| 368 | 192 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), query); | 192 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s, preparing \"%s\"", drizzle_strerror(driz_ret), drizzle_error(con), query); |
| 369 | 193 | driz_ret = drizzle_stmt_execute(sth); | 193 | driz_ret = drizzle_stmt_execute(sth); |
| 370 | @@ -317,10 +317,10 @@ | |||
| 371 | 317 | driz_ret = drizzle_stmt_close(sth); | 317 | driz_ret = drizzle_stmt_close(sth); |
| 372 | 318 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s", drizzle_strerror(driz_ret), drizzle_error(con)); | 318 | ASSERT_EQ_(driz_ret, DRIZZLE_RETURN_OK, "Error (%s): %s", drizzle_strerror(driz_ret), drizzle_error(con)); |
| 373 | 319 | 319 | ||
| 376 | 320 | drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &driz_ret); | 320 | drizzle_query(con, "DROP TABLE test_numbers.t1", 0, &driz_ret); |
| 377 | 321 | ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "DROP TABLE libdrizzle.t1"); | 321 | ASSERT_EQ_(DRIZZLE_RETURN_OK, driz_ret, "DROP TABLE test_numbers.t1"); |
| 378 | 322 | 322 | ||
| 380 | 323 | tear_down_schema(); | 323 | tear_down_schema("test_numbers"); |
| 381 | 324 | 324 | ||
| 382 | 325 | return EXIT_SUCCESS; | 325 | return EXIT_SUCCESS; |
| 383 | 326 | } | 326 | } |
| 384 | 327 | 327 | ||
| 385 | === modified file 'tests/unit/query.c' | |||
| 386 | --- tests/unit/query.c 2013-03-04 22:11:55 +0000 | |||
| 387 | +++ tests/unit/query.c 2013-04-26 19:01:27 +0000 | |||
| 388 | @@ -68,28 +68,28 @@ | |||
| 389 | 68 | } | 68 | } |
| 390 | 69 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret)); | 69 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret)); |
| 391 | 70 | 70 | ||
| 400 | 71 | CHECKED_QUERY("DROP SCHEMA IF EXISTS libdrizzle"); | 71 | CHECKED_QUERY("DROP SCHEMA IF EXISTS test_query"); |
| 401 | 72 | 72 | ||
| 402 | 73 | CHECKED_QUERY("CREATE SCHEMA libdrizzle"); | 73 | CHECKED_QUERY("CREATE SCHEMA test_query"); |
| 403 | 74 | 74 | ||
| 404 | 75 | ret= drizzle_select_db(con, "libdrizzle"); | 75 | ret= drizzle_select_db(con, "test_query"); |
| 405 | 76 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle"); | 76 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE test_query"); |
| 406 | 77 | 77 | ||
| 407 | 78 | drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret); | 78 | drizzle_query(con, "create table test_query.t1 (a int)", 0, &ret); |
| 408 | 79 | if (ret != DRIZZLE_RETURN_OK) | 79 | if (ret != DRIZZLE_RETURN_OK) |
| 409 | 80 | { | 80 | { |
| 410 | 81 | printf("Create table failure\n"); | 81 | printf("Create table failure\n"); |
| 411 | 82 | return EXIT_FAILURE; | 82 | return EXIT_FAILURE; |
| 412 | 83 | } | 83 | } |
| 413 | 84 | 84 | ||
| 415 | 85 | drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret); | 85 | drizzle_query(con, "insert into test_query.t1 values (1),(2),(3)", 0, &ret); |
| 416 | 86 | if (ret != DRIZZLE_RETURN_OK) | 86 | if (ret != DRIZZLE_RETURN_OK) |
| 417 | 87 | { | 87 | { |
| 418 | 88 | printf("Insert failure\n"); | 88 | printf("Insert failure\n"); |
| 419 | 89 | return EXIT_FAILURE; | 89 | return EXIT_FAILURE; |
| 420 | 90 | } | 90 | } |
| 421 | 91 | 91 | ||
| 423 | 92 | drizzle_result_st *result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret); | 92 | drizzle_result_st *result= drizzle_query(con, "select * from test_query.t1", 0, &ret); |
| 424 | 93 | if (ret != DRIZZLE_RETURN_OK) | 93 | if (ret != DRIZZLE_RETURN_OK) |
| 425 | 94 | { | 94 | { |
| 426 | 95 | printf("Select failure\n"); | 95 | printf("Select failure\n"); |
| 427 | @@ -124,11 +124,11 @@ | |||
| 428 | 124 | 124 | ||
| 429 | 125 | drizzle_result_free(result); | 125 | drizzle_result_free(result); |
| 430 | 126 | 126 | ||
| 433 | 127 | drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret); | 127 | drizzle_query(con, "DROP TABLE test_query.t1", 0, &ret); |
| 434 | 128 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1"); | 128 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE test_query.t1"); |
| 435 | 129 | 129 | ||
| 438 | 130 | drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret); | 130 | drizzle_query(con, "DROP SCHEMA IF EXISTS test_query", 0, &ret); |
| 439 | 131 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con)); | 131 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA test_query (%s)", drizzle_error(con)); |
| 440 | 132 | 132 | ||
| 441 | 133 | ret= drizzle_quit(con); | 133 | ret= drizzle_quit(con); |
| 442 | 134 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret)); | 134 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret)); |
| 443 | 135 | 135 | ||
| 444 | === modified file 'tests/unit/row.c' | |||
| 445 | --- tests/unit/row.c 2013-01-27 09:48:19 +0000 | |||
| 446 | +++ tests/unit/row.c 2013-04-26 19:01:27 +0000 | |||
| 447 | @@ -66,30 +66,30 @@ | |||
| 448 | 66 | } | 66 | } |
| 449 | 67 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret)); | 67 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret)); |
| 450 | 68 | 68 | ||
| 461 | 69 | drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret); | 69 | drizzle_query(con, "DROP SCHEMA IF EXISTS test_row", 0, &ret); |
| 462 | 70 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con)); | 70 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_row (%s)", drizzle_error(con)); |
| 463 | 71 | 71 | ||
| 464 | 72 | drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret); | 72 | drizzle_query(con, "CREATE SCHEMA test_row", 0, &ret); |
| 465 | 73 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con)); | 73 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_row (%s)", drizzle_error(con)); |
| 466 | 74 | 74 | ||
| 467 | 75 | ret= drizzle_select_db(con, "libdrizzle"); | 75 | ret= drizzle_select_db(con, "test_row"); |
| 468 | 76 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle"); | 76 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE test_row"); |
| 469 | 77 | 77 | ||
| 470 | 78 | drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret); | 78 | drizzle_query(con, "create table test_row.t1 (a int)", 0, &ret); |
| 471 | 79 | if (ret != DRIZZLE_RETURN_OK) | 79 | if (ret != DRIZZLE_RETURN_OK) |
| 472 | 80 | { | 80 | { |
| 473 | 81 | printf("Create table failure\n"); | 81 | printf("Create table failure\n"); |
| 474 | 82 | return EXIT_FAILURE; | 82 | return EXIT_FAILURE; |
| 475 | 83 | } | 83 | } |
| 476 | 84 | 84 | ||
| 478 | 85 | drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret); | 85 | drizzle_query(con, "insert into test_row.t1 values (1),(2),(3)", 0, &ret); |
| 479 | 86 | if (ret != DRIZZLE_RETURN_OK) | 86 | if (ret != DRIZZLE_RETURN_OK) |
| 480 | 87 | { | 87 | { |
| 481 | 88 | printf("Insert failure\n"); | 88 | printf("Insert failure\n"); |
| 482 | 89 | return EXIT_FAILURE; | 89 | return EXIT_FAILURE; |
| 483 | 90 | } | 90 | } |
| 484 | 91 | 91 | ||
| 486 | 92 | drizzle_result_st *result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret); | 92 | drizzle_result_st *result= drizzle_query(con, "select * from test_row.t1", 0, &ret); |
| 487 | 93 | if (ret != DRIZZLE_RETURN_OK) | 93 | if (ret != DRIZZLE_RETURN_OK) |
| 488 | 94 | { | 94 | { |
| 489 | 95 | printf("Select failure\n"); | 95 | printf("Select failure\n"); |
| 490 | @@ -148,11 +148,11 @@ | |||
| 491 | 148 | 148 | ||
| 492 | 149 | drizzle_result_free(result); | 149 | drizzle_result_free(result); |
| 493 | 150 | 150 | ||
| 496 | 151 | drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret); | 151 | drizzle_query(con, "DROP TABLE test_row.t1", 0, &ret); |
| 497 | 152 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1"); | 152 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE test_row.t1"); |
| 498 | 153 | 153 | ||
| 501 | 154 | drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret); | 154 | drizzle_query(con, "DROP SCHEMA IF EXISTS test_row", 0, &ret); |
| 502 | 155 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con)); | 155 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA test_row (%s)", drizzle_error(con)); |
| 503 | 156 | 156 | ||
| 504 | 157 | ret= drizzle_quit(con); | 157 | ret= drizzle_quit(con); |
| 505 | 158 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret)); | 158 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret)); |
| 506 | 159 | 159 | ||
| 507 | === modified file 'tests/unit/statement.c' | |||
| 508 | --- tests/unit/statement.c 2013-02-27 19:08:06 +0000 | |||
| 509 | +++ tests/unit/statement.c 2013-04-26 19:01:27 +0000 | |||
| 510 | @@ -70,22 +70,22 @@ | |||
| 511 | 70 | } | 70 | } |
| 512 | 71 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret)); | 71 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret)); |
| 513 | 72 | 72 | ||
| 527 | 73 | drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret); | 73 | drizzle_query(con, "DROP SCHEMA IF EXISTS test_stmt", 0, &ret); |
| 528 | 74 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con)); | 74 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_stmt (%s)", drizzle_error(con)); |
| 529 | 75 | 75 | ||
| 530 | 76 | drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret); | 76 | drizzle_query(con, "CREATE SCHEMA test_stmt", 0, &ret); |
| 531 | 77 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con)); | 77 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_stmt (%s)", drizzle_error(con)); |
| 532 | 78 | 78 | ||
| 533 | 79 | ret= drizzle_select_db(con, "libdrizzle"); | 79 | ret= drizzle_select_db(con, "test_stmt"); |
| 534 | 80 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle"); | 80 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE test_stmt"); |
| 535 | 81 | 81 | ||
| 536 | 82 | drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret); | 82 | drizzle_query(con, "create table test_stmt.t1 (a int)", 0, &ret); |
| 537 | 83 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "create table libdrizzle.t1 (a int): %s", drizzle_error(con)); | 83 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "create table test_stmt.t1 (a int): %s", drizzle_error(con)); |
| 538 | 84 | 84 | ||
| 539 | 85 | drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret); | 85 | drizzle_query(con, "insert into test_stmt.t1 values (1),(2),(3)", 0, &ret); |
| 540 | 86 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con)); | 86 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con)); |
| 541 | 87 | 87 | ||
| 543 | 88 | const char *query= "select * from libdrizzle.t1 where a > ?"; | 88 | const char *query= "select * from test_stmt.t1 where a > ?"; |
| 544 | 89 | stmt= drizzle_stmt_prepare(con, query, strlen(query), &ret); | 89 | stmt= drizzle_stmt_prepare(con, query, strlen(query), &ret); |
| 545 | 90 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con)); | 90 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con)); |
| 546 | 91 | 91 | ||
| 547 | @@ -146,11 +146,11 @@ | |||
| 548 | 146 | ret = drizzle_stmt_close(stmt); | 146 | ret = drizzle_stmt_close(stmt); |
| 549 | 147 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con)); | 147 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con)); |
| 550 | 148 | 148 | ||
| 553 | 149 | drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret); | 149 | drizzle_query(con, "DROP TABLE test_stmt.t1", 0, &ret); |
| 554 | 150 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1"); | 150 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE test_stmt.t1"); |
| 555 | 151 | 151 | ||
| 558 | 152 | drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret); | 152 | drizzle_query(con, "DROP SCHEMA IF EXISTS test_stmt", 0, &ret); |
| 559 | 153 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con)); | 153 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA test_stmt (%s)", drizzle_error(con)); |
| 560 | 154 | 154 | ||
| 561 | 155 | ret= drizzle_quit(con); | 155 | ret= drizzle_quit(con); |
| 562 | 156 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret)); | 156 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret)); |
| 563 | 157 | 157 | ||
| 564 | === modified file 'tests/unit/statement_char.c' | |||
| 565 | --- tests/unit/statement_char.c 2013-01-27 09:48:19 +0000 | |||
| 566 | +++ tests/unit/statement_char.c 2013-04-26 19:01:27 +0000 | |||
| 567 | @@ -70,22 +70,22 @@ | |||
| 568 | 70 | } | 70 | } |
| 569 | 71 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret)); | 71 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret)); |
| 570 | 72 | 72 | ||
| 584 | 73 | drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret); | 73 | drizzle_query(con, "DROP SCHEMA IF EXISTS test_stmt_ch", 0, &ret); |
| 585 | 74 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con)); | 74 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_stmt_ch (%s)", drizzle_error(con)); |
| 586 | 75 | 75 | ||
| 587 | 76 | drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret); | 76 | drizzle_query(con, "CREATE SCHEMA test_stmt_ch", 0, &ret); |
| 588 | 77 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con)); | 77 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_stmt_ch (%s)", drizzle_error(con)); |
| 589 | 78 | 78 | ||
| 590 | 79 | ret= drizzle_select_db(con, "libdrizzle"); | 79 | ret= drizzle_select_db(con, "test_stmt_ch"); |
| 591 | 80 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle"); | 80 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE test_stmt_ch"); |
| 592 | 81 | 81 | ||
| 593 | 82 | drizzle_query(con, "create table libdrizzle.t1 (a varchar(50))", 0, &ret); | 82 | drizzle_query(con, "create table test_stmt_ch.t1 (a varchar(50))", 0, &ret); |
| 594 | 83 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "create table libdrizzle.t1 (a int): %s", drizzle_error(con)); | 83 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "create table test_stmt_ch.t1 (a int): %s", drizzle_error(con)); |
| 595 | 84 | 84 | ||
| 596 | 85 | drizzle_query(con, "insert into libdrizzle.t1 values ('hello'),('drizzle'),('people')", 0, &ret); | 85 | drizzle_query(con, "insert into test_stmt_ch.t1 values ('hello'),('drizzle'),('people')", 0, &ret); |
| 597 | 86 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con)); | 86 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con)); |
| 598 | 87 | 87 | ||
| 600 | 88 | const char *query= "select * from libdrizzle.t1 where a = ?"; | 88 | const char *query= "select * from test_stmt_ch.t1 where a = ?"; |
| 601 | 89 | stmt= drizzle_stmt_prepare(con, query, strlen(query), &ret); | 89 | stmt= drizzle_stmt_prepare(con, query, strlen(query), &ret); |
| 602 | 90 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con)); | 90 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con)); |
| 603 | 91 | 91 | ||
| 604 | @@ -141,11 +141,11 @@ | |||
| 605 | 141 | ret = drizzle_stmt_close(stmt); | 141 | ret = drizzle_stmt_close(stmt); |
| 606 | 142 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_stmt_close() %s", drizzle_error(con)); | 142 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_stmt_close() %s", drizzle_error(con)); |
| 607 | 143 | 143 | ||
| 610 | 144 | drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret); | 144 | drizzle_query(con, "DROP TABLE test_stmt_ch.t1", 0, &ret); |
| 611 | 145 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1"); | 145 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE test_stmt_ch.t1"); |
| 612 | 146 | 146 | ||
| 615 | 147 | drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret); | 147 | drizzle_query(con, "DROP SCHEMA IF EXISTS test_stmt_ch", 0, &ret); |
| 616 | 148 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con)); | 148 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA test_stmt_ch (%s)", drizzle_error(con)); |
| 617 | 149 | 149 | ||
| 618 | 150 | ret= drizzle_quit(con); | 150 | ret= drizzle_quit(con); |
| 619 | 151 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret)); | 151 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret)); |
| 620 | 152 | 152 | ||
| 621 | === modified file 'tests/unit/unbuffered_query.c' | |||
| 622 | --- tests/unit/unbuffered_query.c 2013-01-27 09:48:19 +0000 | |||
| 623 | +++ tests/unit/unbuffered_query.c 2013-04-26 19:01:27 +0000 | |||
| 624 | @@ -66,30 +66,30 @@ | |||
| 625 | 66 | } | 66 | } |
| 626 | 67 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret)); | 67 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_connect(): %s(%s)", drizzle_error(con), drizzle_strerror(ret)); |
| 627 | 68 | 68 | ||
| 638 | 69 | drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret); | 69 | drizzle_query(con, "DROP SCHEMA IF EXISTS test_unbuff", 0, &ret); |
| 639 | 70 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con)); | 70 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_unbuff (%s)", drizzle_error(con)); |
| 640 | 71 | 71 | ||
| 641 | 72 | drizzle_query(con, "CREATE SCHEMA libdrizzle", 0, &ret); | 72 | drizzle_query(con, "CREATE SCHEMA test_unbuff", 0, &ret); |
| 642 | 73 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA libdrizzle (%s)", drizzle_error(con)); | 73 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "CREATE SCHEMA test_unbuff (%s)", drizzle_error(con)); |
| 643 | 74 | 74 | ||
| 644 | 75 | ret= drizzle_select_db(con, "libdrizzle"); | 75 | ret= drizzle_select_db(con, "test_unbuff"); |
| 645 | 76 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE libdrizzle"); | 76 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "USE test_unbuff"); |
| 646 | 77 | 77 | ||
| 647 | 78 | drizzle_query(con, "create table libdrizzle.t1 (a int)", 0, &ret); | 78 | drizzle_query(con, "create table test_unbuff.t1 (a int)", 0, &ret); |
| 648 | 79 | if (ret != DRIZZLE_RETURN_OK) | 79 | if (ret != DRIZZLE_RETURN_OK) |
| 649 | 80 | { | 80 | { |
| 650 | 81 | printf("Create table failure\n"); | 81 | printf("Create table failure\n"); |
| 651 | 82 | return EXIT_FAILURE; | 82 | return EXIT_FAILURE; |
| 652 | 83 | } | 83 | } |
| 653 | 84 | 84 | ||
| 655 | 85 | drizzle_query(con, "insert into libdrizzle.t1 values (1),(2),(3)", 0, &ret); | 85 | drizzle_query(con, "insert into test_unbuff.t1 values (1),(2),(3)", 0, &ret); |
| 656 | 86 | if (ret != DRIZZLE_RETURN_OK) | 86 | if (ret != DRIZZLE_RETURN_OK) |
| 657 | 87 | { | 87 | { |
| 658 | 88 | printf("Insert failure\n"); | 88 | printf("Insert failure\n"); |
| 659 | 89 | return EXIT_FAILURE; | 89 | return EXIT_FAILURE; |
| 660 | 90 | } | 90 | } |
| 661 | 91 | 91 | ||
| 663 | 92 | drizzle_result_st *result= drizzle_query(con, "select * from libdrizzle.t1", 0, &ret); | 92 | drizzle_result_st *result= drizzle_query(con, "select * from test_unbuff.t1", 0, &ret); |
| 664 | 93 | if (ret != DRIZZLE_RETURN_OK) | 93 | if (ret != DRIZZLE_RETURN_OK) |
| 665 | 94 | { | 94 | { |
| 666 | 95 | printf("Select failure\n"); | 95 | printf("Select failure\n"); |
| 667 | @@ -142,11 +142,11 @@ | |||
| 668 | 142 | 142 | ||
| 669 | 143 | drizzle_result_free(result); | 143 | drizzle_result_free(result); |
| 670 | 144 | 144 | ||
| 673 | 145 | drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret); | 145 | drizzle_query(con, "DROP TABLE test_unbuff.t1", 0, &ret); |
| 674 | 146 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1"); | 146 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE test_unbuff.t1"); |
| 675 | 147 | 147 | ||
| 678 | 148 | drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret); | 148 | drizzle_query(con, "DROP SCHEMA IF EXISTS test_unbuff", 0, &ret); |
| 679 | 149 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con)); | 149 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA test_unbuff (%s)", drizzle_error(con)); |
| 680 | 150 | 150 | ||
| 681 | 151 | ret= drizzle_quit(con); | 151 | ret= drizzle_quit(con); |
| 682 | 152 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret)); | 152 | ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret)); |
