diff --git a/src/box/bind.c b/src/box/bind.c index 5aa79751aa0a61e338e1c72fd112cc78d46d2a71..f15915377f319511f99d1d1afe0f26bb6ebbab7b 100644 --- a/src/box/bind.c +++ b/src/box/bind.c @@ -98,9 +98,8 @@ sql_bind_decode(struct sql_bind *bind, int i, const char **packet) bind->bytes = 1; break; case MP_BOOL: - /* sql doesn't support boolean. Use int instead. */ - bind->i64 = mp_decode_bool(packet) ? 1 : 0; - bind->bytes = sizeof(bind->i64); + bind->b = mp_decode_bool(packet); + bind->bytes = sizeof(bind->b); break; case MP_BIN: bind->s = mp_decode_bin(packet, &bind->bytes); @@ -175,9 +174,11 @@ sql_bind_column(struct sql_stmt *stmt, const struct sql_bind *p, switch (p->type) { case MP_INT: case MP_UINT: - case MP_BOOL: rc = sql_bind_int64(stmt, pos, p->i64); break; + case MP_BOOL: + rc = sql_bind_boolean(stmt, pos, p->b); + break; case MP_DOUBLE: case MP_FLOAT: rc = sql_bind_double(stmt, pos, p->d); diff --git a/src/box/bind.h b/src/box/bind.h index a915381e441b4681c11480d74cc7248377389a47..d9823431e677e49400632c5c7e6b3fec0fd347fa 100644 --- a/src/box/bind.h +++ b/src/box/bind.h @@ -61,6 +61,7 @@ struct sql_bind { enum mp_type type; /** Bind value. */ union { + bool b; double d; int64_t i64; /** For string or blob. */ diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index 76ea9fb17737c85f4d34c494bd872d9f838690c8..997a46535402f8c45da5ed14b491cd46db87fc13 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -888,6 +888,17 @@ sql_bind_blob64(sql_stmt *, int, const void *, int sql_bind_double(sql_stmt *, int, double); +/** + * Perform boolean parameter binding for the prepared sql + * statement. + * @param stmt Prepared statement. + * @param i Index of the variable to be binded. + * @param value Boolean value to use. + * @retval 0 On Success, not 0 otherwise. + */ +int +sql_bind_boolean(struct sql_stmt *stmt, int i, bool value); + int sql_bind_int(sql_stmt *, int, int); diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 4175f7e86dfa64bb99180ac8a3e6a17fef8efd31..d2868567be7ac0f7a6fbfe805d03e4cbdbfa80fb 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -1348,6 +1348,18 @@ sql_bind_double(sql_stmt * pStmt, int i, double rValue) return rc; } +int +sql_bind_boolean(struct sql_stmt *stmt, int i, bool value) +{ + struct Vdbe *p = (struct Vdbe *) stmt; + int rc = vdbeUnbind(p, i); + if (rc == SQL_OK) { + rc = sql_bind_type(p, i, "BOOLEAN"); + mem_set_bool(&p->aVar[i - 1], value); + } + return rc; +} + int sql_bind_int(sql_stmt * p, int i, int iValue) { diff --git a/test/sql/bind.result b/test/sql/bind.result index f1d3cd4d4caeae930114e998704aceae77e82cb4..076bf8319e51e2d559c25ec4e60a88b97ff92dbc 100644 --- a/test/sql/bind.result +++ b/test/sql/bind.result @@ -176,11 +176,11 @@ execute('SELECT ?, ?, ?, ?, ?', {'abc', -123.456, msgpack.NULL, true, false}) - name: '?' type: BOOLEAN - name: '?' - type: INTEGER + type: BOOLEAN - name: '?' - type: INTEGER + type: BOOLEAN rows: - - ['abc', -123.456, null, 1, 0] + - ['abc', -123.456, null, true, false] ... -- Try to replace '?' in meta with something meaningful. execute('SELECT ? AS kek, ? AS kek2', {1, 2}) diff --git a/test/sql/types.result b/test/sql/types.result index 8f442dc7d67d8dbc98bb43f56ad3353f13345691..bc4518c0106d3f80e55babb27496f688fc830fad 100644 --- a/test/sql/types.result +++ b/test/sql/types.result @@ -888,3 +888,12 @@ box.execute('SELECT \'9223372036854\' + 1;') rows: - [9223372036855] ... +-- Fix BOOLEAN bindings. +box.execute('SELECT ?', {true}) +--- +- metadata: + - name: '?' + type: BOOLEAN + rows: + - [true] +... diff --git a/test/sql/types.test.lua b/test/sql/types.test.lua index 48c9bde108baaa25889c8e3c6313d1d3dcf02a1b..c51660cb9fdb9418290326fa8c9175b1419ec153 100644 --- a/test/sql/types.test.lua +++ b/test/sql/types.test.lua @@ -213,3 +213,6 @@ box.space.T1:drop() box.execute('SELECT 1 + 1;') box.execute('SELECT 1 + 1.1;') box.execute('SELECT \'9223372036854\' + 1;') + +-- Fix BOOLEAN bindings. +box.execute('SELECT ?', {true})