Remove the (undocumented) query-planner control that prevents

a "SELECT ALL" subquery in FROM clause from being implemented as a co-routine.

FossilOrigin-Name: ff2f5a31a2ac67a2fdbb25793e8013cb0e062ab90bdcba2d52a62d6d4d8b6d18

diff --git a/manifest b/manifest
index f258da11339bf2429a89d88bcbff343d6787779c..d11bdc4fb70dbbc79a42ad2253a1a10753267cf8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sover-length\ssource\scode\slines\sin\sselect.c.\s\sNo\slogic\schanges.
-D 2017-09-28T16:56:55.569
+C Remove\sthe\s(undocumented)\squery-planner\scontrol\sthat\sprevents\s\na\s"SELECT\sALL"\ssubquery\sin\sFROM\sclause\sfrom\sbeing\simplemented\sas\sa\sco-routine.
+D 2017-09-28T17:29:24.426
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -458,7 +458,7 @@ F src/printf.c 40aee47ae9be4bd3dbdc8968bd07fddc027be8edec8daddf24d3391d36698a1c
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c f7bd3c62801cec412dbafde24585bc95300a909594b979764bd6ca0e61920f70
+F src/select.c ff9551b1792d838d1973ca3f5062804e2a00b1fa2cef6d7931992d89f2b3744a
 F src/shell.c c1206a23d9239f8f51751d3be9b8c3b02fa4103546bea1add7f864d84a8276ab
 F src/shell.c.in bb9720a8c5c98d3984b16ab7540e7142bcae959666ecf248bfc523a1d44220ee
 F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7
@@ -1655,7 +1655,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 5b9ae693120fe4f7bc3b6270f35d773876f6cc8f5990e05cce0d255c54b36ae7
-R d538249aab3ac2a14aedd6574010d06c
+P fd3267ef92384fcefaee7460a5ffbaf8ddcb6049eec36f72a7046a43e2871fbf
+R 5a9f08df25678ade0635d27ff9994d5e
 U drh
-Z 4f8ef3172b33aad0a660b2798399c834
+Z 15e07447876306f708cc7a309f77f755

diff --git a/manifest.uuid b/manifest.uuid
index e03321dd60b756e93b5adb0bec4ba1de9eb11ba3..6515252213e5915bdd3cec34fd1d5383659119e9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fd3267ef92384fcefaee7460a5ffbaf8ddcb6049eec36f72a7046a43e2871fbf
\ No newline at end of file
+ff2f5a31a2ac67a2fdbb25793e8013cb0e062ab90bdcba2d52a62d6d4d8b6d18
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 2c670ab6e331fee6c03c758c59d35a1cd1f7e7e2..a5f04767bfa19f112b7e987340e6ff113a35d42b 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -5317,9 +5317,7 @@ int sqlite3Select(
     ** The subquery is implemented as a co-routine if all of these are true:
     **   (1)  The subquery is guaranteed to be the outer loop (so that it
     **        does not need to be computed more than once)
-    **   (2)  The ALL keyword after SELECT is omitted.  (Applications are
-    **        allowed to say "SELECT ALL" instead of just "SELECT" to disable
-    **        the use of co-routines.)
+    **   (2)  REMOVED (2017-09-28): The ALL keyword after SELECT is omitted.
     **   (3)  Co-routines are not disabled using sqlite3_test_control()
     **        with SQLITE_TESTCTRL_OPTIMIZATIONS.
     **
@@ -5329,7 +5327,7 @@ int sqlite3Select(
     if( i==0
      && (pTabList->nSrc==1
             || (pTabList->a[1].fg.jointype&(JT_LEFT|JT_CROSS))!=0)  /* (1) */
-     && (p->selFlags & SF_All)==0                                   /* (2) */
+     /*** constraint removed: && (p->selFlags & SF_All)==0             (2) */
      && OptimizationEnabled(db, SQLITE_SubqCoroutine)               /* (3) */
     ){
       /* Implement a co-routine that will return a single row of the result