[tarantool-patches] [PATCH 6/9] sql: make comparison predicate return boolean

[Nikita Pettik <korablev@tarantool.org>]

According to ANSI SQL result of comparison predicates must be BOOLEAN.
Before introduction of BOOLEAN type they returned 0 and 1. Now we can
change those values to false and true respectively.

Part of #3723
---
 src/box/sql/expr.c                    |  1 +
 src/box/sql/vdbe.c                    |  4 ++--
 test/sql-tap/aggnested.test.lua       | 10 +++++-----
 test/sql-tap/identifier_case.test.lua | 10 +++++-----
 test/sql-tap/tkt3346.test.lua         |  2 +-
 test/sql/types.result                 | 20 ++++++++++----------
 6 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c
index 09ebdba66..e4de472a8 100644
--- a/src/box/sql/expr.c
+++ b/src/box/sql/expr.c
@@ -102,6 +102,7 @@ sql_expr_type(struct Expr *pExpr)
 	case TK_EQ:
 	case TK_LE:
 	case TK_NE:
+		return FIELD_TYPE_BOOLEAN;
 	case TK_NOT:
 	case TK_AND:
 	case TK_OR:
diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c
index 10794b18e..43d4262e5 100644
--- a/src/box/sql/vdbe.c
+++ b/src/box/sql/vdbe.c
@@ -2273,8 +2273,8 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
 			if ((pOp->opcode==OP_Eq)==res2) break;
 		}
 		memAboutToChange(p, pOut);
-		MemSetTypeFlag(pOut, MEM_Int);
-		pOut->u.i = res2;
+		MemSetTypeFlag(pOut, MEM_Bool);
+		pOut->u.b = res2;
 		REGISTER_TRACE(pOp->p2, pOut);
 	} else {
 		VdbeBranchTaken(res!=0, (pOp->p5 & SQL_NULLEQ)?2:3);
diff --git a/test/sql-tap/aggnested.test.lua b/test/sql-tap/aggnested.test.lua
index 656576b70..67a9ba891 100755
--- a/test/sql-tap/aggnested.test.lua
+++ b/test/sql-tap/aggnested.test.lua
@@ -180,7 +180,7 @@ test:do_execsql_test("aggnested-3.2",
         );
         INSERT INTO t2 VALUES(1);
         SELECT
-         (SELECT sum(value2==xyz) FROM t2)
+         (SELECT sum(xyz) FROM t2 where xyz = value2)
         FROM
          (SELECT value1 as xyz, max(x1) AS pqr
             FROM t1
@@ -207,7 +207,7 @@ test:do_execsql_test("aggnested-3.2-2",
         );
         INSERT INTO t2 VALUES(1);
         SELECT
-         (SELECT sum(value2<>xyz) FROM t2)
+         (SELECT sum(xyz) FROM t2 where xyz <> value2)
         FROM
          (SELECT value1 as xyz, max(x1) AS pqr
             FROM t1
@@ -215,7 +215,7 @@ test:do_execsql_test("aggnested-3.2-2",
     ]],
     {
         -- <aggnested-3.2>
-        0
+        ""
         -- </aggnested-3.2>
     })
 
@@ -227,13 +227,13 @@ test:do_execsql_test("aggnested-3.3",
         INSERT INTO t1 VALUES(4469,2),(4469,1);
         CREATE TABLE t2 (value2 INT PRIMARY KEY);
         INSERT INTO t2 VALUES(1);
-        SELECT (SELECT sum(value2=value1) FROM t2), max(value1)
+        SELECT (SELECT sum(value1) FROM t2 where value1=value2), max(value1)
           FROM t1
          GROUP BY id1;
     ]],
     {
         -- <aggnested-3.3>
-        0, 2
+        "", 2
         -- </aggnested-3.3>
     })
 
diff --git a/test/sql-tap/identifier_case.test.lua b/test/sql-tap/identifier_case.test.lua
index 9c800dd2c..06be7a3dd 100755
--- a/test/sql-tap/identifier_case.test.lua
+++ b/test/sql-tap/identifier_case.test.lua
@@ -239,14 +239,14 @@ test:do_catchsql_test(
 
 data = {
     { 1,  [[ 'a' < 'b' collate binary ]], {1, "Collation 'BINARY' does not exist"}},
-    { 2,  [[ 'a' < 'b' collate "binary" ]], {0, {1}}},
+    { 2,  [[ 'a' < 'b' collate "binary" ]], {0, {true}}},
     { 3,  [[ 'a' < 'b' collate 'binary' ]], {1, [[Syntax error near ''binary'']]}},
-    { 4,  [[ 'a' < 'b' collate "unicode" ]], {0, {1}}},
-    { 5,  [[ 5 < 'b' collate "unicode" ]], {0, {1}}},
+    { 4,  [[ 'a' < 'b' collate "unicode" ]], {0, {true}}},
+    { 5,  [[ 5 < 'b' collate "unicode" ]], {0, {true}}},
     { 6,  [[ 5 < 'b' collate unicode ]], {1,"Collation 'UNICODE' does not exist"}},
-    { 7,  [[ 5 < 'b' collate "unicode_ci" ]], {0, {1}}},
+    { 7,  [[ 5 < 'b' collate "unicode_ci" ]], {0, {true}}},
     { 8,  [[ 5 < 'b' collate NONE ]], {1, "Collation 'NONE' does not exist"}},
-    { 9,  [[ 5 < 'b' collate "none" ]], {0, {1}}},
+    { 9,  [[ 5 < 'b' collate "none" ]], {0, {true}}},
 }
 
 for _, row in ipairs(data) do
diff --git a/test/sql-tap/tkt3346.test.lua b/test/sql-tap/tkt3346.test.lua
index 269a34f69..ce57a2db0 100755
--- a/test/sql-tap/tkt3346.test.lua
+++ b/test/sql-tap/tkt3346.test.lua
@@ -42,7 +42,7 @@ test:do_test(
     function()
         return test:execsql [[
             SELECT b FROM (SELECT a,b FROM t1) AS x
-             WHERE (SELECT y FROM (SELECT x.b='alice' AS y))=0
+             WHERE (SELECT y FROM (SELECT x.b='alice' AS y))=false
         ]]
     end, {
         -- <tkt3346-1.2>
diff --git a/test/sql/types.result b/test/sql/types.result
index 6bccd39ef..d6c81bed1 100644
--- a/test/sql/types.result
+++ b/test/sql/types.result
@@ -277,39 +277,39 @@ box.execute("SELECT true = false;")
 ---
 - metadata:
   - name: true = false
-    type: integer
+    type: boolean
   rows:
-  - [0]
+  - [false]
 ...
 box.execute("SELECT true = true;")
 ---
 - metadata:
   - name: true = true
-    type: integer
+    type: boolean
   rows:
-  - [1]
+  - [true]
 ...
 box.execute("SELECT true > false;")
 ---
 - metadata:
   - name: true > false
-    type: integer
+    type: boolean
   rows:
-  - [1]
+  - [true]
 ...
 box.execute("SELECT true < false;")
 ---
 - metadata:
   - name: true < false
-    type: integer
+    type: boolean
   rows:
-  - [0]
+  - [false]
 ...
 box.execute("SELECT null = true;")
 ---
 - metadata:
   - name: null = true
-    type: integer
+    type: boolean
   rows:
   - [null]
 ...
@@ -317,7 +317,7 @@ box.execute("SELECT unknown = true;")
 ---
 - metadata:
   - name: unknown = true
-    type: integer
+    type: boolean
   rows:
   - [null]
 ...
-- 
2.15.1