From: drh <>
Date: Tue, 3 Aug 2021 23:23:23 +0000 (+0000)
Subject: Fix the build for SQLITE_ENABLE_UPDATE_DELETE_LIMIT.
X-Git-Tag: version-3.37.0~299
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7061aa8977e36ee4f2fb1a96c9659d6f73ffca14;p=thirdparty%2Fsqlite.git

Fix the build for SQLITE_ENABLE_UPDATE_DELETE_LIMIT.

FossilOrigin-Name: 5150d2da06ab3c7e3bea1865413cd21c64d5cefb91d3d874e9dd0bf51aea754b
---

diff --git a/manifest b/manifest
index f80b8dc0a7..4331699f12 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sharmony\swith\sthe\sreuse-schema\sbranch.
-D 2021-08-03T18:45:41.599
+C Fix\sthe\sbuild\sfor\sSQLITE_ENABLE_UPDATE_DELETE_LIMIT.
+D 2021-08-03T23:23:23.437
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -495,7 +495,7 @@ F src/ctime.c 8159d5f706551861c18ec6c8f6bdf105e15ea00367f05d9ab65d31a1077facc1
 F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
-F src/delete.c b43f0f4db586acf0b4078e3982485c26fbec984674df513d5ade48a08a323c5a
+F src/delete.c 3ce6af6b64c8b476de51ccc32da0cb3142d42e65754e1d8118addf65b8bcba15
 F src/expr.c 0d541b9f9ecddf9d6d310f31922006f03509d7264ef53ac39c391b82a62383f9
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 9e2b4127463c18e6351ff3665475045f048dd2e2f72a3761721e4ff6c6a45abf
@@ -1920,7 +1920,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 8b781dcaf68e0cf12a844708c82eee00193e340195cbca915d077e4846983bf3
-R aec3d39b20c053360793daa87c6c0ea6
+P cbc703f70d16de0e93b276528fc761290f30af770ceb4b4d11d6a6e6506ac67c
+R 1e80719bac43bc36079e2ba32ff8c292
 U drh
-Z 2256f032a8f708c831506dd967b0c662
+Z 85d3d99e61929ee3c6b49b9d18cf25d1
diff --git a/manifest.uuid b/manifest.uuid
index 52b26151bc..f1c875f73b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cbc703f70d16de0e93b276528fc761290f30af770ceb4b4d11d6a6e6506ac67c
\ No newline at end of file
+5150d2da06ab3c7e3bea1865413cd21c64d5cefb91d3d874e9dd0bf51aea754b
\ No newline at end of file
diff --git a/src/delete.c b/src/delete.c
index 459e932b5e..0debce3cb8 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -188,13 +188,13 @@ Expr *sqlite3LimitWhere(
   }else{
     Index *pPk = sqlite3PrimaryKeyIndex(pTab);
     if( pPk->nKeyCol==1 ){
-      const char *zName = pTab->aCol[pPk->aiColumn[0]].zName;
+      const char *zName = pTab->aCol[pPk->aiColumn[0]].zCnName;
       pLhs = sqlite3Expr(db, TK_ID, zName);
       pEList = sqlite3ExprListAppend(pParse, 0, sqlite3Expr(db, TK_ID, zName));
     }else{
       int i;
       for(i=0; i<pPk->nKeyCol; i++){
-        Expr *p = sqlite3Expr(db, TK_ID, pTab->aCol[pPk->aiColumn[i]].zName);
+        Expr *p = sqlite3Expr(db, TK_ID, pTab->aCol[pPk->aiColumn[i]].zCnName);
         pEList = sqlite3ExprListAppend(pParse, pEList, p);
       }
       pLhs = sqlite3PExpr(pParse, TK_VECTOR, 0, 0);