!2118 update sqlite & patch

cmake/external_libs/sqlite.cmake

@@ -1,10 +1,10 @@
 if (WIN32)
     mindspore_add_pkg(sqlite
-        VER 3.31.1
+        VER 3.32.2
         LIBS sqlite3
-        URL https://sqlite.org/2020/sqlite-amalgamation-3310100.zip
+        URL https://sqlite.org/2020/sqlite-amalgamation-3320200.zip
-        MD5 2b7bfcdd97dc281903a9aee966213fe4
+        MD5 1eccea18d248eb34c7378b2b3f63f1db
-        PATCHES ${CMAKE_SOURCE_DIR}/third_party/patch/sqlite/sqlite.windows.patch001 ${CMAKE_SOURCE_DIR}/third_party/patch/sqlite/sqlite.windows.patch002 ${CMAKE_SOURCE_DIR}/third_party/patch/sqlite/sqlite.windows.patch003
+        PATCHES ${CMAKE_SOURCE_DIR}/third_party/patch/sqlite/sqlite.windows.patch001
         CMAKE_OPTION " "
     )
 
@@ -18,11 +18,11 @@ else ()
     endif()
     set(sqlite_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack")
     mindspore_add_pkg(sqlite
-        VER 3.31.1
+        VER 3.32.2
         LIBS sqlite3
-        URL https://github.com/sqlite/sqlite/archive/version-3.31.1.tar.gz
+        URL https://github.com/sqlite/sqlite/archive/version-3.32.2.tar.gz
-        MD5 5f4e7b4016c15f4fb5855615279819da
+        MD5 ea6d3b3289b4ac216fb06081a01ef101
-        PATCHES ${CMAKE_SOURCE_DIR}/third_party/patch/sqlite/sqlite.patch001 ${CMAKE_SOURCE_DIR}/third_party/patch/sqlite/sqlite.patch002 ${CMAKE_SOURCE_DIR}/third_party/patch/sqlite/sqlite.patch003
+        PATCHES ${CMAKE_SOURCE_DIR}/third_party/patch/sqlite/sqlite.patch001
         CONFIGURE_COMMAND ./configure --enable-shared=no --disable-tcl --disable-editline --enable-json1)
 endif ()
 

third_party/patch/sqlite/sqlite.patch001

@@ -1,144 +1,290 @@
-diff -Npur -x .git sqlite.3.31.1/manifest sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/manifest
+diff -Npur sqlite-version-3.32.2/src/expr.c sqlite-version-3.32.2-patched/src/expr.c
---- sqlite.3.31.1/manifest	2020-04-20 10:21:03.622574899 +0800
+--- sqlite-version-3.32.2/src/expr.c	2020-06-04 20:58:43.000000000 +0800
-+++ sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/manifest	2020-04-20 11:05:54.613993594 +0800
++++ sqlite-version-3.32.2-patched/src/expr.c	2020-06-15 16:03:29.343573250 +0800
-@@ -482,8 +482,8 @@ F src/ctime.c 1b0724e66f95f33b160b1af85c
+@@ -3813,6 +3813,7 @@ expr_code_doover:
- F src/date.c 6c408fdd2e9ddf6e8431aba76315a2d061bea2cec8fbb75e25d7c1ba08274712
+       AggInfo *pAggInfo = pExpr->pAggInfo;
- F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
+       struct AggInfo_col *pCol;
- F src/dbstat.c 0f55297469d4244ab7df395849e1af98eb5e95816af7c661e7d2d8402dea23da
+       assert( pAggInfo!=0 );
--F src/delete.c a5c59b9c0251cf7682bc52af0d64f09b1aefc6781a63592c8f1136f7b73c66e4
++      assert( AggInfoValid(pAggInfo) );
--F src/expr.c 003c59158b33d7f3b198122cb0d1e13c06517cc3932e56b42283eb0e96696d66
+       assert( pExpr->iAgg>=0 && pExpr->iAgg<pAggInfo->nColumn );
-+F src/delete.c 11000121c4281c0bce4e41db29addfaea0038eaa127ece02557c9207bc3e541d
+       pCol = &pAggInfo->aCol[pExpr->iAgg];
-+F src/expr.c 4b25db7f9472b3532560242193bc4eefaefc7720dc4f2d7ec9a89ada410c6ea2
+       if( !pAggInfo->directMode ){
- F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
+@@ -4121,6 +4122,7 @@ expr_code_doover:
- F src/fkey.c 92a248ec0fa4ed8ab60c98d9b188ce173aaf218f32e7737ba77deb2a684f9847
+         assert( !ExprHasProperty(pExpr, EP_IntValue) );
- F src/func.c 108577cebe8a50c86d849a93b99493a54e348dd0b846f00d13b52ca973d5baf4
+         sqlite3ErrorMsg(pParse, "misuse of aggregate: %s()", pExpr->u.zToken);
-@@ -536,8 +536,8 @@ F src/shell.c.in c2e20c43a44fb5588a6c27c
+       }else{
- F src/sqlite.h.in 75d0304247a2154122d6d06f12219c1e29291d72304f0eeef4c1ec6b1409b443
++        assert( AggInfoValid(pInfo) );
- F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
+         return pInfo->aFunc[pExpr->iAgg].iMem;
- F src/sqlite3ext.h 27951f294f29cd875c6027f2707d644ef99f469bd97514568b5a8581a114db8c
--F src/sqliteInt.h 7a29ba700a51eeb925731749a570cf3859f6a58ed94797ecf47508875b0ba279
--F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
-+F src/sqliteInt.h d736043dc6291d3af289d911237da0801b6c05be086ae322eedd47a089ae8d2f
-+F src/sqliteLimit.h 95cb8479ca459496d9c1c6a9f76b38aee12203a56ce1092fe13e50ae2454c032
- F src/status.c 9ff2210207c6c3b4d9631a8241a7d45ab1b26a0e9c84cb07a9b5ce2de9a3b278
- F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
- F src/tclsqlite.c 97590069efaba5a4928ecffb606e3771dd93ee8e6bf248a62a6507c37a2b2e46
-@@ -619,8 +619,8 @@ F src/wal.h 606292549f5a7be50b6227bd685f
- F src/walker.c a137468bf36c92e64d2275caa80c83902e3a0fc59273591b96c6416d3253d05d
- F src/where.c 2005d0511e05e5f7b6fb3be514b44f264f23d45f3b0cc5e150c63e3006a003e5
- F src/whereInt.h 9157228db086f436a574589f8cc5749bd971e94017c552305ad9ec472ed2e098
--F src/wherecode.c ec8870d6fe79668dd12d7edc65ae9771828d6cdfe478348c8abd872a89fdbadd
--F src/whereexpr.c 4b34be1434183e7bb8a05d4bf42bd53ea53021b0b060936fbd12062b4ff6b396
-+F src/wherecode.c f5df56e395ade2240cabb2d39500c681bd29f8cc0636c3301c4996ad160df94d
-+F src/whereexpr.c 264d58971eaf8256eb5b0917bcd7fc7a1f1109fdda183a8382308a1b18a2dce7
- F src/window.c f8ba2ee12a19b51d3ba42c16277c74185ee9215306bc0d5a03974ade8b5bc98f
- F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
- F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
-@@ -1857,10 +1857,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91
- F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
- F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
- F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
--P 6fb9a8fb85486a8fccc462856316ef523450c23a7a7a81c8dfb323fbe809f8f5
--R bf075f6bcc1758c5c1ecd13052997456
-+P 9d0d4ab95dc0c56e053c2924ed322a9ea7b25439e6f74599f706905a1994e454
-+R 1c052b7cdf4947664b7043564b643ac3
- T +bgcolor * #d0c0ff
- T +sym-release *
- T +sym-version-3.31.1 *
- U drh
--Z 7c50801eed3eaef969e028ef5a0a641a
-+Z e960557a43b001a47933dacf8bc1d10e
-diff -Npur -x .git sqlite.3.31.1/manifest.uuid sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/manifest.uuid
---- sqlite.3.31.1/manifest.uuid	2020-04-20 10:21:03.630574843 +0800
-+++ sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/manifest.uuid	2020-04-20 11:05:54.613993594 +0800
-@@ -1 +1 @@
--3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6
-\ 文件尾没有换行符
-+abc473fb8fb999005dc79a360e34f97b3b25429decf1820dd2afa5c19577753d
-diff -Npur -x .git sqlite.3.31.1/src/expr.c sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/src/expr.c
---- sqlite.3.31.1/src/expr.c	2020-04-20 10:21:03.642574758 +0800
-+++ sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/src/expr.c	2020-04-20 11:05:54.617993541 +0800
-@@ -5463,19 +5463,25 @@ static int impliesNotNullRow(Walker *pWa
-     case TK_LT:
-     case TK_LE:
-     case TK_GT:
--    case TK_GE:
-+    case TK_GE: {
-+      Expr *pLeft = pExpr->pLeft;
-+      Expr *pRight = pExpr->pRight;
-       testcase( pExpr->op==TK_EQ );
-       testcase( pExpr->op==TK_NE );
-       testcase( pExpr->op==TK_LT );
-       testcase( pExpr->op==TK_LE );
-       testcase( pExpr->op==TK_GT );
-       testcase( pExpr->op==TK_GE );
--      if( (pExpr->pLeft->op==TK_COLUMN && IsVirtual(pExpr->pLeft->y.pTab))
--       || (pExpr->pRight->op==TK_COLUMN && IsVirtual(pExpr->pRight->y.pTab))
-+      /* The y.pTab=0 assignment in wherecode.c always happens after the
-+      ** impliesNotNullRow() test */
-+      if( (pLeft->op==TK_COLUMN && ALWAYS(pLeft->y.pTab!=0)
-+                               && IsVirtual(pLeft->y.pTab))
-+       || (pRight->op==TK_COLUMN && ALWAYS(pRight->y.pTab!=0)
-+                               && IsVirtual(pRight->y.pTab))
-       ){
--       return WRC_Prune;
-+        return WRC_Prune;
        }
--
+       break;
-+    }
+@@ -5658,13 +5660,7 @@ struct SrcCount {
-     default:
+ ** Count the number of references to columns.
-       return WRC_Continue;
-   }
-diff -Npur -x .git sqlite.3.31.1/src/sqliteInt.h sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/src/sqliteInt.h
---- sqlite.3.31.1/src/sqliteInt.h	2020-04-20 10:21:03.642574758 +0800
-+++ sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/src/sqliteInt.h	2020-04-20 11:05:54.617993541 +0800
-@@ -2153,8 +2153,11 @@ struct Table {
  */
- #ifndef SQLITE_OMIT_VIRTUALTABLE
+ static int exprSrcCount(Walker *pWalker, Expr *pExpr){
- #  define IsVirtual(X)      ((X)->nModuleArg)
+-  /* There was once a NEVER() on the second term on the grounds that
-+#  define ExprIsVtab(X)  \
+-  ** sqlite3FunctionUsesThisSrc() was always called before 
-+              ((X)->op==TK_COLUMN && (X)->y.pTab!=0 && (X)->y.pTab->nModuleArg)
+-  ** sqlite3ExprAnalyzeAggregates() and so the TK_COLUMNs have not yet 
- #else
+-  ** been converted into TK_AGG_COLUMN. But this is no longer true due
- #  define IsVirtual(X)      0
+-  ** to window functions - sqlite3WindowRewrite() may now indirectly call
-+#  define ExprIsVtab(X)     0
+-  ** FunctionUsesThisSrc() when creating a new sub-select. */
+-  if( pExpr->op==TK_COLUMN || pExpr->op==TK_AGG_COLUMN ){
++  if( pExpr->op==TK_COLUMN || NEVER(pExpr->op==TK_AGG_COLUMN) ){
+     int i;
+     struct SrcCount *p = pWalker->u.pSrcCount;
+     SrcList *pSrc = p->pSrc;
+diff -Npur sqlite-version-3.32.2/src/global.c sqlite-version-3.32.2-patched/src/global.c
+--- sqlite-version-3.32.2/src/global.c	2020-06-04 20:58:43.000000000 +0800
++++ sqlite-version-3.32.2-patched/src/global.c	2020-06-15 16:03:29.343573250 +0800
+@@ -300,6 +300,11 @@ sqlite3_uint64 sqlite3NProfileCnt = 0;
+ int sqlite3PendingByte = 0x40000000;
  #endif
  
++/*
++** Flags for select tracing and the ".selecttrace" macro of the CLI
++*/
++/**/ u32 sqlite3SelectTrace = 0;
++
+ #include "opcodes.h"
  /*
-diff -Npur -x .git sqlite.3.31.1/src/whereexpr.c sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/src/whereexpr.c
+ ** Properties of opcodes.  The OPFLG_INITIALIZER macro is
---- sqlite.3.31.1/src/whereexpr.c	2020-04-20 10:21:03.642574758 +0800
+diff -Npur sqlite-version-3.32.2/src/resolve.c sqlite-version-3.32.2-patched/src/resolve.c
-+++ sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/src/whereexpr.c	2020-04-20 11:05:54.617993541 +0800
+--- sqlite-version-3.32.2/src/resolve.c	2020-06-04 20:58:43.000000000 +0800
-@@ -377,7 +377,8 @@ static int isAuxiliaryVtabOperator(
++++ sqlite-version-3.32.2-patched/src/resolve.c	2020-06-15 16:03:29.343573250 +0800
-     **       MATCH(expression,vtab_column)
+@@ -1715,6 +1715,14 @@ static int resolveSelectStep(Walker *pWa
-     */
+           return WRC_Abort;
-     pCol = pList->a[1].pExpr;
+         }
--    if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){
+       }
-+    testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
++    }else if( p->pWin && ALWAYS( (p->selFlags & SF_WinRewrite)==0 ) ){
-+    if( ExprIsVtab(pCol) ){
++      sqlite3WindowRewrite(pParse, p);
-       for(i=0; i<ArraySize(aOp); i++){
++#if SELECTTRACE_ENABLED
-         if( sqlite3StrICmp(pExpr->u.zToken, aOp[i].zOp)==0 ){
++      if( (sqlite3SelectTrace & 0x108)!=0 ){
-           *peOp2 = aOp[i].eOp2;
++        SELECTTRACE(0x104,pParse,p, ("after window rewrite:\n"));
-@@ -399,7 +400,8 @@ static int isAuxiliaryVtabOperator(
++        sqlite3TreeViewSelect(0, p, 0);
-     ** with function names in an arbitrary case.
++      }
-     */
++#endif
-     pCol = pList->a[0].pExpr;
--    if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){
-+    testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
-+    if( ExprIsVtab(pCol) ){
-       sqlite3_vtab *pVtab;
-       sqlite3_module *pMod;
-       void (*xNotUsed)(sqlite3_context*,int,sqlite3_value**);
-@@ -422,10 +424,12 @@ static int isAuxiliaryVtabOperator(
-     int res = 0;
-     Expr *pLeft = pExpr->pLeft;
-     Expr *pRight = pExpr->pRight;
--    if( pLeft->op==TK_COLUMN && IsVirtual(pLeft->y.pTab) ){
-+    testcase( pLeft->op==TK_COLUMN && pLeft->y.pTab==0 );
-+    if( ExprIsVtab(pLeft) ){
-       res++;
-     }
--    if( pRight && pRight->op==TK_COLUMN && IsVirtual(pRight->y.pTab) ){
-+    testcase( pRight && pRight->op==TK_COLUMN && pRight->y.pTab==0 );
-+    if( pRight && ExprIsVtab(pRight) ){
-       res++;
-       SWAP(Expr*, pLeft, pRight);
      }
+ #endif
+ 
+diff -Npur sqlite-version-3.32.2/src/select.c sqlite-version-3.32.2-patched/src/select.c
+--- sqlite-version-3.32.2/src/select.c	2020-06-04 20:58:43.000000000 +0800
++++ sqlite-version-3.32.2-patched/src/select.c	2020-06-15 16:03:29.343573250 +0800
+@@ -15,20 +15,6 @@
+ #include "sqliteInt.h"
+ 
+ /*
+-** Trace output macros
+-*/
+-#if SELECTTRACE_ENABLED
+-/***/ int sqlite3SelectTrace = 0;
+-# define SELECTTRACE(K,P,S,X)  \
+-  if(sqlite3SelectTrace&(K))   \
+-    sqlite3DebugPrintf("%u/%d/%p: ",(S)->selId,(P)->addrExplain,(S)),\
+-    sqlite3DebugPrintf X
+-#else
+-# define SELECTTRACE(K,P,S,X)
+-#endif
+-
+-
+-/*
+ ** An instance of the following object is used to record information about
+ ** how to process the DISTINCT keyword, to simplify passing that information
+ ** into the selectInnerLoop() routine.
+@@ -4426,11 +4412,14 @@ static int pushDownWhereTerms(
+ ){
+   Expr *pNew;
+   int nChng = 0;
++  Select *pSel;
+   if( pWhere==0 ) return 0;
+   if( pSubq->selFlags & SF_Recursive ) return 0;  /* restriction (2) */
+ 
+ #ifndef SQLITE_OMIT_WINDOWFUNC
+-  if( pSubq->pWin ) return 0;    /* restriction (6) */
++  for(pSel=pSubq; pSel; pSel=pSel->pPrior){
++    if( pSel->pWin ) return 0;    /* restriction (6) */
++  }
+ #endif
+ 
+ #ifdef SQLITE_DEBUG
+@@ -5766,6 +5755,9 @@ int sqlite3Select(
+   }
+   if( sqlite3AuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1;
+   memset(&sAggInfo, 0, sizeof(sAggInfo));
++#ifdef SQLITE_DEBUG
++  sAggInfo.iAggMagic = SQLITE_AGGMAGIC_VALID;
++#endif
+ #if SELECTTRACE_ENABLED
+   SELECTTRACE(1,pParse,p, ("begin processing:\n", pParse->addrExplain));
+   if( sqlite3SelectTrace & 0x100 ){
+@@ -5804,19 +5796,6 @@ int sqlite3Select(
+     generateColumnNames(pParse, p);
+   }
+ 
+-#ifndef SQLITE_OMIT_WINDOWFUNC
+-  rc = sqlite3WindowRewrite(pParse, p);
+-  if( rc ){
+-    assert( db->mallocFailed || pParse->nErr>0 );
+-    goto select_end;
+-  }
+-#if SELECTTRACE_ENABLED
+-  if( p->pWin && (sqlite3SelectTrace & 0x108)!=0 ){
+-    SELECTTRACE(0x104,pParse,p, ("after window rewrite:\n"));
+-    sqlite3TreeViewSelect(0, p, 0);
+-  }
+-#endif
+-#endif /* SQLITE_OMIT_WINDOWFUNC */
+   pTabList = p->pSrc;
+   isAgg = (p->selFlags & SF_Aggregate)!=0;
+   memset(&sSort, 0, sizeof(sSort));
+@@ -6144,7 +6123,7 @@ int sqlite3Select(
+   if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct 
+    && sqlite3ExprListCompare(sSort.pOrderBy, pEList, -1)==0
+ #ifndef SQLITE_OMIT_WINDOWFUNC
+-   && p->pWin==0
++   && ALWAYS(p->pWin==0)
+ #endif
+   ){
+     p->selFlags &= ~SF_Distinct;
+@@ -6791,6 +6770,14 @@ int sqlite3Select(
+ select_end:
+   sqlite3ExprListDelete(db, pMinMaxOrderBy);
+   sqlite3DbFree(db, sAggInfo.aCol);
++#ifdef SQLITE_DEBUG
++  for(i=0; i<sAggInfo.nFunc; i++){
++    assert( sAggInfo.aFunc[i].pExpr!=0 );
++    assert( sAggInfo.aFunc[i].pExpr->pAggInfo==&sAggInfo );
++    sAggInfo.aFunc[i].pExpr->pAggInfo = 0;
++  }
++  sAggInfo.iAggMagic = 0;
++#endif
+   sqlite3DbFree(db, sAggInfo.aFunc);
+ #if SELECTTRACE_ENABLED
+   SELECTTRACE(0x1,pParse,p,("end processing\n"));
+diff -Npur sqlite-version-3.32.2/src/sqliteInt.h sqlite-version-3.32.2-patched/src/sqliteInt.h
+--- sqlite-version-3.32.2/src/sqliteInt.h	2020-06-04 20:58:43.000000000 +0800
++++ sqlite-version-3.32.2-patched/src/sqliteInt.h	2020-06-15 16:03:29.347573247 +0800
+@@ -976,7 +976,12 @@ typedef INT16_TYPE LogEst;
+ */
+ #if defined(SQLITE_ENABLE_SELECTTRACE)
+ # define SELECTTRACE_ENABLED 1
++# define SELECTTRACE(K,P,S,X)  \
++  if(sqlite3SelectTrace&(K))   \
++    sqlite3DebugPrintf("%u/%d/%p: ",(S)->selId,(P)->addrExplain,(S)),\
++    sqlite3DebugPrintf X
+ #else
++# define SELECTTRACE(K,P,S,X)
+ # define SELECTTRACE_ENABLED 0
+ #endif
+ 
+@@ -2523,9 +2528,24 @@ struct AggInfo {
+     int iDistinct;           /* Ephemeral table used to enforce DISTINCT */
+   } *aFunc;
+   int nFunc;              /* Number of entries in aFunc[] */
++#ifdef SQLITE_DEBUG
++  u32 iAggMagic;          /* Sanity checking constant */
++#endif
+ };
+ 
+ /*
++** Allowed values for AggInfo.iAggMagic
++*/
++#define SQLITE_AGGMAGIC_VALID  0x05cadade
++
++/*
++** True if the AggInfo object is valid.  Used inside of assert() only.
++*/
++#ifdef SQLITE_DEBUG
++#  define AggInfoValid(P) ((P)->iAggMagic==SQLITE_AGGMAGIC_VALID)
++#endif
++
++/*
+ ** The datatype ynVar is a signed integer, either 16-bit or 32-bit.
+ ** Usually it is 16-bits.  But if SQLITE_MAX_VARIABLE_NUMBER is greater
+ ** than 32767 we have to make it 32-bit.  16-bit is preferred because
+@@ -4546,10 +4566,11 @@ extern const unsigned char sqlite3UpperT
+ extern const unsigned char sqlite3CtypeMap[];
+ extern SQLITE_WSD struct Sqlite3Config sqlite3Config;
+ extern FuncDefHash sqlite3BuiltinFunctions;
++extern u32 sqlite3SelectTrace;
+ #ifndef SQLITE_OMIT_WSD
+ extern int sqlite3PendingByte;
+ #endif
+-#endif
++#endif /* !defined(SQLITE_AMALGAMATION) */
+ #ifdef VDBE_PROFILE
+ extern sqlite3_uint64 sqlite3NProfileCnt;
+ #endif
+diff -Npur sqlite-version-3.32.2/src/test1.c sqlite-version-3.32.2-patched/src/test1.c
+--- sqlite-version-3.32.2/src/test1.c	2020-06-04 20:58:43.000000000 +0800
++++ sqlite-version-3.32.2-patched/src/test1.c	2020-06-15 16:03:29.347573247 +0800
+@@ -8164,7 +8164,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp)
+ #endif
+ #endif
+ #if defined(SQLITE_ENABLE_SELECTTRACE)
+-  extern int sqlite3SelectTrace;
++  extern u32 sqlite3SelectTrace;
+ #endif
+ 
+   for(i=0; i<sizeof(aCmd)/sizeof(aCmd[0]); i++){
+diff -Npur sqlite-version-3.32.2/src/window.c sqlite-version-3.32.2-patched/src/window.c
+--- sqlite-version-3.32.2/src/window.c	2020-06-04 20:58:43.000000000 +0800
++++ sqlite-version-3.32.2-patched/src/window.c	2020-06-15 16:03:29.347573247 +0800
+@@ -942,7 +942,7 @@ static int sqlite3WindowExtraAggFuncDept
+ */
+ int sqlite3WindowRewrite(Parse *pParse, Select *p){
+   int rc = SQLITE_OK;
+-  if( p->pWin && p->pPrior==0 && (p->selFlags & SF_WinRewrite)==0 ){
++  if( ALWAYS(p->pWin && (p->selFlags & SF_WinRewrite)==0) ){
+     Vdbe *v = sqlite3GetVdbe(pParse);
+     sqlite3 *db = pParse->db;
+     Select *pSub = 0;             /* The subquery */
+diff -Npur sqlite-version-3.32.2/test/window1.test sqlite-version-3.32.2-patched/test/window1.test
+--- sqlite-version-3.32.2/test/window1.test	2020-06-04 20:58:43.000000000 +0800
++++ sqlite-version-3.32.2-patched/test/window1.test	2020-06-15 16:03:29.347573247 +0800
+@@ -1743,5 +1743,47 @@ do_execsql_test 53.0 {
+                WHERE a.c);
+ } {4 4 4 4}
+ 
++#-------------------------------------------------------------------------
++reset_db
++do_execsql_test 54.1 {
++  CREATE TABLE t1(a VARCHAR(20), b FLOAT);
++  INSERT INTO t1 VALUES('1',10.0);
++}
++
++do_execsql_test 54.2 {
++  SELECT * FROM ( 
++    SELECT sum(b) OVER() AS c FROM t1 
++      UNION
++    SELECT b AS c FROM t1
++  ) WHERE c>10;
++}
++
++do_execsql_test 54.3 {
++  INSERT INTO t1 VALUES('2',5.0);
++  INSERT INTO t1 VALUES('3',15.0);
++}
++
++do_execsql_test 54.4 {
++  SELECT * FROM ( 
++    SELECT sum(b) OVER() AS c FROM t1 
++      UNION
++    SELECT b AS c FROM t1
++  ) WHERE c>10;
++} {15.0 30.0}
++
++# 2020-06-05 ticket c8d3b9f0a750a529
++reset_db
++do_execsql_test 55.1 {
++   CREATE TABLE a(b);
++   SELECT
++      (SELECT b FROM a
++        GROUP BY b
++        HAVING (SELECT COUNT()OVER() + lead(b)OVER(ORDER BY SUM(DISTINCT b) + b))
++      ) 
++    FROM a
++  UNION
++   SELECT 99
++    ORDER BY 1;
++} {99}
+ 
+ finish_test

third_party/patch/sqlite/sqlite.patch002

@@ -1,85 +0,0 @@
-diff -Npur -x .git sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/manifest sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/manifest
---- sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/manifest	2020-04-20 11:05:54.613993594 +0800
-+++ sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/manifest	2020-05-25 09:50:05.352246036 +0800
-@@ -1,5 +1,5 @@
- C Version\s3.31.1
--D 2020-01-27T19:55:54.490
-+D 2020-04-03T13:19:03.054
- F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
- F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-@@ -529,11 +529,11 @@ F src/pragma.h 9f86a3a3a0099e651189521c8
- F src/prepare.c 6049beb71385f017af6fc320d2c75a4e50b75e280c54232442b785fbb83df057
- F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
- F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
--F src/resolve.c f0781c9e180028b279bc4ff079ad54f4727223d470c8d2343643fcaf79b67740
--F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
--F src/select.c 3f7aecf64b08b018b89e4fe16ea621cc9a0e3f3801e9e5638cfe1a6035fa1581
--F src/shell.c.in c2e20c43a44fb5588a6c27ce60589538fbf4794fd7686f5b2598eca22eaae1fa
--F src/sqlite.h.in 75d0304247a2154122d6d06f12219c1e29291d72304f0eeef4c1ec6b1409b443
-+F src/resolve.c 5c3b3b18e096353ee2794a8f8a6227c301a57ea771814c158546265d9ef2087e
-+F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-+F src/select.c fd38aa7f87ad0fc93577df6ef1d6cf2b9e5f6186b93c04271f5248c6c4be088c
-+F src/shell.c.in 759bb4a283651955ff2ddb104541b1805b1fff915017083bdd39975cd4e223aa
-+F src/sqlite.h.in cc7d0949ac32bb68ed97acdb3e7ae91cd413a24d32d6ff049ef8308d620a4367
- F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 27951f294f29cd875c6027f2707d644ef99f469bd97514568b5a8581a114db8c
- F src/sqliteInt.h d736043dc6291d3af289d911237da0801b6c05be086ae322eedd47a089ae8d2f
-@@ -1718,7 +1718,7 @@ F test/win32heap.test 10fd891266bd00af68
- F test/win32lock.test fbf107c91d8f5512be5a5b87c4c42ab9fdd54972
- F test/win32longpath.test 169c75a3b2e43481f4a62122510210c67b08f26d
- F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc
--F test/window1.test cec56b9a0a2e7ca4bd63b30590c7b049dce9acfd87478e2597e13b67152bd821
-+F test/window1.test ec792f92e63ee457447c5c04de8f8d42f4a94b842b5bac1f403ac38a6d867c22
- F test/window2.tcl 492c125fa550cda1dd3555768a2303b3effbeceee215293adf8871efc25f1476
- F test/window2.test e466a88bd626d66edc3d352d7d7e1d5531e0079b549ba44efb029d1fbff9fd3c
- F test/window3.tcl acea6e86a4324a210fd608d06741010ca83ded9fde438341cb978c49928faf03
-@@ -1857,10 +1857,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91
- F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
- F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
- F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
--P 9d0d4ab95dc0c56e053c2924ed322a9ea7b25439e6f74599f706905a1994e454
--R 1c052b7cdf4947664b7043564b643ac3
-+P 684293882c302600e112cf52553c19d84fdb31663d96e5dd7f8ac17dda00a026
-+R dbb40938a904f2e39c11078dcedb87b0
- T +bgcolor * #d0c0ff
- T +sym-release *
- T +sym-version-3.31.1 *
- U drh
--Z e960557a43b001a47933dacf8bc1d10e
-+Z 1c021fc7d9ac6b5d0e31d06cd9bb3304
-diff -Npur -x .git sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/manifest.uuid sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/manifest.uuid
---- sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/manifest.uuid	2020-04-20 11:05:54.613993594 +0800
-+++ sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/manifest.uuid	2020-05-25 09:50:19.076317552 +0800
-@@ -1 +1 @@
--abc473fb8fb999005dc79a360e34f97b3b25429decf1820dd2afa5c19577753d
-+4a302b42c7bf5e11ddb5522ca999f74aba397d3a7eb91b1844bb02852f772441
-diff -Npur -x .git sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/src/select.c sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/src/select.c
---- sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/src/select.c	2020-04-20 11:05:54.613993594 +0800
-+++ sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/src/select.c	2020-05-25 09:48:15.975677012 +0800
-@@ -5352,6 +5352,7 @@ static void resetAccumulator(Parse *pPar
-   struct AggInfo_func *pFunc;
-   int nReg = pAggInfo->nFunc + pAggInfo->nColumn;
-   if( nReg==0 ) return;
-+  if( pParse->nErr ) return;
- #ifdef SQLITE_DEBUG
-   /* Verify that all AggInfo registers are within the range specified by
-   ** AggInfo.mnReg..AggInfo.mxReg */
-diff -Npur -x .git sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/test/window1.test sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/test/window1.test
---- sqlite.3.31.1_CVE-2020-9327_bf48ce49_78d1d225_patch001/test/window1.test	2020-04-20 11:05:54.673992813 +0800
-+++ sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/test/window1.test	2020-05-25 09:50:46.824462220 +0800
-@@ -1594,4 +1594,14 @@ do_execsql_test 48.1 {
- } {2 2 2}
- 
- 
-+# 2020-04-03 ticket af4556bb5c285c08
-+#
-+reset_db
-+do_catchsql_test 51.1 {
-+  CREATE TABLE a(b, c);
-+  SELECT c FROM a GROUP BY c
-+    HAVING(SELECT(sum(b) OVER(ORDER BY b),
-+                  sum(b) OVER(PARTITION BY min(DISTINCT c), c ORDER BY b)));
-+} {1 {row value misused}}
-+
- finish_test

third_party/patch/sqlite/sqlite.patch003

@@ -1,169 +0,0 @@
-diff -Npur -x .git sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/manifest sqlite.3.31.1_CVE-2020-11656_fb99e388_4db7ab53_patch003/manifest
---- sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/manifest	2020-05-25 09:50:05.352246036 +0800
-+++ sqlite.3.31.1_CVE-2020-11656_fb99e388_4db7ab53_patch003/manifest	2020-05-25 10:00:45.272851274 +0800
-@@ -1,5 +1,5 @@
- C Version\s3.31.1
--D 2020-04-03T13:19:03.054
-+D 2020-04-03T11:52:59.198
- F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
- F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-@@ -465,9 +465,9 @@ F spec.template 86a4a43b99ebb3e75e6b9a73
- F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
- F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
- F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
--F src/alter.c f48a4423c8f198d7f1ae4940f74b606707d05384ac79fb219be8e3323af2a2de
--F src/analyze.c b3ceec3fc052df8a96ca8a8c858d455dc5029ba681b4be98bb5c5a9162cfa58c
--F src/attach.c df0ead9091042c68964856ecc08dba55d5403ad5f3ca865d9d396d71528c511a
-+F src/alter.c ac9d737cace62b5cd88bff5310e53e299bc0919f08b5934a2bd0f8e8e65d770e
-+F src/analyze.c 831bb090988477a00d3b4c000746e1b0454dcc93b10b793e6ebe1c47f25d193a
-+F src/attach.c ff2daea0fe62080192e3f262670e4f61f5a86c1e7bea9cec34e960fe79852aa1
- F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
- F src/backup.c f70077d40c08b7787bfe934e4d1da8030cb0cc57d46b345fba2294b7d1be23ab
- F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
-@@ -639,7 +639,7 @@ F test/altercol.test 1d6a6fe698b81e626ba
- F test/alterlegacy.test 82022721ce0de29cedc9a7af63bc9fcc078b0ee000f8283b4b6ea9c3eab2f44b
- F test/altermalloc.test 167a47de41b5c638f5f5c6efb59784002b196fff70f98d9b4ed3cd74a3fb80c9
- F test/altermalloc2.test fa7b1c1139ea39b8dec407cf1feb032ca8e0076bd429574969b619175ad0174b
--F test/altertab.test bd61e5b73d495ec4707133db91b07f09d57e339d988de5ec5a76d34a2198e8f2
-+F test/altertab.test 523ba6368e0da19f462f7c05563c569675736d946724cac1c4ae848f76783434
- F test/altertab2.test b0d62f323ca5dab42b0bc028c52e310ebdd13e655e8fac070fe622bad7852c2b
- F test/altertab3.test 155b8dc225ce484454a7fb4c8ba745680b6fa0fc3e08919cbbc19f9309d128ff
- F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
-@@ -1857,10 +1857,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91
- F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
- F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
- F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
--P 684293882c302600e112cf52553c19d84fdb31663d96e5dd7f8ac17dda00a026
--R dbb40938a904f2e39c11078dcedb87b0
-+P d09f8c3621d5f7f8c6d99d7d82bcaa8421855b3f470bea2b26c858106382b906
-+R 800f7c7b57166aa2318c88ff52f2e7ab
- T +bgcolor * #d0c0ff
- T +sym-release *
- T +sym-version-3.31.1 *
--U drh
--Z 1c021fc7d9ac6b5d0e31d06cd9bb3304
-+U dan
-+Z 369e72d27cf5a202a4749d0a2e3d428e
-diff -Npur -x .git sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/manifest.uuid sqlite.3.31.1_CVE-2020-11656_fb99e388_4db7ab53_patch003/manifest.uuid
---- sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/manifest.uuid	2020-05-25 09:50:19.076317552 +0800
-+++ sqlite.3.31.1_CVE-2020-11656_fb99e388_4db7ab53_patch003/manifest.uuid	2020-05-25 10:01:03.568710038 +0800
-@@ -1 +1 @@
--4a302b42c7bf5e11ddb5522ca999f74aba397d3a7eb91b1844bb02852f772441
-+684293882c302600e112cf52553c19d84fdb31663d96e5dd7f8ac17dda00a026
-diff -Npur -x .git sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/src/alter.c sqlite.3.31.1_CVE-2020-11656_fb99e388_4db7ab53_patch003/src/alter.c
---- sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/src/alter.c	2020-05-25 09:43:54.350324669 +0800
-+++ sqlite.3.31.1_CVE-2020-11656_fb99e388_4db7ab53_patch003/src/alter.c	2020-05-25 09:57:36.168219061 +0800
-@@ -756,6 +756,21 @@ static void renameWalkWith(Walker *pWalk
- }
- 
- /*
-+** Unmap all tokens in the IdList object passed as the second argument.
-+*/
-+static void unmapColumnIdlistNames(
-+  Parse *pParse,
-+  IdList *pIdList
-+){
-+  if( pIdList ){
-+    int ii;
-+    for(ii=0; ii<pIdList->nId; ii++){
-+      sqlite3RenameTokenRemap(pParse, 0, (void*)pIdList->a[ii].zName);
-+    }
-+  }
-+}
-+
-+/*
- ** Walker callback used by sqlite3RenameExprUnmap().
- */
- static int renameUnmapSelectCb(Walker *pWalker, Select *p){
-@@ -776,6 +791,7 @@ static int renameUnmapSelectCb(Walker *p
-     for(i=0; i<pSrc->nSrc; i++){
-       sqlite3RenameTokenRemap(pParse, 0, (void*)pSrc->a[i].zName);
-       if( sqlite3WalkExpr(pWalker, pSrc->a[i].pOn) ) return WRC_Abort;
-+      unmapColumnIdlistNames(pParse, pSrc->a[i].pUsing);
-     }
-   }
- 
-@@ -984,6 +1000,7 @@ static void renameColumnIdlistNames(
-   }
- }
- 
-+
- /*
- ** Parse the SQL statement zSql using Parse object (*p). The Parse object
- ** is initialized by this function before it is used.
-diff -Npur -x .git sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/src/resolve.c sqlite.3.31.1_CVE-2020-11656_fb99e388_4db7ab53_patch003/src/resolve.c
---- sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/src/resolve.c	2020-05-25 09:43:54.362324731 +0800
-+++ sqlite.3.31.1_CVE-2020-11656_fb99e388_4db7ab53_patch003/src/resolve.c	2020-05-25 10:00:02.705658443 +0800
-@@ -1177,7 +1177,7 @@ static int resolveOrderByTermToExprList(
-   nc.nErr = 0;
-   db = pParse->db;
-   savedSuppErr = db->suppressErr;
--  db->suppressErr = 1;
-+  if( IN_RENAME_OBJECT==0 ) db->suppressErr = 1;
-   rc = sqlite3ResolveExprNames(&nc, pE);
-   db->suppressErr = savedSuppErr;
-   if( rc ) return 0;
-diff -Npur -x .git sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/test/altertab.test sqlite.3.31.1_CVE-2020-11656_fb99e388_4db7ab53_patch003/test/altertab.test
---- sqlite.3.31.1_CVE-2020-11655_c415d910_patch002/test/altertab.test	2020-05-25 09:43:54.462325244 +0800
-+++ sqlite.3.31.1_CVE-2020-11656_fb99e388_4db7ab53_patch003/test/altertab.test	2020-05-25 10:00:02.697658682 +0800
-@@ -594,7 +594,6 @@ reset_db
- do_execsql_test 18.1.0 {
-   CREATE TABLE t0 (c0 INTEGER, PRIMARY KEY(c0)) WITHOUT ROWID;
- }
--breakpoint
- do_execsql_test 18.1.1 {
-   ALTER TABLE t0 RENAME COLUMN c0 TO c1;
- }
-@@ -613,4 +612,51 @@ do_execsql_test 18.2.2 {
-   SELECT sql FROM sqlite_master;
- } {{CREATE TABLE t0 (c1 INTEGER, PRIMARY KEY(c1))}}
- 
-+# 2020-02-23 ticket f50af3e8a565776b
-+reset_db
-+do_execsql_test 19.100 {
-+  CREATE TABLE t1(x);
-+  CREATE VIEW t2 AS SELECT 1 FROM t1, (t1 AS a0, t1);
-+  ALTER TABLE t1 RENAME TO t3;
-+  SELECT sql FROM sqlite_master;
-+} {{CREATE TABLE "t3"(x)} {CREATE VIEW t2 AS SELECT 1 FROM "t3", ("t3" AS a0, "t3")}}
-+do_execsql_test 19.110 {
-+  INSERT INTO t3(x) VALUES(123);
-+  SELECT * FROM t2;
-+} {1}
-+do_execsql_test 19.120 {
-+  INSERT INTO t3(x) VALUES('xyz');
-+  SELECT * FROM t2;
-+} {1 1 1 1 1 1 1 1}
-+
-+# Ticket 4722bdab08cb14
-+reset_db
-+do_execsql_test 20.0 {
-+  CREATE TABLE a(a);
-+  CREATE VIEW b AS SELECT(SELECT *FROM c JOIN a USING(d, a, a, a) JOIN a) IN();
-+}
-+do_execsql_test 20.1 {
-+  ALTER TABLE a RENAME a TO e;
-+} {}
-+
-+reset_db
-+do_execsql_test 21.0 {
-+  CREATE TABLE a(b);
-+  CREATE VIEW c AS 
-+      SELECT NULL INTERSECT 
-+      SELECT NULL ORDER BY
-+      likelihood(NULL, (d, (SELECT c)));
-+} {}
-+do_catchsql_test 21.1 {
-+  SELECT likelihood(NULL, (d, (SELECT c)));
-+} {1 {second argument to likelihood() must be a constant between 0.0 and 1.0}}
-+do_catchsql_test 21.2 {
-+  SELECT * FROM c;
-+} {1 {1st ORDER BY term does not match any column in the result set}}
-+
-+do_catchsql_test 21.3 {
-+  ALTER TABLE a RENAME TO e;
-+} {1 {error in view c: 1st ORDER BY term does not match any column in the result set}}
-+
-+
- finish_test

third_party/patch/sqlite/sqlite.windows.patch001

@@ -1,6 +1,6 @@
-diff -uprN sqlite-amalgamation-3310100/CMakeLists.txt sqlite-patch001/CMakeLists.txt
+diff -Npur sqlite-amalgamation-3320200/CMakeLists.txt linux-amalgamation/CMakeLists.txt
---- sqlite-amalgamation-3310100/CMakeLists.txt	1970-01-01 08:00:00.000000000 +0800
+--- sqlite-amalgamation-3320200/CMakeLists.txt	1970-01-01 08:00:00.000000000 +0800
-+++ sqlite-patch001/CMakeLists.txt	2020-05-25 10:47:36.902007755 +0800
++++ linux-amalgamation/CMakeLists.txt	2020-06-16 09:21:51.768154641 +0800
 @@ -0,0 +1,6 @@
 +cmake_minimum_required(VERSION 3.14)
 +project (Sqlite[C])
@@ -8,126 +8,245 @@ diff -uprN sqlite-amalgamation-3310100/CMakeLists.txt sqlite-patch001/CMakeLists
 +set_target_properties(sqlite3 PROPERTIES PUBLIC_HEADER "sqlite3.h;sqlite3ext.h")
 +include(GNUInstallDirs)
 +install(TARGETS sqlite3 PUBLIC_HEADER)
-diff -uprN sqlite-amalgamation-3310100/sqlite3.c sqlite-patch001/sqlite3.c
+diff -Npur sqlite-amalgamation-3320200/sqlite3.c linux-amalgamation/sqlite3.c
---- sqlite-amalgamation-3310100/sqlite3.c	2020-01-28 04:25:14.000000000 +0800
+--- sqlite-amalgamation-3320200/sqlite3.c	2020-06-04 22:01:17.000000000 +0800
-+++ sqlite-patch001/sqlite3.c	2020-05-25 10:49:04.057117196 +0800
++++ linux-amalgamation/sqlite3.c	2020-06-15 14:18:34.330175000 +0800
-@@ -1167,7 +1167,7 @@ extern "C" {
+@@ -1164,7 +1164,7 @@ extern "C" {
  */
- #define SQLITE_VERSION        "3.31.1"
+ #define SQLITE_VERSION        "3.32.2"
- #define SQLITE_VERSION_NUMBER 3031001
+ #define SQLITE_VERSION_NUMBER 3032002
--#define SQLITE_SOURCE_ID      "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6"
+-#define SQLITE_SOURCE_ID      "2020-06-04 12:58:43 ec02243ea6ce33b090870ae55ab8aa2534b54d216d45c4aa2fdbb00e86861e8c"
-+#define SQLITE_SOURCE_ID      "2020-01-27 19:55:54 bc2f42080a6a8a33048eedf289152768c416b2a7677a92111b3b1ea60d4aalt1"
++#define SQLITE_SOURCE_ID      "2020-06-04 12:58:43 ec02243ea6ce33b090870ae55ab8aa2534b54d216d45c4aa2fdbb00e8686alt1"
  
  /*
  ** CAPI3REF: Run-Time Library Version Numbers
-@@ -17428,8 +17428,11 @@ struct Table {
+@@ -14521,7 +14521,12 @@ typedef INT16_TYPE LogEst;
  */
- #ifndef SQLITE_OMIT_VIRTUALTABLE
+ #if defined(SQLITE_ENABLE_SELECTTRACE)
- #  define IsVirtual(X)      ((X)->nModuleArg)
+ # define SELECTTRACE_ENABLED 1
-+#  define ExprIsVtab(X)  \
++# define SELECTTRACE(K,P,S,X)  \
-+              ((X)->op==TK_COLUMN && (X)->y.pTab!=0 && (X)->y.pTab->nModuleArg)
++  if(sqlite3SelectTrace&(K))   \
++    sqlite3DebugPrintf("%u/%d/%p: ",(S)->selId,(P)->addrExplain,(S)),\
++    sqlite3DebugPrintf X
  #else
- #  define IsVirtual(X)      0
++# define SELECTTRACE(K,P,S,X)
-+#  define ExprIsVtab(X)     0
+ # define SELECTTRACE_ENABLED 0
  #endif
  
- /*
+@@ -17880,9 +17885,24 @@ struct AggInfo {
-@@ -104133,19 +104136,25 @@ static int impliesNotNullRow(Walker *pWa
+     int iDistinct;           /* Ephemeral table used to enforce DISTINCT */
-     case TK_LT:
+   } *aFunc;
-     case TK_LE:
+   int nFunc;              /* Number of entries in aFunc[] */
-     case TK_GT:
++#ifdef SQLITE_DEBUG
--    case TK_GE:
++  u32 iAggMagic;          /* Sanity checking constant */
-+    case TK_GE: {
++#endif
-+      Expr *pLeft = pExpr->pLeft;
+ };
-+      Expr *pRight = pExpr->pRight;
-       testcase( pExpr->op==TK_EQ );
-       testcase( pExpr->op==TK_NE );
-       testcase( pExpr->op==TK_LT );
-       testcase( pExpr->op==TK_LE );
-       testcase( pExpr->op==TK_GT );
-       testcase( pExpr->op==TK_GE );
--      if( (pExpr->pLeft->op==TK_COLUMN && IsVirtual(pExpr->pLeft->y.pTab))
--       || (pExpr->pRight->op==TK_COLUMN && IsVirtual(pExpr->pRight->y.pTab))
-+      /* The y.pTab=0 assignment in wherecode.c always happens after the
-+      ** impliesNotNullRow() test */
-+      if( (pLeft->op==TK_COLUMN && ALWAYS(pLeft->y.pTab!=0)
-+                               && IsVirtual(pLeft->y.pTab))
-+       || (pRight->op==TK_COLUMN && ALWAYS(pRight->y.pTab!=0)
-+                               && IsVirtual(pRight->y.pTab))
-       ){
--       return WRC_Prune;
-+        return WRC_Prune;
-       }
--
-+    }
-     default:
-       return WRC_Continue;
-   }
-@@ -142591,7 +142600,8 @@ static int isAuxiliaryVtabOperator(
-     **       MATCH(expression,vtab_column)
-     */
-     pCol = pList->a[1].pExpr;
--    if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){
-+    testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
-+    if( ExprIsVtab(pCol) ){
-       for(i=0; i<ArraySize(aOp); i++){
-         if( sqlite3StrICmp(pExpr->u.zToken, aOp[i].zOp)==0 ){
-           *peOp2 = aOp[i].eOp2;
-@@ -142613,7 +142623,8 @@ static int isAuxiliaryVtabOperator(
-     ** with function names in an arbitrary case.
-     */
-     pCol = pList->a[0].pExpr;
--    if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){
-+    testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
-+    if( ExprIsVtab(pCol) ){
-       sqlite3_vtab *pVtab;
-       sqlite3_module *pMod;
-       void (*xNotUsed)(sqlite3_context*,int,sqlite3_value**);
-@@ -142636,10 +142647,12 @@ static int isAuxiliaryVtabOperator(
-     int res = 0;
-     Expr *pLeft = pExpr->pLeft;
-     Expr *pRight = pExpr->pRight;
--    if( pLeft->op==TK_COLUMN && IsVirtual(pLeft->y.pTab) ){
-+    testcase( pLeft->op==TK_COLUMN && pLeft->y.pTab==0 );
-+    if( ExprIsVtab(pLeft) ){
-       res++;
-     }
--    if( pRight && pRight->op==TK_COLUMN && IsVirtual(pRight->y.pTab) ){
-+    testcase( pRight && pRight->op==TK_COLUMN && pRight->y.pTab==0 );
-+    if( pRight && ExprIsVtab(pRight) ){
-       res++;
-       SWAP(Expr*, pLeft, pRight);
-     }
-@@ -223667,7 +223680,7 @@ static void fts5SourceIdFunc(
- ){
-   assert( nArg==0 );
-   UNUSED_PARAM2(nArg, apUnused);
--  sqlite3_result_text(pCtx, "fts5: 2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6", -1, SQLITE_TRANSIENT);
-+  sqlite3_result_text(pCtx, "fts5: 2020-01-27 19:55:54 abc473fb8fb999005dc79a360e34f97b3b25429decf1820dd2afa5c19577753d", -1, SQLITE_TRANSIENT);
- }
  
  /*
-@@ -228440,9 +228453,9 @@ SQLITE_API int sqlite3_stmt_init(
++** Allowed values for AggInfo.iAggMagic
++*/
++#define SQLITE_AGGMAGIC_VALID  0x05cadade
++
++/*
++** True if the AggInfo object is valid.  Used inside of assert() only.
++*/
++#ifdef SQLITE_DEBUG
++#  define AggInfoValid(P) ((P)->iAggMagic==SQLITE_AGGMAGIC_VALID)
++#endif
++
++/*
+ ** The datatype ynVar is a signed integer, either 16-bit or 32-bit.
+ ** Usually it is 16-bits.  But if SQLITE_MAX_VARIABLE_NUMBER is greater
+ ** than 32767 we have to make it 32-bit.  16-bit is preferred because
+@@ -19903,10 +19923,11 @@ SQLITE_PRIVATE const unsigned char sqlit
+ SQLITE_PRIVATE const unsigned char sqlite3CtypeMap[];
+ SQLITE_PRIVATE SQLITE_WSD struct Sqlite3Config sqlite3Config;
+ SQLITE_PRIVATE FuncDefHash sqlite3BuiltinFunctions;
++SQLITE_PRIVATE u32 sqlite3SelectTrace;
+ #ifndef SQLITE_OMIT_WSD
+ SQLITE_PRIVATE int sqlite3PendingByte;
+ #endif
+-#endif
++#endif /* !defined(SQLITE_AMALGAMATION) */
+ #ifdef VDBE_PROFILE
+ SQLITE_PRIVATE sqlite3_uint64 sqlite3NProfileCnt;
+ #endif
+@@ -20616,6 +20637,11 @@ SQLITE_PRIVATE sqlite3_uint64 sqlite3NPr
+ SQLITE_PRIVATE int sqlite3PendingByte = 0x40000000;
+ #endif
+ 
++/*
++** Flags for select tracing and the ".selecttrace" macro of the CLI
++*/
++/**/ u32 sqlite3SelectTrace = 0;
++
+ /* #include "opcodes.h" */
+ /*
+ ** Properties of opcodes.  The OPFLG_INITIALIZER macro is
+@@ -99243,6 +99269,14 @@ static int resolveSelectStep(Walker *pWa
+           return WRC_Abort;
+         }
+       }
++    }else if( p->pWin && ALWAYS( (p->selFlags & SF_WinRewrite)==0 ) ){
++      sqlite3WindowRewrite(pParse, p);
++#if SELECTTRACE_ENABLED
++      if( (sqlite3SelectTrace & 0x108)!=0 ){
++        SELECTTRACE(0x104,pParse,p, ("after window rewrite:\n"));
++        sqlite3TreeViewSelect(0, p, 0);
++      }
++#endif
+     }
+ #endif
+ 
+@@ -103297,6 +103331,7 @@ expr_code_doover:
+       AggInfo *pAggInfo = pExpr->pAggInfo;
+       struct AggInfo_col *pCol;
+       assert( pAggInfo!=0 );
++      assert( AggInfoValid(pAggInfo) );
+       assert( pExpr->iAgg>=0 && pExpr->iAgg<pAggInfo->nColumn );
+       pCol = &pAggInfo->aCol[pExpr->iAgg];
+       if( !pAggInfo->directMode ){
+@@ -103605,6 +103640,7 @@ expr_code_doover:
+         assert( !ExprHasProperty(pExpr, EP_IntValue) );
+         sqlite3ErrorMsg(pParse, "misuse of aggregate: %s()", pExpr->u.zToken);
+       }else{
++        assert( AggInfoValid(pInfo) );
+         return pInfo->aFunc[pExpr->iAgg].iMem;
+       }
+       break;
+@@ -105142,13 +105178,7 @@ struct SrcCount {
+ ** Count the number of references to columns.
+ */
+ static int exprSrcCount(Walker *pWalker, Expr *pExpr){
+-  /* There was once a NEVER() on the second term on the grounds that
+-  ** sqlite3FunctionUsesThisSrc() was always called before 
+-  ** sqlite3ExprAnalyzeAggregates() and so the TK_COLUMNs have not yet 
+-  ** been converted into TK_AGG_COLUMN. But this is no longer true due
+-  ** to window functions - sqlite3WindowRewrite() may now indirectly call
+-  ** FunctionUsesThisSrc() when creating a new sub-select. */
+-  if( pExpr->op==TK_COLUMN || pExpr->op==TK_AGG_COLUMN ){
++  if( pExpr->op==TK_COLUMN || NEVER(pExpr->op==TK_AGG_COLUMN) ){
+     int i;
+     struct SrcCount *p = pWalker->u.pSrcCount;
+     SrcList *pSrc = p->pSrc;
+@@ -128851,20 +128881,6 @@ SQLITE_API int sqlite3_prepare16_v3(
+ /* #include "sqliteInt.h" */
+ 
+ /*
+-** Trace output macros
+-*/
+-#if SELECTTRACE_ENABLED
+-/***/ int sqlite3SelectTrace = 0;
+-# define SELECTTRACE(K,P,S,X)  \
+-  if(sqlite3SelectTrace&(K))   \
+-    sqlite3DebugPrintf("%u/%d/%p: ",(S)->selId,(P)->addrExplain,(S)),\
+-    sqlite3DebugPrintf X
+-#else
+-# define SELECTTRACE(K,P,S,X)
+-#endif
+-
+-
+-/*
+ ** An instance of the following object is used to record information about
+ ** how to process the DISTINCT keyword, to simplify passing that information
+ ** into the selectInnerLoop() routine.
+@@ -133262,11 +133278,14 @@ static int pushDownWhereTerms(
+ ){
+   Expr *pNew;
+   int nChng = 0;
++  Select *pSel;
+   if( pWhere==0 ) return 0;
+   if( pSubq->selFlags & SF_Recursive ) return 0;  /* restriction (2) */
+ 
+ #ifndef SQLITE_OMIT_WINDOWFUNC
+-  if( pSubq->pWin ) return 0;    /* restriction (6) */
++  for(pSel=pSubq; pSel; pSel=pSel->pPrior){
++    if( pSel->pWin ) return 0;    /* restriction (6) */
++  }
+ #endif
+ 
+ #ifdef SQLITE_DEBUG
+@@ -134602,6 +134621,9 @@ SQLITE_PRIVATE int sqlite3Select(
+   }
+   if( sqlite3AuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1;
+   memset(&sAggInfo, 0, sizeof(sAggInfo));
++#ifdef SQLITE_DEBUG
++  sAggInfo.iAggMagic = SQLITE_AGGMAGIC_VALID;
++#endif
+ #if SELECTTRACE_ENABLED
+   SELECTTRACE(1,pParse,p, ("begin processing:\n", pParse->addrExplain));
+   if( sqlite3SelectTrace & 0x100 ){
+@@ -134640,19 +134662,6 @@ SQLITE_PRIVATE int sqlite3Select(
+     generateColumnNames(pParse, p);
+   }
+ 
+-#ifndef SQLITE_OMIT_WINDOWFUNC
+-  rc = sqlite3WindowRewrite(pParse, p);
+-  if( rc ){
+-    assert( db->mallocFailed || pParse->nErr>0 );
+-    goto select_end;
+-  }
+-#if SELECTTRACE_ENABLED
+-  if( p->pWin && (sqlite3SelectTrace & 0x108)!=0 ){
+-    SELECTTRACE(0x104,pParse,p, ("after window rewrite:\n"));
+-    sqlite3TreeViewSelect(0, p, 0);
+-  }
+-#endif
+-#endif /* SQLITE_OMIT_WINDOWFUNC */
+   pTabList = p->pSrc;
+   isAgg = (p->selFlags & SF_Aggregate)!=0;
+   memset(&sSort, 0, sizeof(sSort));
+@@ -134980,7 +134989,7 @@ SQLITE_PRIVATE int sqlite3Select(
+   if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct 
+    && sqlite3ExprListCompare(sSort.pOrderBy, pEList, -1)==0
+ #ifndef SQLITE_OMIT_WINDOWFUNC
+-   && p->pWin==0
++   && ALWAYS(p->pWin==0)
+ #endif
+   ){
+     p->selFlags &= ~SF_Distinct;
+@@ -135627,6 +135636,14 @@ SQLITE_PRIVATE int sqlite3Select(
+ select_end:
+   sqlite3ExprListDelete(db, pMinMaxOrderBy);
+   sqlite3DbFree(db, sAggInfo.aCol);
++#ifdef SQLITE_DEBUG
++  for(i=0; i<sAggInfo.nFunc; i++){
++    assert( sAggInfo.aFunc[i].pExpr!=0 );
++    assert( sAggInfo.aFunc[i].pExpr->pAggInfo==&sAggInfo );
++    sAggInfo.aFunc[i].pExpr->pAggInfo = 0;
++  }
++  sAggInfo.iAggMagic = 0;
++#endif
+   sqlite3DbFree(db, sAggInfo.aFunc);
+ #if SELECTTRACE_ENABLED
+   SELECTTRACE(0x1,pParse,p,("end processing\n"));
+@@ -151305,7 +151322,7 @@ static int sqlite3WindowExtraAggFuncDept
+ */
+ SQLITE_PRIVATE int sqlite3WindowRewrite(Parse *pParse, Select *p){
+   int rc = SQLITE_OK;
+-  if( p->pWin && p->pPrior==0 && (p->selFlags & SF_WinRewrite)==0 ){
++  if( ALWAYS(p->pWin && (p->selFlags & SF_WinRewrite)==0) ){
+     Vdbe *v = sqlite3GetVdbe(pParse);
+     sqlite3 *db = pParse->db;
+     Select *pSub = 0;             /* The subquery */
+@@ -229607,7 +229624,7 @@ SQLITE_API int sqlite3_stmt_init(
  #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
  
  /************** End of stmt.c ************************************************/
--#if __LINE__!=228443
+-#if __LINE__!=229610
-+#if __LINE__!=228456
++#if __LINE__!=229627
  #undef SQLITE_SOURCE_ID
--#define SQLITE_SOURCE_ID      "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837balt2"
+ #define SQLITE_SOURCE_ID      "2020-06-04 12:58:43 ec02243ea6ce33b090870ae55ab8aa2534b54d216d45c4aa2fdbb00e8686alt2"
-+#define SQLITE_SOURCE_ID      "2020-01-27 19:55:54 bc2f42080a6a8a33048eedf289152768c416b2a7677a92111b3b1ea60d4aalt2"
  #endif
- /* Return the source-id for this library */
+diff -Npur sqlite-amalgamation-3320200/sqlite3.h linux-amalgamation/sqlite3.h
- SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
+--- sqlite-amalgamation-3320200/sqlite3.h	2020-06-04 22:01:17.000000000 +0800
-diff -uprN sqlite-amalgamation-3310100/sqlite3.h sqlite-patch001/sqlite3.h
++++ linux-amalgamation/sqlite3.h	2020-06-15 14:18:32.674154000 +0800
---- sqlite-amalgamation-3310100/sqlite3.h	2020-01-28 04:25:14.000000000 +0800
-+++ sqlite-patch001/sqlite3.h	2020-05-25 10:49:17.932970790 +0800
 @@ -125,7 +125,7 @@ extern "C" {
  */
- #define SQLITE_VERSION        "3.31.1"
+ #define SQLITE_VERSION        "3.32.2"
- #define SQLITE_VERSION_NUMBER 3031001
+ #define SQLITE_VERSION_NUMBER 3032002
--#define SQLITE_SOURCE_ID      "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6"
+-#define SQLITE_SOURCE_ID      "2020-06-04 12:58:43 ec02243ea6ce33b090870ae55ab8aa2534b54d216d45c4aa2fdbb00e86861e8c"
-+#define SQLITE_SOURCE_ID      "2020-01-27 19:55:54 bc2f42080a6a8a33048eedf289152768c416b2a7677a92111b3b1ea60d4aalt1"
++#define SQLITE_SOURCE_ID      "2020-06-04 12:58:43 ec02243ea6ce33b090870ae55ab8aa2534b54d216d45c4aa2fdbb00e8686alt1"
  
  /*
  ** CAPI3REF: Run-Time Library Version Numbers

third_party/patch/sqlite/sqlite.windows.patch002

@@ -1,53 +0,0 @@
-diff -uprN sqlite-patch001/sqlite3.c sqlite-patch002/sqlite3.c
---- sqlite-patch001/sqlite3.c	2020-05-25 10:49:04.057117196 +0800
-+++ sqlite-patch002/sqlite3.c	2020-05-25 10:56:21.120064808 +0800
-@@ -1167,7 +1167,7 @@ extern "C" {
- */
- #define SQLITE_VERSION        "3.31.1"
- #define SQLITE_VERSION_NUMBER 3031001
--#define SQLITE_SOURCE_ID      "2020-01-27 19:55:54 bc2f42080a6a8a33048eedf289152768c416b2a7677a92111b3b1ea60d4aalt1"
-+#define SQLITE_SOURCE_ID      "2020-04-03 13:19:03 0f4911fdb07c7c4111731d3db0adae54ee750ddbad8d98bf9ab957fb923falt1"
- 
- /*
- ** CAPI3REF: Run-Time Library Version Numbers
-@@ -133226,6 +133226,7 @@ static void resetAccumulator(Parse *pPar
-   struct AggInfo_func *pFunc;
-   int nReg = pAggInfo->nFunc + pAggInfo->nColumn;
-   if( nReg==0 ) return;
-+  if( pParse->nErr ) return;
- #ifdef SQLITE_DEBUG
-   /* Verify that all AggInfo registers are within the range specified by
-   ** AggInfo.mnReg..AggInfo.mxReg */
-@@ -223680,7 +223681,7 @@ static void fts5SourceIdFunc(
- ){
-   assert( nArg==0 );
-   UNUSED_PARAM2(nArg, apUnused);
--  sqlite3_result_text(pCtx, "fts5: 2020-01-27 19:55:54 abc473fb8fb999005dc79a360e34f97b3b25429decf1820dd2afa5c19577753d", -1, SQLITE_TRANSIENT);
-+  sqlite3_result_text(pCtx, "fts5: 2020-04-03 13:19:03 4a302b42c7bf5e11ddb5522ca999f74aba397d3a7eb91b1844bb02852f772441", -1, SQLITE_TRANSIENT);
- }
- 
- /*
-@@ -228453,9 +228454,9 @@ SQLITE_API int sqlite3_stmt_init(
- #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
- 
- /************** End of stmt.c ************************************************/
--#if __LINE__!=228456
-+#if __LINE__!=228457
- #undef SQLITE_SOURCE_ID
--#define SQLITE_SOURCE_ID      "2020-01-27 19:55:54 bc2f42080a6a8a33048eedf289152768c416b2a7677a92111b3b1ea60d4aalt2"
-+#define SQLITE_SOURCE_ID      "2020-04-03 13:19:03 0f4911fdb07c7c4111731d3db0adae54ee750ddbad8d98bf9ab957fb923falt2"
- #endif
- /* Return the source-id for this library */
- SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
-diff -uprN sqlite-patch001/sqlite3.h sqlite-patch002/sqlite3.h
---- sqlite-patch001/sqlite3.h	2020-05-25 10:49:17.932970790 +0800
-+++ sqlite-patch002/sqlite3.h	2020-05-25 10:56:23.296037923 +0800
-@@ -125,7 +125,7 @@ extern "C" {
- */
- #define SQLITE_VERSION        "3.31.1"
- #define SQLITE_VERSION_NUMBER 3031001
--#define SQLITE_SOURCE_ID      "2020-01-27 19:55:54 bc2f42080a6a8a33048eedf289152768c416b2a7677a92111b3b1ea60d4aalt1"
-+#define SQLITE_SOURCE_ID      "2020-04-03 13:19:03 0f4911fdb07c7c4111731d3db0adae54ee750ddbad8d98bf9ab957fb923falt1"
- 
- /*
- ** CAPI3REF: Run-Time Library Version Numbers

third_party/patch/sqlite/sqlite.windows.patch003

@@ -1,92 +0,0 @@
-diff -uprN sqlite-patch002/sqlite3.c sqlite-patch003/sqlite3.c
---- sqlite-patch002/sqlite3.c	2020-05-25 10:56:21.120064808 +0800
-+++ sqlite-patch003/sqlite3.c	2020-05-25 11:00:13.909126750 +0800
-@@ -1167,7 +1167,7 @@ extern "C" {
- */
- #define SQLITE_VERSION        "3.31.1"
- #define SQLITE_VERSION_NUMBER 3031001
--#define SQLITE_SOURCE_ID      "2020-04-03 13:19:03 0f4911fdb07c7c4111731d3db0adae54ee750ddbad8d98bf9ab957fb923falt1"
-+#define SQLITE_SOURCE_ID      "2020-04-03 11:52:59 b58be6e2216e7a8e9c0eee07c42856f751359bbfa740e8ad8c5d73b33273alt1"
- 
- /*
- ** CAPI3REF: Run-Time Library Version Numbers
-@@ -97945,7 +97945,7 @@ static int resolveOrderByTermToExprList(
-   nc.nErr = 0;
-   db = pParse->db;
-   savedSuppErr = db->suppressErr;
--  db->suppressErr = 1;
-+  if( IN_RENAME_OBJECT==0 ) db->suppressErr = 1;
-   rc = sqlite3ResolveExprNames(&nc, pE);
-   db->suppressErr = savedSuppErr;
-   if( rc ) return 0;
-@@ -105384,6 +105384,21 @@ static void renameWalkWith(Walker *pWalk
- }
- 
- /*
-+** Unmap all tokens in the IdList object passed as the second argument.
-+*/
-+static void unmapColumnIdlistNames(
-+  Parse *pParse,
-+  IdList *pIdList
-+){
-+  if( pIdList ){
-+    int ii;
-+    for(ii=0; ii<pIdList->nId; ii++){
-+      sqlite3RenameTokenRemap(pParse, 0, (void*)pIdList->a[ii].zName);
-+    }
-+  }
-+}
-+
-+/*
- ** Walker callback used by sqlite3RenameExprUnmap().
- */
- static int renameUnmapSelectCb(Walker *pWalker, Select *p){
-@@ -105404,6 +105419,7 @@ static int renameUnmapSelectCb(Walker *p
-     for(i=0; i<pSrc->nSrc; i++){
-       sqlite3RenameTokenRemap(pParse, 0, (void*)pSrc->a[i].zName);
-       if( sqlite3WalkExpr(pWalker, pSrc->a[i].pOn) ) return WRC_Abort;
-+      unmapColumnIdlistNames(pParse, pSrc->a[i].pUsing);
-     }
-   }
- 
-@@ -105612,6 +105628,7 @@ static void renameColumnIdlistNames(
-   }
- }
- 
-+
- /*
- ** Parse the SQL statement zSql using Parse object (*p). The Parse object
- ** is initialized by this function before it is used.
-@@ -223681,7 +223698,7 @@ static void fts5SourceIdFunc(
- ){
-   assert( nArg==0 );
-   UNUSED_PARAM2(nArg, apUnused);
--  sqlite3_result_text(pCtx, "fts5: 2020-04-03 13:19:03 4a302b42c7bf5e11ddb5522ca999f74aba397d3a7eb91b1844bb02852f772441", -1, SQLITE_TRANSIENT);
-+  sqlite3_result_text(pCtx, "fts5: 2020-04-03 11:52:59 684293882c302600e112cf52553c19d84fdb31663d96e5dd7f8ac17dda00a026", -1, SQLITE_TRANSIENT);
- }
- 
- /*
-@@ -228454,9 +228471,9 @@ SQLITE_API int sqlite3_stmt_init(
- #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
- 
- /************** End of stmt.c ************************************************/
--#if __LINE__!=228457
-+#if __LINE__!=228474
- #undef SQLITE_SOURCE_ID
--#define SQLITE_SOURCE_ID      "2020-04-03 13:19:03 0f4911fdb07c7c4111731d3db0adae54ee750ddbad8d98bf9ab957fb923falt2"
-+#define SQLITE_SOURCE_ID      "2020-04-03 11:52:59 b58be6e2216e7a8e9c0eee07c42856f751359bbfa740e8ad8c5d73b33273alt2"
- #endif
- /* Return the source-id for this library */
- SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
-diff -uprN sqlite-patch002/sqlite3.h sqlite-patch003/sqlite3.h
---- sqlite-patch002/sqlite3.h	2020-05-25 10:56:23.296037923 +0800
-+++ sqlite-patch003/sqlite3.h	2020-05-25 11:00:14.649117241 +0800
-@@ -125,7 +125,7 @@ extern "C" {
- */
- #define SQLITE_VERSION        "3.31.1"
- #define SQLITE_VERSION_NUMBER 3031001
--#define SQLITE_SOURCE_ID      "2020-04-03 13:19:03 0f4911fdb07c7c4111731d3db0adae54ee750ddbad8d98bf9ab957fb923falt1"
-+#define SQLITE_SOURCE_ID      "2020-04-03 11:52:59 b58be6e2216e7a8e9c0eee07c42856f751359bbfa740e8ad8c5d73b33273alt1"
- 
- /*
- ** CAPI3REF: Run-Time Library Version Numbers