Skip to content

Commit 8bdfa70

Browse files
committed
Re-added dbutils_select used in unit test and fixed unit.c
1 parent 32156be commit 8bdfa70

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

src/dbutils.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,14 @@ int dbutils_blob_int_int_select (sqlite3 *db, const char *sql, char **blob, int
198198
return results[0].rc;
199199
}
200200

201+
sqlite3_int64 dbutils_select (sqlite3 *db, const char *sql, const char **values, int types[], int lens[], int count, int expected_type) {
202+
// used only in unit-test
203+
DATABASE_RESULT results[1] = {0};
204+
int expected_types[1] = {expected_type};
205+
dbutils_exec(NULL, db, sql, values, types, lens, count, results, expected_types, 1);
206+
return results[0].value.intValue;
207+
}
208+
201209
// MARK: -
202210

203211
// compares two SQLite values and returns an integer indicating the comparison result

test/unit.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -921,8 +921,8 @@ bool do_test_vtab(sqlite3 *db) {
921921
}
922922

923923
bool do_test_functions (sqlite3 *db, bool print_results) {
924-
int size = 0;
925-
char *site_id = dbutils_blob_select(db, "SELECT cloudsync_siteid();", &size);
924+
int size = 0, rc2;
925+
char *site_id = dbutils_blob_select(db, "SELECT cloudsync_siteid();", &size, NULL, &rc2);
926926
if (site_id == NULL || size != 16) goto abort_test_functions;
927927
cloudsync_memory_free(site_id);
928928

@@ -3042,8 +3042,8 @@ bool do_test_network_encode_decode (int nclients, bool print_result, bool cleanu
30423042
for (int j=0; j<nclients; ++j) {
30433043
if (target == j) continue;
30443044

3045-
int blob_size = 0;
3046-
char *blob = dbutils_blob_select (db[target], src_sql, &blob_size);
3045+
int blob_size = 0, rc;
3046+
char *blob = dbutils_blob_select (db[target], src_sql, &blob_size, NULL, &rc);
30473047
if (!blob) goto finalize;
30483048

30493049
const char *values[] = {blob};

0 commit comments

Comments
 (0)