[tarantool-patches] [PATCH] sql: bind BLOB value as BLOB not as STRING

[Nikita Pettik]

It is obvious that BLOB (that is value encoded in msgpack with MP_BIN
format) values must be bound as BLOBs, not as strings. Unfortunately,
they were bound as strings, which lead to wrong resulting type
calculations after execution of SQL statement.
---
Branch: https://github.com/tarantool/tarantool/tree/np/blob-type-binding-fix

Note that no test case is provided since there is not way to
force MP_BIN format using facilities of our testing framework.
Originally, bug was found in Java connector.

 src/box/sql/vdbeapi.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c
index d7e89073e..be5c9dff9 100644
--- a/src/box/sql/vdbeapi.c
+++ b/src/box/sql/vdbeapi.c
@@ -1313,11 +1313,20 @@ sql_bind_blob(sql_stmt * pStmt,
 		  int i, const void *zData, int nData, void (*xDel) (void *)
     )
 {
-#ifdef SQL_ENABLE_API_ARMOR
-	if (nData < 0)
-		return SQL_MISUSE;
-#endif
-	return bindText(pStmt, i, zData, nData, xDel);
+	struct Vdbe *p = (Vdbe *) pStmt;
+	int rc = vdbeUnbind(p, i);
+	if (rc == SQL_OK) {
+		if (zData != 0) {
+			struct Mem *var = &p->aVar[i - 1];
+			rc = sqlVdbeMemSetStr(var, zData, nData, 0, xDel);
+			if (rc == SQL_OK)
+				rc = sql_bind_type(p, i, "BLOB");
+			rc = sqlApiExit(p->db, rc);
+		}
+	} else if (xDel != SQL_STATIC && xDel != SQL_TRANSIENT) {
+		xDel((void *)zData);
+	}
+	return rc;
 }
 
 int
@@ -1331,7 +1340,7 @@ sql_bind_blob64(sql_stmt * pStmt,
 	if (nData > 0x7fffffff) {
 		return invokeValueDestructor(zData, xDel, 0);
 	} else {
-		return bindText(pStmt, i, zData, (int)nData, xDel);
+		return sql_bind_blob(pStmt, i, zData, (int)nData, xDel);
 	}
 }
 
-- 
2.15.1