Ensure that the expression rewriter inside the query flattener decends into

the substructure of the TK_IF_NULL_ROW operator.  This is a continuation
of the fix for ticket [cad1ab4cb7b0fc344].

FossilOrigin-Name: 28d2902d8f4dfbbfc610f271e00d353b0baae386b56b482f96b88836410be129

diff --git a/manifest b/manifest
index 145ecb7baa2fd768d65fb9d20b92fb2c8c1972fb..79b72ec4040847710124090e9d42accef25f4e73 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sversion\snumber\sto\s3.19.1.
-D 2017-05-23T01:35:22.840
+C Ensure\sthat\sthe\sexpression\srewriter\sinside\sthe\squery\sflattener\sdecends\sinto\nthe\ssubstructure\sof\sthe\sTK_IF_NULL_ROW\soperator.\s\sThis\sis\sa\scontinuation\nof\sthe\sfix\sfor\sticket\s[cad1ab4cb7b0fc344].
+D 2017-05-23T12:44:57.667
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -403,7 +403,7 @@ F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c c23168278b7d4bb63846e26c5298b8056e86bfbf0c78d964447ff1340fbc2893
+F src/select.c 30805a1bc0236ba70a9a1592af4a7c522f906c6bfeba44c165046e592a3a36ec
 F src/shell.c a37d96b20b3644d0eb905df5aa7a0fcf9f6e73c15898337230c760a24a8df794
 F src/sqlite.h.in 8dd468837a4f6d76713e3a4cc65bea48095009038593d41040ab46c1b351197f
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -906,7 +906,7 @@ F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd
 F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c
 F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4
 F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b
-F test/join.test 5cab75bb781a69f7d554fb2c522246a51c2f1b5f235ccda779b84ceb80868e1f
+F test/join.test 89087a3285ce7c317ac811f8cea1be226410f34b9cd9056b550390b591966b38
 F test/join2.test a48f723c5692e2cbb23a9297ac2720cb77d51a70
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
@@ -1580,7 +1580,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4510d55d1e2e23d4a4470dbd414161beec2ceefb7537fd66ea3c347e11624dfc
-R 27cae287d4ad96e127ad85d207e456b6
+P 16656b8ff5cf79565b0b30f804f5f924fabfe989fdf00a2e7c30fe4438143981
+Q +941d8142b7c9a96ff143d1add3c86cf42d61fd08e532d400dac555f23eadbcfb
+R f268afb33074cdb578076d3ac641679b
 U drh
-Z 84b0f0f59397b335bb45fe51ff7631bb
+Z caa375b1b0bf90f02994a58721102cd3

diff --git a/manifest.uuid b/manifest.uuid
index 89c1c83611ab8c9072d9cf34139a41be77e622d0..cb9b76da1a2eb14c611eadfe01bbdd632bbd7dc8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-16656b8ff5cf79565b0b30f804f5f924fabfe989fdf00a2e7c30fe4438143981
\ No newline at end of file
+28d2902d8f4dfbbfc610f271e00d353b0baae386b56b482f96b88836410be129
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index efb6e41736c10767ce985689f66a65f77ba428ca..da8cde8ba31d5c8ad3d53054ef56d900a0020f84 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -3213,9 +3213,10 @@ static Expr *substExpr(
         pExpr = pNew;
       }
     }
-  }else if( pExpr->op==TK_IF_NULL_ROW && pExpr->iTable==pSubst->iTable ){
-    pExpr->iTable = pSubst->iNewTable;
   }else{
+    if( pExpr->op==TK_IF_NULL_ROW && pExpr->iTable==pSubst->iTable ){
+      pExpr->iTable = pSubst->iNewTable;
+    }
     pExpr->pLeft = substExpr(pSubst, pExpr->pLeft);
     pExpr->pRight = substExpr(pSubst, pExpr->pRight);
     if( ExprHasProperty(pExpr, EP_xIsSelect) ){

diff --git a/test/join.test b/test/join.test
index 913a9e6f048e299880450dd2e20fc930e0808bcb..23e0838c2caa6448454f202c0fe8cbdb16d0d5b7 100644 (file)
--- a/test/join.test
+++ b/test/join.test
@@ -726,5 +726,10 @@ do_execsql_test join-14.2 {
     LEFT JOIN (SELECT 1, * FROM (SELECT * FROM (SELECT * FROM (SELECT 1)))) AS y
     JOIN (SELECT * FROM (SELECT 9)) AS z;
 } {1 1 1 9}
+do_execsql_test join-14.3 {
+  SELECT *
+  FROM (SELECT 111)
+  LEFT JOIN (SELECT cc+222, * FROM (SELECT * FROM (SELECT 333 cc)));
+} {111 555 333}
 
 finish_test