-C Merge\sthe\sfix\sfor\sdetermining\struth\sof\sfloating\spoint\svalues\sfrom\strunk.
-D 2018-02-26T15:31:39.919
+C Refactor\sfor\scorrect\sNULL\shandling\sin\sthe\sIS\sTRUE,\sIS\sFALSE,\sIS\sNOT\sTRUE,\nand\sIS\sNOT\sFALSE\soperators.
+D 2018-02-26T18:49:05.668
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F Makefile.in a2d2fb8d17c39ab5ec52beb27850b903949080848236923f436156b72a958737
F src/dbpage.c 8db4c97f630e7d83f884ea75caf1ffd0988c160e9d530194d93721c80821e0f6
F src/dbstat.c 7a4ba8518b6369ef3600c49cf9c918ad979acba610b2aebef1b656d649b96720
F src/delete.c 20c8788451dc737a967c87ea53ad43544d617f5b57d32ccce8bd52a0daf9e89b
-F src/expr.c 56bfb9937e14c8daf3e94d23ee9c516f35573afcbf973dc2fae2d60405e18862
+F src/expr.c 4344e70a158c0092e0c14c564d352546259297996cba250f1d6d9dbf830a415d
F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
F src/fkey.c d617daf66b5515e2b42c1405b2b4984c30ca50fb705ab164271a9bf66c69e331
F src/func.c 94f42cba2cc1c34aeaa441022ba0170ec3fec4bba54db4e0ded085c6dc0fdc51
F src/prepare.c 259f4e7960c47082c9653f3d5f0c294abd68bb9c3aab86de7630700cba1c20fb
F src/printf.c d3b7844ddeb11fbbdd38dd84d09c9c1ac171d21fb038473c3aa97981201cc660
F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c e3555b156d60407c23692c1e99c05cdf8257f1b7530684dce85247012e58bd8a
+F src/resolve.c 7e6a9702fe3bbf556b1105497ba7a51c24bf606bcc2a7c329122b31e04149005
F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
F src/select.c f02352ac5cbb6fad3804add825743b924cfb6c742ba2e8666d726828a9985d73
F src/shell.c.in c1b14bc0bc1fe73a97dfaad55ca09f5d6e44f6019977d94e7e3d1861616035e1
F src/sqlite.h.in 235e942dd8c01b414c2996828b4d0d2500faf8850f8b24ae17d31c172f519e69
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d
-F src/sqliteInt.h fd8943e9d6b8bd04b3a22ef806b843c2c06f022db3f37f1436ac3a9b04e5b8a1
+F src/sqliteInt.h d38064626689d9a832f17cfc0feef250e34a9f6f2589805e8cef5e85c38c18fa
F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
F src/status.c 9737ed017279a9e0c5da748701c3c7bf1e8ae0dae459aad20dd64fcff97a7e35
F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
F src/vacuum.c 762ee9bbf8733d87d8cd06f58d950e881982e416f8c767334a40ffd341b6bff5
-F src/vdbe.c 2d1338273ff6d6430c0d7b88afbd8f4683df0d23980ab1e638a6b490e9766e80
+F src/vdbe.c 39675332be215b4672f8800b9355e190476ff5fe35fe71f2c9944a3f9dce17b7
F src/vdbe.h 134beb7a12a6213c00eba58febaede33447cc4441bc568a0d9c144b33fc3720a
F src/vdbeInt.h 95f7adfdc5c8f1353321f55a6c5ec00a90877e3b85af5159e393afb41ff54110
F src/vdbeapi.c fea41171884a4de119f8b10ab514c788674eeeb7f27218bb6d008e1310bfd07f
F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c
F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4
F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b
+F test/istrue.test e95d4366a705232d81781545f314457f4cc407c8a53b5eac96703f220a74303a
F test/join.test 442c462eea85cf065d70a663c626b780a95af6e11585d909bb63b87598afe678
F test/join2.test f1b5ba94ba70a791df2d99e61adcebf62edacad1eca57881c97eb3e2ca718595
F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
F tool/GetTclKit.bat 8995df40c4209808b31f24de0b58f90930239a234f7591e3675d45bfbb990c5d
F tool/Replace.cs 02c67258801c2fb5f63231e0ac0f220b4b36ba91
-F tool/addopcodes.tcl 92514b0db662868f1ec803ea95d8f5cf31213ba022fdfd5b7d289518d2e1eecf
+F tool/addopcodes.tcl 0288d5b26b9b35f4cb5affb76eec63f1dfce117bbc2020066708069ef60b86ff
F tool/build-all-msvc.bat c12328d06c45fec8baada5949e3d5af54bf8c887 x
F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
F tool/cg_anno.tcl f95b0006c52cf7f0496b506343415b6ee3cdcdd3 x
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 40314bc999af08ab10e654241208842b4bb95b19858d11249444372250ea4160 a983fa857048c748112c2f805f13aadeae43b43b3d27fa55433a3699b51c9a0e
-R 38dbfe1b01398cfde35ddf8702196d69
+P 003dc140536d0dd4384252ae1b82827b5d8b2b399520f99549b9266a482009fb
+R e29768d7d377928f9be17fdcc6f50028
U drh
-Z bda364b06b801f317fc0151c8a36021e
+Z 99658c0596100aeaf925626dd549f8e1
-003dc140536d0dd4384252ae1b82827b5d8b2b399520f99549b9266a482009fb
\ No newline at end of file
+cf2abd59be9971a55bd3d6c5df374c6aaa23bf81819482b42f01ee2484dcd739
\ No newline at end of file
codeInteger(pParse, pExpr, 0, target);
return target;
}
- case TK_TRUE: {
- sqlite3VdbeAddOp2(v, OP_Integer, 1, target);
- return target;
- }
- case TK_FALSE: {
- sqlite3VdbeAddOp2(v, OP_Integer, 0, target);
+ case TK_TRUEFALSE: {
+ sqlite3VdbeAddOp2(v, OP_Integer, pExpr->iTable, target);
return target;
}
#ifndef SQLITE_OMIT_FLOATING_POINT
sqlite3VdbeAddOp2(v, op, r1, inReg);
break;
}
- case TK_ISTRUE: {
+ case TK_TRUTH: {
+ assert( pExpr->pRight->op==TK_TRUEFALSE );
+ assert( pExpr->pRight->iTable==0 || pExpr->pRight->iTable==1 );
+ assert( pExpr->op2==TK_IS || pExpr->op2==TK_ISNOT );
r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, ®Free1);
testcase( regFree1==0 );
- sqlite3VdbeAddOp2(v, OP_Not, r1, inReg);
- sqlite3VdbeAddOp2(v, OP_Not, inReg, inReg);
+ sqlite3VdbeAddOp4Int(v, OP_IsTrue, r1, inReg, !pExpr->pRight->iTable,
+ pExpr->pRight->iTable ^ (pExpr->op2==TK_IS));
break;
}
case TK_ISNULL:
sqlite3ExprIfFalse(pParse, pExpr->pLeft, dest, jumpIfNull);
break;
}
- case TK_ISTRUE: {
+ case TK_TRUTH: {
+ int isNot;
testcase( jumpIfNull==0 );
- sqlite3ExprIfTrue(pParse, pExpr->pLeft, dest, jumpIfNull);
+ assert( pExpr->pRight->op==TK_TRUEFALSE );
+ assert( pExpr->pRight->iTable==0 || pExpr->pRight->iTable==1 );
+ testcase( pExpr->pRight->iTable==0 );
+ assert( pExpr->op2==TK_IS || pExpr->op2==TK_ISNOT );
+ isNot = pExpr->op2==TK_ISNOT;
+ if( pExpr->pRight->iTable ^ isNot ){
+ sqlite3ExprIfTrue(pParse, pExpr->pLeft, dest,
+ isNot ? SQLITE_JUMPIFNULL : 0);
+ }else{
+ sqlite3ExprIfFalse(pParse, pExpr->pLeft, dest,
+ isNot ? SQLITE_JUMPIFNULL : 0);
+ }
break;
}
case TK_IS:
sqlite3ExprIfTrue(pParse, pExpr->pLeft, dest, jumpIfNull);
break;
}
- case TK_ISTRUE: {
+ case TK_TRUTH: {
testcase( jumpIfNull==0 );
- sqlite3ExprIfFalse(pParse, pExpr->pLeft, dest, jumpIfNull);
+ int isNot;
+ testcase( jumpIfNull==0 );
+ assert( pExpr->pRight->op==TK_TRUEFALSE );
+ assert( pExpr->pRight->iTable==0 || pExpr->pRight->iTable==1 );
+ testcase( pExpr->pRight->iTable==0 );
+ assert( pExpr->op2==TK_IS || pExpr->op2==TK_ISNOT );
+ isNot = pExpr->op2==TK_ISNOT;
+ if( pExpr->pRight->iTable ^ isNot ){
+ /* IS TRUE and IS NOT FALSE */
+ sqlite3ExprIfFalse(pParse, pExpr->pLeft, dest,
+ isNot ? 0 : SQLITE_JUMPIFNULL);
+
+ }else{
+ /* IS FALSE and IS NOT TRUE */
+ sqlite3ExprIfTrue(pParse, pExpr->pLeft, dest,
+ isNot ? 0: SQLITE_JUMPIFNULL);
+ }
break;
}
case TK_IS:
pExpr->pTab = 0;
return WRC_Prune;
}
- if( sqlite3StrICmp(zCol, "true")==0 ){
- pExpr->op = TK_TRUE;
- pExpr->pTab = 0;
- return WRC_Prune;
- }
- if( sqlite3StrICmp(zCol, "false")==0 ){
- pExpr->op = TK_FALSE;
+ if( sqlite3StrICmp(zCol, "true")==0 || sqlite3StrICmp(zCol, "false")==0 ){
+ pExpr->op = TK_TRUEFALSE;
+ pExpr->iTable = zCol[4]==0;
pExpr->pTab = 0;
return WRC_Prune;
}
break;
}
case TK_IS:
- /* Handle special cases of "x IS TRUE" and "x IS FALSE". The first
- ** is transformed into "+x" and the second into "NOT x". */
- if( pExpr->pRight->op==TK_ID ){
- int rc = resolveExprStep(pWalker, pExpr->pRight);
+ case TK_ISNOT: {
+ Expr *pRight;
+ assert( !ExprHasProperty(pExpr, EP_Reduced) );
+ /* Handle special cases of "x IS TRUE", "x IS FALSE", "x IS NOT TRUE",
+ ** and "x IS NOT FALSE". */
+ if( (pRight = pExpr->pRight)->op==TK_ID ){
+ int rc = resolveExprStep(pWalker, pRight);
if( rc==WRC_Abort ) return WRC_Abort;
- if( pExpr->pRight->op==TK_TRUE ){
- pExpr->op = TK_ISTRUE;
- return WRC_Continue;
- }else if( pExpr->pRight->op==TK_FALSE ){
- pExpr->op = TK_NOT;
+ if( pRight->op==TK_TRUEFALSE ){
+ assert( pRight->iTable==0 || pRight->iTable==1 );
+ pExpr->op2 = pExpr->op;
+ pExpr->op = TK_TRUTH;
return WRC_Continue;
}
}
/* Fall thru */
+ }
case TK_BETWEEN:
case TK_EQ:
case TK_NE:
case TK_LT:
case TK_LE:
case TK_GT:
- case TK_GE:
- case TK_ISNOT: {
+ case TK_GE: {
int nLeft, nRight;
if( pParse->db->mallocFailed ) break;
assert( pExpr->pLeft!=0 );
** TK_REGISTER: register number
** TK_TRIGGER: 1 -> new, 0 -> old
** EP_Unlikely: 134217728 times likelihood
- ** TK_SELECT: 1st register of result vector */
+ ** TK_SELECT: 1st register of result vector
+ ** TK_TRUEFALSE: 1 for true, 0 for false */
ynVar iColumn; /* TK_COLUMN: column index. -1 for rowid.
** TK_VARIABLE: variable number (always >= 1).
** TK_SELECT_COLUMN: column of the result vector */
break;
}
+/* Opcode: IsTrue P1 P2 P3 P4 *
+** Synopsis: r[P2] = coalesce(r[P1]==TRUE,P3) ^ P4
+**
+** This opcode implements the IS TRUE, IS FALSE, IS NOT TRUE, and
+** IS NOT FALSE operators.
+**
+** Interpret the value in register P1 as a boolean value. Store the that
+** boolean (a 0 or 1) in register P2. Or if the value in register P1 is
+** NULL, then the P3 is stored in register P2. Invert the answer if P4
+** is 1.
+**
+** The logic is summarized like this:
+**
+** <ul>
+** <li> P3==0, P4==0 → r[P2] = r[P1] IS TRUE
+** <li> P3==1, P4==1 → r[P2] = r[P1] IS FALSE
+** <li> P3==0, P4==1 → r[P2] = r[P1] IS NOT TRUE
+** <li> P3==1, P4==0 → r[P2] = r[P1] IS NOT FALSE
+** </ul>
+*/
+case OP_IsTrue: { /* in1, out2 */
+ assert( pOp->p4type==P4_INT32 );
+ assert( pOp->p4.i==0 || pOp->p4.i==1 );
+ sqlite3VdbeMemSetInt64(&aMem[pOp->p2],
+ sqlite3VdbeBooleanValue(&aMem[pOp->p1], pOp->p3) ^ pOp->p4.i);
+ break;
+}
+
/* Opcode: Not P1 P2 * * *
** Synopsis: r[P2]= !r[P1]
**
--- /dev/null
+# 2018-02-26
+#
+# The author disclaims copyright to this source code. In place of
+# a legal notice, here is a blessing:
+#
+# May you do good and not evil.
+# May you find forgiveness for yourself and forgive others.
+# May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library. The
+# focus of this file is testing expressions of the form
+#
+# x IS TRUE
+# x IS FALSE
+# x IS NOT TRUE
+# x IS NOT FALSE
+#
+# Tests are also included for the use of TRUE and FALSE as
+# literal values.
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+do_execsql_test istrue-100 {
+ CREATE TABLE t1(x INTEGER PRIMARY KEY, y BOOLEAN);
+ INSERT INTO t1 VALUES(1, true),(2, false),(3, null);
+ SELECT x FROM t1 WHERE y IS TRUE;
+} {1}
+do_execsql_test istrue-110 {
+ SELECT x FROM t1 WHERE y IS FALSE;
+} {2}
+do_execsql_test istrue-120 {
+ SELECT x FROM t1 WHERE y IS NULL;
+} {3}
+do_execsql_test istrue-130 {
+ SELECT x FROM t1 WHERE y IS NOT TRUE;
+} {2 3}
+do_execsql_test istrue-140 {
+ SELECT x FROM t1 WHERE y IS NOT FALSE;
+} {1 3}
+do_execsql_test istrue-150 {
+ SELECT x FROM t1 WHERE y IS NOT NULL;
+} {1 2}
+unset -nocomplain X
+set X 9
+do_execsql_test istrue-160 {
+ SELECT x FROM t1 WHERE y IS TRUE OR (8==$X)
+} {1}
+do_execsql_test istrue-170 {
+ SELECT x FROM t1 WHERE y IS FALSE OR (8==$X)
+} {2}
+do_execsql_test istrue-180 {
+ SELECT x FROM t1 WHERE y IS NULL OR (8==$X);
+} {3}
+do_execsql_test istrue-190 {
+ SELECT x FROM t1 WHERE y IS NOT TRUE OR (8==$X);
+} {2 3}
+do_execsql_test istrue-200 {
+ SELECT x FROM t1 WHERE y IS NOT FALSE OR (8==$X);
+} {1 3}
+do_execsql_test istrue-210 {
+ SELECT x FROM t1 WHERE y IS NOT NULL OR (8==$X);
+} {1 2}
+
+do_execsql_test istrue-300 {
+ SELECT x,
+ y IS TRUE, y IS FALSE, y is NULL,
+ y IS NOT TRUE, y IS NOT FALSE, y IS NOT NULL, '|'
+ FROM t1 ORDER BY x;
+} {1 1 0 0 0 1 1 | 2 0 1 0 1 0 1 | 3 0 0 1 1 1 0 |}
+
+do_execsql_test istrue-400 {
+ SELECT x FROM t1 WHERE true;
+} {1 2 3}
+do_execsql_test istrue-410 {
+ SELECT x FROM t1 WHERE false;
+} {}
+
+
+finish_test
# ILLEGAL *must* be the last two token codes and they must be in that order.
#
set extras {
- TRUE
- FALSE
+ TRUEFALSE
ISNOT
FUNCTION
COLUMN
AGG_COLUMN
UMINUS
UPLUS
- ISTRUE
+ TRUTH
REGISTER
VECTOR
SELECT_COLUMN
projects / thirdparty / sqlite.git / commitdiff
