Add a new %ifdef to parse.y so that the build works with SQLITE_OMIT_SUBQUERY.

FossilOrigin-Name: 38a48cfb9a8212970c4a4f8458643c22ed067e8b

diff --git a/manifest b/manifest
index 621866c6f1e2cd9522f1ae837778f4e8fd62fd7a..bd35ced110a5aa37ee7e0bd6b6be2a1b0b2de077 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\stest\sscripts\sto\sget\sthem\sall\srunning\son\sOpenBSD.
-D 2016-07-25T14:20:01.353
+C Add\sa\snew\s%ifdef\sto\sparse.y\sso\sthat\sthe\sbuild\sworks\swith\sSQLITE_OMIT_SUBQUERY.
+D 2016-07-25T14:40:43.866
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -372,7 +372,7 @@ F src/os_win.c 520f23475f1de530c435d30b67b7b15fe90874b0
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c c368634b888b1c8740aea83b36bfd266f2443e60
 F src/pager.h 031a87445e5e0afc85312d1c380e123ad6c7aeaf
-F src/parse.y f374ab20106362eb3f5c01b3e6a002f0bbead7ff
+F src/parse.y 99b676e6fc2f4e331ab93e76b3987cffdbd28efa
 F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df
 F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 F src/pcache1.c 7f51d2b541aab57596adf62db2c4bb025d34f04d
@@ -1507,7 +1507,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 d6f6c87c9c0acf609a9d5bea818bb7a5437109a1
-R f74cc55ec1e76de02d5d11db76d4d3f2
+P 9e7bedeee444cbf0b1a9165e88928c5d85088de1
+R 235239c649979125e6dc80ee3d149e81
 U drh
-Z 27b5d9cc228b8d41a7c82f29fd5cd771
+Z 63a00886286115a66584905bc421be70

diff --git a/manifest.uuid b/manifest.uuid
index 83360d7bd0fa6393452ea49a750f0b182caac0e1..b1d3af8c41459b351fc1762f0c857539910b2301 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9e7bedeee444cbf0b1a9165e88928c5d85088de1
\ No newline at end of file
+38a48cfb9a8212970c4a4f8458643c22ed067e8b
\ No newline at end of file

diff --git a/src/parse.y b/src/parse.y
index 8a65131e285cc009991d4a3c912363882f539abd..087c52c839c469d18c27543a38d753aff8b55370 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -1194,13 +1194,14 @@ nexprlist(A) ::= nexprlist(A) COMMA expr(Y).
 nexprlist(A) ::= expr(Y).
     {A = sqlite3ExprListAppend(pParse,0,Y.pExpr); /*A-overwrites-Y*/}
 
+%ifndef SQLITE_OMIT_SUBQUERY
 /* A paren_exprlist is an optional expression list contained inside
 ** of parenthesis */
 %type paren_exprlist {ExprList*}
 %destructor paren_exprlist {sqlite3ExprListDelete(pParse->db, $$);}
 paren_exprlist(A) ::= .   {A = 0;}
 paren_exprlist(A) ::= LP exprlist(X) RP.  {A = X;}
-
+%endif SQLITE_OMIT_SUBQUERY
 
 
 ///////////////////////////// The CREATE INDEX command ///////////////////////