Use #ifdef to omit code that is only reachable when the

SQLITE_ENABLE_UPDATE_DELETE_LIMIT compile-time option is used.

FossilOrigin-Name: 587ded6035a3ce91db81a29fe34ed30d0e59022cba6f107f25b04d034ef37ba9

diff --git a/manifest b/manifest
index 03f7894a4e568b7b25f880ff76859f3318d00fdd..fe1a11580ce035324539acf8421a163e89f870e2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
 B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
-C Make\sit\san\serror\sto\srepeat\sthe\starget\sobject/alias\sof\san\sUPDATE\sstatement\sin\sits\sFROM\sclause.
-D 2020-07-17T16:31:37.428
+C Use\s#ifdef\sto\somit\scode\sthat\sis\sonly\sreachable\swhen\sthe\nSQLITE_ENABLE_UPDATE_DELETE_LIMIT\scompile-time\soption\sis\sused.
+D 2020-07-17T18:07:36.516
 F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
 F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
 F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@ -27,7 +27,7 @@ F src/parse.y ecb9abdd79ec86c8dca7cb126bbdcf322c0e282f87a6d0d734ea5f2c57ced516
 F src/pragma.c ae499b5ab8f4e833f67e28bf2322500e9aa612aadf12581d1324333f848d8b51
 F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
 F src/resolve.c 2dd6821aac2cd27de9fcf6aa6d1f8c41b4b5841c9bc58bf1c9109008009a3a2e
-F src/select.c d338c9b9e11241b66ef860b6078969d7544ad1351842db693955ae025291c38c
+F src/select.c ee84981a346ddddf5669db441a68fac763f4266fe83a9cb27e43c67fbcf1b215
 F src/shell.c.in 81fa23ac1a3d6ac9ed13e9ae711a3d8806396ca7cc12c5d6a2e2536f70b0c7ad
 F src/sqliteInt.h 9682c3ce6b970b3a997d65c140bdb5b286a04188e4e1c8489b64a525161ecb30
 F src/test1.c fe56c4bcaa2685ca9aa25d817a0ee9345e189aff4a5a71a3d8ba946c7776feb8
@@ -68,7 +68,7 @@ F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfa
 F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
 F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
-P cc471df04aecf344d0aa47138014c07d3f93462ae1f8ff86ec5589cfb62c658d
-R 274a85f0083714cabb990ec4c59ecfbf
-U dan
-Z e7675c1aa508a9471dfb9044614d1d8c
+P d90a37e930c66afe95165955ae47efde08f52c8ce16c4fb239da0233335db050
+R 72218426ef74a11d61ac53b296190ebf
+U drh
+Z f566ae76cfb821dbe7826b51a1058958

diff --git a/manifest.uuid b/manifest.uuid
index 178e0a7df0841b02ed3493f20fa7639071de6da4..903edaec5f6b86e8f6be726993f5385093a8950d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d90a37e930c66afe95165955ae47efde08f52c8ce16c4fb239da0233335db050
\ No newline at end of file
+587ded6035a3ce91db81a29fe34ed30d0e59022cba6f107f25b04d034ef37ba9
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 462f53e991c40b750fd68d71ceb8131e9293f233..cbc64e3c23e9b76cb882f983f6b3d1311ee0a025 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -1127,10 +1127,13 @@ static void selectInnerLoop(
     }
 
     case SRT_Upfrom: {
+#ifdef SQLITE_ENABLE_UPDATE_DELETE_LIMIT
       if( pSort ){
         pushOntoSorter(
             pParse, pSort, p, regResult, regOrig, nResultCol, nPrefixReg);
-      }else{
+      }else
+#endif
+      {
         int i2 = pDest->iSDParm2;
         int r1 = sqlite3GetTempReg(pParse);
         sqlite3VdbeAddOp3(v, OP_MakeRecord,regResult+(i2<0),nResultCol-(i2<0),r1);
@@ -1575,6 +1578,7 @@ static void generateSortTail(
       break;
     }
 #endif
+#ifdef SQLITE_ENABLE_UPDATE_DELETE_LIMIT
     case SRT_Upfrom: {
       int i2 = pDest->iSDParm2;
       int r1 = sqlite3GetTempReg(pParse);
@@ -1586,6 +1590,7 @@ static void generateSortTail(
       }
       break;
     }
+#endif
     default: {
       assert( eDest==SRT_Output || eDest==SRT_Coroutine ); 
       testcase( eDest==SRT_Output );