From 6bd4140d33c3d8daba8688837207e8a4dd19af0c Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Mon, 26 Feb 2018 17:03:03 +0000
Subject: [PATCH] More tests pursuant to ticket [36fae083b450e3af857a459e20].

FossilOrigin-Name: c26f236da61aef7c7a8fe38f1c7f33eea894c8fae38de6a085d4cce933a70502
---
 manifest       | 12 ++++++------
 manifest.uuid  |  2 +-
 test/expr.test | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index b60224db6e..983bc3f72d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sheap\sissue\sin\sthe\sshell\son\sWin32\scaused\sby\sallocator\smismatch.
-D 2018-02-26T16:49:20.522
+C More\stests\spursuant\sto\sticket\s[36fae083b450e3af857a459e20].
+D 2018-02-26T17:03:03.328
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in a2d2fb8d17c39ab5ec52beb27850b903949080848236923f436156b72a958737
@@ -792,7 +792,7 @@ F test/exclusive.test 1206b87e192497d78c7f35552e86a9d05421498da300fb1cce5ca5351c
 F test/exclusive2.test 984090e8e9d1b331d2e8111daf6e5d61dda0bef7
 F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
 F test/exists.test 79a75323c78f02bbe9c251ea502a092f9ef63dac
-F test/expr.test 4d34609c823fb0b856a6f71ffd75a2d03e7ccc366f8d182ae901b4467abb9caa
+F test/expr.test 7cb55e80aeb41d65fec968c08212505123063fea60bdc355d764d747670e9eea
 F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
 F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
 F test/fallocate.test 07416bd593a116d5893cb244f45a94d5c6fe030561df3bd972e6135f8106e509
@@ -1707,7 +1707,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a983fa857048c748112c2f805f13aadeae43b43b3d27fa55433a3699b51c9a0e
-R 1433684d91ba65f3b7614e9fa9c71d0a
+P 7b3a75519aa72a6b49a125ee84946ba2c0722dd6644ee0c80ba567eb85daf5c9
+R 54e3679053cfb34f03d5fc5a51c25e95
 U mistachkin
-Z b329981237c7dadda32eba65e163ae21
+Z 67d82893997d32bf8b3a9fa69332f798
diff --git a/manifest.uuid b/manifest.uuid
index f5717e276e..5e91c27a63 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7b3a75519aa72a6b49a125ee84946ba2c0722dd6644ee0c80ba567eb85daf5c9
\ No newline at end of file
+c26f236da61aef7c7a8fe38f1c7f33eea894c8fae38de6a085d4cce933a70502
\ No newline at end of file
diff --git a/test/expr.test b/test/expr.test
index edef3486af..3cdc9180e8 100644
--- a/test/expr.test
+++ b/test/expr.test
@@ -1000,5 +1000,40 @@ do_execsql_test expr-14.4 {
 } {0}
 
 
+foreach {tn val} [list 1 NaN 2 -NaN 3 NaN0 4 -NaN0 5 Inf 6 -Inf] {
+  do_execsql_test expr-15.$tn.1 {
+    DROP TABLE IF EXISTS t1;
+    CREATE TABLE t1(x);
+    INSERT INTO t1 VALUES(0),(1),(NULL),(0.5),('1x'),('0x');
+  }
+
+  do_test expr-15.$tn.2 {
+    set ::STMT [sqlite3_prepare db "INSERT INTO t1 VALUES(?)" -1 TAIL]
+    sqlite3_bind_double $::STMT 1 $val
+    sqlite3_step $::STMT
+    sqlite3_reset $::STMT
+    sqlite3_finalize $::STMT
+  } {SQLITE_OK}
+
+  do_execsql_test expr-15.$tn.3 {
+    SELECT count(*) FROM t1
+     WHERE (x OR (8==9)) != (CASE WHEN x THEN 1 ELSE 0 END);
+  } {0}
+
+  do_execsql_test expr-15.$tn.4 {
+    SELECT count(*) FROM t1
+     WHERE (x OR (8==9)) != (NOT NOT x);
+  } {0}
+
+  do_execsql_test expr-15.$tn.5 {
+    SELECT sum(NOT x) FROM t1
+     WHERE x
+  } {0}
+
+  do_execsql_test expr-15.$tn.6 {
+    SELECT sum(CASE WHEN x THEN 0 ELSE 1 END) FROM t1
+     WHERE x
+  } {0}
+}
 
 finish_test