sqlite-amalgamation-3440200.zip

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4641 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
Cory McWilliams 2023-11-25 13:21:49 +00:00
parent 8c92a5ff7b
commit ba13a08e78
3 changed files with 32 additions and 23 deletions

6
deps/sqlite/shell.c vendored
View File

@ -894,8 +894,8 @@ static PerStreamTags * getDesignatedEmitStream(FILE *pf, unsigned chix,
** chix equals 1 or 2, or for an arbitrary stream when chix == 0. ** chix equals 1 or 2, or for an arbitrary stream when chix == 0.
** In either case, ppst references a caller-owned PerStreamTags ** In either case, ppst references a caller-owned PerStreamTags
** struct which may be filled in if none of the known writable ** struct which may be filled in if none of the known writable
** streams is being held by consoleInfo. The ppf parameter is an ** streams is being held by consoleInfo. The ppf parameter is a
** output when chix!=0 and an input when chix==0. ** byref output when chix!=0 and a byref input when chix==0.
*/ */
static PerStreamTags * static PerStreamTags *
getEmitStreamInfo(unsigned chix, PerStreamTags *ppst, getEmitStreamInfo(unsigned chix, PerStreamTags *ppst,
@ -908,7 +908,7 @@ getEmitStreamInfo(unsigned chix, PerStreamTags *ppst,
ppstTry = &consoleInfo.pstSetup[chix]; ppstTry = &consoleInfo.pstSetup[chix];
pfEmit = ppst->pf; pfEmit = ppst->pf;
}else pfEmit = ppstTry->pf; }else pfEmit = ppstTry->pf;
if( !isValidStreamInfo(ppst) ){ if( !isValidStreamInfo(ppstTry) ){
pfEmit = (chix > 1)? stderr : stdout; pfEmit = (chix > 1)? stderr : stdout;
ppstTry = ppst; ppstTry = ppst;
streamOfConsole(pfEmit, ppstTry); streamOfConsole(pfEmit, ppstTry);

43
deps/sqlite/sqlite3.c vendored
View File

@ -1,6 +1,6 @@
/****************************************************************************** /******************************************************************************
** This file is an amalgamation of many separate C source files from SQLite ** This file is an amalgamation of many separate C source files from SQLite
** version 3.44.1. By combining all the individual C code files into this ** version 3.44.2. By combining all the individual C code files into this
** single large file, the entire code can be compiled as a single translation ** single large file, the entire code can be compiled as a single translation
** unit. This allows many compilers to do optimizations that would not be ** unit. This allows many compilers to do optimizations that would not be
** possible if the files were compiled separately. Performance improvements ** possible if the files were compiled separately. Performance improvements
@ -18,7 +18,7 @@
** separate file. This file contains only code for the core SQLite library. ** separate file. This file contains only code for the core SQLite library.
** **
** The content in this amalgamation comes from Fossil check-in ** The content in this amalgamation comes from Fossil check-in
** d295f48e8f367b066b881780c98bdf980a1d. ** ebead0e7230cd33bcec9f95d2183069565b9.
*/ */
#define SQLITE_CORE 1 #define SQLITE_CORE 1
#define SQLITE_AMALGAMATION 1 #define SQLITE_AMALGAMATION 1
@ -459,9 +459,9 @@ extern "C" {
** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()]. ** [sqlite_version()] and [sqlite_source_id()].
*/ */
#define SQLITE_VERSION "3.44.1" #define SQLITE_VERSION "3.44.2"
#define SQLITE_VERSION_NUMBER 3044001 #define SQLITE_VERSION_NUMBER 3044002
#define SQLITE_SOURCE_ID "2023-11-22 14:18:12 d295f48e8f367b066b881780c98bdf980a1d550397d5ba0b0e49842c95b3e8b4" #define SQLITE_SOURCE_ID "2023-11-24 11:41:44 ebead0e7230cd33bcec9f95d2183069565b9e709bf745c9b5db65cc0cbf92c0f"
/* /*
** CAPI3REF: Run-Time Library Version Numbers ** CAPI3REF: Run-Time Library Version Numbers
@ -84183,10 +84183,11 @@ static int growOpArray(Vdbe *v, int nOp){
** sqlite3CantopenError(lineno) ** sqlite3CantopenError(lineno)
*/ */
static void test_addop_breakpoint(int pc, Op *pOp){ static void test_addop_breakpoint(int pc, Op *pOp){
static int n = 0; static u64 n = 0;
(void)pc; (void)pc;
(void)pOp; (void)pOp;
n++; n++;
if( n==LARGEST_UINT64 ) abort(); /* so that n is used, preventing a warning */
} }
#endif #endif
@ -92330,11 +92331,12 @@ SQLITE_API int sqlite3_found_count = 0;
** sqlite3CantopenError(lineno) ** sqlite3CantopenError(lineno)
*/ */
static void test_trace_breakpoint(int pc, Op *pOp, Vdbe *v){ static void test_trace_breakpoint(int pc, Op *pOp, Vdbe *v){
static int n = 0; static u64 n = 0;
(void)pc; (void)pc;
(void)pOp; (void)pOp;
(void)v; (void)v;
n++; n++;
if( n==LARGEST_UINT64 ) abort(); /* So that n is used, preventing a warning */
} }
#endif #endif
@ -143612,7 +143614,8 @@ SQLITE_PRIVATE void sqlite3SubqueryColumnTypes(
NameContext sNC; NameContext sNC;
assert( pSelect!=0 ); assert( pSelect!=0 );
assert( (pSelect->selFlags & SF_Resolved)!=0 ); testcase( (pSelect->selFlags & SF_Resolved)==0 );
assert( (pSelect->selFlags & SF_Resolved)!=0 || IN_RENAME_OBJECT );
assert( pTab->nCol==pSelect->pEList->nExpr || pParse->nErr>0 ); assert( pTab->nCol==pSelect->pEList->nExpr || pParse->nErr>0 );
assert( aff==SQLITE_AFF_NONE || aff==SQLITE_AFF_BLOB ); assert( aff==SQLITE_AFF_NONE || aff==SQLITE_AFF_BLOB );
if( db->mallocFailed || IN_RENAME_OBJECT ) return; if( db->mallocFailed || IN_RENAME_OBJECT ) return;
@ -241506,18 +241509,24 @@ static void fts5DoSecureDelete(
iOff = iStart; iOff = iStart;
/* Set variable bLastInDoclist to true if this entry happens to be /* If the position-list for the entry being removed flows over past
** the last rowid in the doclist for its term. */ ** the end of this page, delete the portion of the position-list on the
** next page and beyond.
**
** Set variable bLastInDoclist to true if this entry happens
** to be the last rowid in the doclist for its term. */
if( iNextOff>=iPgIdx ){
int pgno = pSeg->iLeafPgno+1;
fts5SecureDeleteOverflow(p, pSeg->pSeg, pgno, &bLastInDoclist);
iNextOff = iPgIdx;
}
if( pSeg->bDel==0 ){ if( pSeg->bDel==0 ){
if( iNextOff>=iPgIdx ){ if( iNextOff!=iPgIdx ){
int pgno = pSeg->iLeafPgno+1;
fts5SecureDeleteOverflow(p, pSeg->pSeg, pgno, &bLastInDoclist);
iNextOff = iPgIdx;
}else{
/* Loop through the page-footer. If iNextOff (offset of the /* Loop through the page-footer. If iNextOff (offset of the
** entry following the one we are removing) is equal to the ** entry following the one we are removing) is equal to the
** offset of a key on this page, then the entry is the last ** offset of a key on this page, then the entry is the last
** in its doclist. */ ** in its doclist. */
int iKeyOff = 0; int iKeyOff = 0;
for(iIdx=0; iIdx<nIdx; /* no-op */){ for(iIdx=0; iIdx<nIdx; /* no-op */){
u32 iVal = 0; u32 iVal = 0;
@ -247612,7 +247621,7 @@ static void fts5SourceIdFunc(
){ ){
assert( nArg==0 ); assert( nArg==0 );
UNUSED_PARAM2(nArg, apUnused); UNUSED_PARAM2(nArg, apUnused);
sqlite3_result_text(pCtx, "fts5: 2023-11-22 14:18:12 d295f48e8f367b066b881780c98bdf980a1d550397d5ba0b0e49842c95b3e8b4", -1, SQLITE_TRANSIENT); sqlite3_result_text(pCtx, "fts5: 2023-11-24 11:41:44 ebead0e7230cd33bcec9f95d2183069565b9e709bf745c9b5db65cc0cbf92c0f", -1, SQLITE_TRANSIENT);
} }
/* /*

View File

@ -146,9 +146,9 @@ extern "C" {
** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()]. ** [sqlite_version()] and [sqlite_source_id()].
*/ */
#define SQLITE_VERSION "3.44.1" #define SQLITE_VERSION "3.44.2"
#define SQLITE_VERSION_NUMBER 3044001 #define SQLITE_VERSION_NUMBER 3044002
#define SQLITE_SOURCE_ID "2023-11-22 14:18:12 d295f48e8f367b066b881780c98bdf980a1d550397d5ba0b0e49842c95b3e8b4" #define SQLITE_SOURCE_ID "2023-11-24 11:41:44 ebead0e7230cd33bcec9f95d2183069565b9e709bf745c9b5db65cc0cbf92c0f"
/* /*
** CAPI3REF: Run-Time Library Version Numbers ** CAPI3REF: Run-Time Library Version Numbers