Pablu/go-sqlite3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade SQLite to version 3051002

Browse Source
This commit is contained in:
Yasuhiro Matsumoto
2026-01-16 17:08:37 +09:00
committed by mattn
parent dce6b34a89
commit a5108832c7
2 changed files with 106 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
sqlite3-binding.c
View File

@@ -1,7 +1,7 @@
#ifndef USE_LIBSQLITE3 #ifndef USE_LIBSQLITE3
/****************************************************************************** /******************************************************************************
** 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.51.1. By combining all the individual C code files into this ** version 3.51.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
@@ -19,7 +19,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
** 281fc0e9afc38674b9b0991943b9e9d1e64c with changes in files: ** b270f8339eb13b504d0b2ba154ebca966b7d with changes in files:
** **
** **
*/ */
@@ -468,12 +468,12 @@ 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.51.1" #define SQLITE_VERSION "3.51.2"
#define SQLITE_VERSION_NUMBER 3051001 #define SQLITE_VERSION_NUMBER 3051002
#define SQLITE_SOURCE_ID "2025-11-28 17:28:25 281fc0e9afc38674b9b0991943b9e9d1e64c6cbdb133d35f6f5c87ff6af38a88" #define SQLITE_SOURCE_ID "2026-01-09 17:27:48 b270f8339eb13b504d0b2ba154ebca966b7dde08e40c3ed7d559749818cb2075"
#define SQLITE_SCM_BRANCH "branch-3.51" #define SQLITE_SCM_BRANCH "branch-3.51"
#define SQLITE_SCM_TAGS "release version-3.51.1" #define SQLITE_SCM_TAGS "release version-3.51.2"
#define SQLITE_SCM_DATETIME "2025-11-28T17:28:25.933Z" #define SQLITE_SCM_DATETIME "2026-01-09T17:27:48.405Z"
/* /*
** CAPI3REF: Run-Time Library Version Numbers ** CAPI3REF: Run-Time Library Version Numbers
@@ -41229,12 +41229,18 @@ static int unixLock(sqlite3_file *id, int eFileLock){
pInode->nLock++; pInode->nLock++;
pInode->nShared = 1; pInode->nShared = 1;
} }
}else if( (eFileLock==EXCLUSIVE_LOCK && pInode->nShared>1) }else if( eFileLock==EXCLUSIVE_LOCK && pInode->nShared>1 ){
|| unixIsSharingShmNode(pFile)
){
/* We are trying for an exclusive lock but another thread in this /* We are trying for an exclusive lock but another thread in this
** same process is still holding a shared lock. */ ** same process is still holding a shared lock. */
rc = SQLITE_BUSY; rc = SQLITE_BUSY;
}else if( unixIsSharingShmNode(pFile) ){
/* We are in WAL mode and attempting to delete the SHM and WAL
** files due to closing the connection or changing out of WAL mode,
** but another process still holds locks on the SHM file, thus
** indicating that database locks have been broken, perhaps due
** to a rogue close(open(dbFile)) or similar.
*/
rc = SQLITE_BUSY;
}else{ }else{
/* The request was for a RESERVED or EXCLUSIVE lock. It is /* The request was for a RESERVED or EXCLUSIVE lock. It is
** assumed that there is a SHARED or greater lock on the file ** assumed that there is a SHARED or greater lock on the file
@@ -43873,26 +43879,21 @@ static int unixFcntlExternalReader(unixFile *pFile, int *piOut){
** still not a disaster. ** still not a disaster.
*/ */
static int unixIsSharingShmNode(unixFile *pFile){ static int unixIsSharingShmNode(unixFile *pFile){
int rc;
unixShmNode *pShmNode; unixShmNode *pShmNode;
struct flock lock;
if( pFile->pShm==0 ) return 0; if( pFile->pShm==0 ) return 0;
if( pFile->ctrlFlags & UNIXFILE_EXCL ) return 0; if( pFile->ctrlFlags & UNIXFILE_EXCL ) return 0;
pShmNode = pFile->pShm->pShmNode; pShmNode = pFile->pShm->pShmNode;
rc = 1; #if SQLITE_ATOMIC_INTRINSICS
unixEnterMutex(); assert( AtomicLoad(&pShmNode->nRef)==1 );
if( ALWAYS(pShmNode->nRef==1) ){ #endif
struct flock lock; memset(&lock, 0, sizeof(lock));
lock.l_whence = SEEK_SET; lock.l_whence = SEEK_SET;
lock.l_start = UNIX_SHM_DMS; lock.l_start = UNIX_SHM_DMS;
lock.l_len = 1; lock.l_len = 1;
lock.l_type = F_WRLCK; lock.l_type = F_WRLCK;
osFcntl(pShmNode->hShm, F_GETLK, &lock); osFcntl(pShmNode->hShm, F_GETLK, &lock);
if( lock.l_type==F_UNLCK ){ return (lock.l_type!=F_UNLCK);
rc = 0;
}
}
unixLeaveMutex();
return rc;
} }
/* /*
@@ -115317,9 +115318,22 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){
pParse->nMem += nReg; pParse->nMem += nReg;
if( pExpr->op==TK_SELECT ){ if( pExpr->op==TK_SELECT ){
dest.eDest = SRT_Mem; dest.eDest = SRT_Mem;
if( (pSel->selFlags&SF_Distinct) && pSel->pLimit && pSel->pLimit->pRight ){
/* If there is both a DISTINCT and an OFFSET clause, then allocate
** a separate dest.iSdst array for sqlite3Select() and other
** routines to populate. In this case results will be copied over
** into the dest.iSDParm array only after OFFSET processing. This
** ensures that in the case where OFFSET excludes all rows, the
** dest.iSDParm array is not left populated with the contents of the
** last row visited - it should be all NULLs if all rows were
** excluded by OFFSET. */
dest.iSdst = pParse->nMem+1;
pParse->nMem += nReg;
}else{
dest.iSdst = dest.iSDParm; dest.iSdst = dest.iSDParm;
}
dest.nSdst = nReg; dest.nSdst = nReg;
sqlite3VdbeAddOp3(v, OP_Null, 0, dest.iSDParm, dest.iSDParm+nReg-1); sqlite3VdbeAddOp3(v, OP_Null, 0, dest.iSDParm, pParse->nMem);
VdbeComment((v, "Init subquery result")); VdbeComment((v, "Init subquery result"));
}else{ }else{
dest.eDest = SRT_Exists; dest.eDest = SRT_Exists;
@@ -148187,9 +148201,14 @@ static void selectInnerLoop(
assert( nResultCol<=pDest->nSdst ); assert( nResultCol<=pDest->nSdst );
pushOntoSorter( pushOntoSorter(
pParse, pSort, p, regResult, regOrig, nResultCol, nPrefixReg); pParse, pSort, p, regResult, regOrig, nResultCol, nPrefixReg);
pDest->iSDParm = regResult;
}else{ }else{
assert( nResultCol==pDest->nSdst ); assert( nResultCol==pDest->nSdst );
assert( regResult==iParm ); if( regResult!=iParm ){
/* This occurs in cases where the SELECT had both a DISTINCT and
** an OFFSET clause. */
sqlite3VdbeAddOp3(v, OP_Copy, regResult, iParm, nResultCol-1);
}
/* The LIMIT clause will jump out of the loop for us */ /* The LIMIT clause will jump out of the loop for us */
} }
break; break;
@@ -154204,12 +154223,24 @@ static SQLITE_NOINLINE void existsToJoin(
&& (pSub->selFlags & SF_Aggregate)==0 && (pSub->selFlags & SF_Aggregate)==0
&& !pSub->pSrc->a[0].fg.isSubquery && !pSub->pSrc->a[0].fg.isSubquery
&& pSub->pLimit==0 && pSub->pLimit==0
&& pSub->pPrior==0
){ ){
/* Before combining the sub-select with the parent, renumber the
** cursor used by the subselect. This is because the EXISTS expression
** might be a copy of another EXISTS expression from somewhere
** else in the tree, and in this case it is important that it use
** a unique cursor number. */
sqlite3 *db = pParse->db;
int *aCsrMap = sqlite3DbMallocZero(db, (pParse->nTab+2)*sizeof(int));
if( aCsrMap==0 ) return;
aCsrMap[0] = (pParse->nTab+1);
renumberCursors(pParse, pSub, -1, aCsrMap);
sqlite3DbFree(db, aCsrMap);
memset(pWhere, 0, sizeof(*pWhere)); memset(pWhere, 0, sizeof(*pWhere));
pWhere->op = TK_INTEGER; pWhere->op = TK_INTEGER;
pWhere->u.iValue = 1; pWhere->u.iValue = 1;
ExprSetProperty(pWhere, EP_IntValue); ExprSetProperty(pWhere, EP_IntValue);
assert( p->pWhere!=0 ); assert( p->pWhere!=0 );
pSub->pSrc->a[0].fg.fromExists = 1; pSub->pSrc->a[0].fg.fromExists = 1;
pSub->pSrc->a[0].fg.jointype |= JT_CROSS; pSub->pSrc->a[0].fg.jointype |= JT_CROSS;
@@ -174002,6 +174033,9 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
sqlite3 *db = pParse->db; sqlite3 *db = pParse->db;
int iEnd = sqlite3VdbeCurrentAddr(v); int iEnd = sqlite3VdbeCurrentAddr(v);
int nRJ = 0; int nRJ = 0;
#ifndef SQLITE_DISABLE_SKIPAHEAD_DISTINCT
int addrSeek = 0;
#endif
/* Generate loop termination code. /* Generate loop termination code.
*/ */
@@ -174014,7 +174048,10 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
** the RIGHT JOIN table */ ** the RIGHT JOIN table */
WhereRightJoin *pRJ = pLevel->pRJ; WhereRightJoin *pRJ = pLevel->pRJ;
sqlite3VdbeResolveLabel(v, pLevel->addrCont); sqlite3VdbeResolveLabel(v, pLevel->addrCont);
pLevel->addrCont = 0; /* Replace addrCont with a new label that will never be used, just so
** the subsequent call to resolve pLevel->addrCont will have something
** to resolve. */
pLevel->addrCont = sqlite3VdbeMakeLabel(pParse);
pRJ->endSubrtn = sqlite3VdbeCurrentAddr(v); pRJ->endSubrtn = sqlite3VdbeCurrentAddr(v);
sqlite3VdbeAddOp3(v, OP_Return, pRJ->regReturn, pRJ->addrSubrtn, 1); sqlite3VdbeAddOp3(v, OP_Return, pRJ->regReturn, pRJ->addrSubrtn, 1);
VdbeCoverage(v); VdbeCoverage(v);
@@ -174023,7 +174060,6 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
pLoop = pLevel->pWLoop; pLoop = pLevel->pWLoop;
if( pLevel->op!=OP_Noop ){ if( pLevel->op!=OP_Noop ){
#ifndef SQLITE_DISABLE_SKIPAHEAD_DISTINCT #ifndef SQLITE_DISABLE_SKIPAHEAD_DISTINCT
int addrSeek = 0;
Index *pIdx; Index *pIdx;
int n; int n;
if( pWInfo->eDistinct==WHERE_DISTINCT_ORDERED if( pWInfo->eDistinct==WHERE_DISTINCT_ORDERED
@@ -174046,6 +174082,7 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
sqlite3VdbeAddOp2(v, OP_Goto, 1, pLevel->p2); sqlite3VdbeAddOp2(v, OP_Goto, 1, pLevel->p2);
} }
#endif /* SQLITE_DISABLE_SKIPAHEAD_DISTINCT */ #endif /* SQLITE_DISABLE_SKIPAHEAD_DISTINCT */
}
if( pTabList->a[pLevel->iFrom].fg.fromExists && i==pWInfo->nLevel-1 ){ if( pTabList->a[pLevel->iFrom].fg.fromExists && i==pWInfo->nLevel-1 ){
/* If the EXISTS-to-JOIN optimization was applied, then the EXISTS /* If the EXISTS-to-JOIN optimization was applied, then the EXISTS
** loop(s) will be the inner-most loops of the join. There might be ** loop(s) will be the inner-most loops of the join. There might be
@@ -174063,8 +174100,8 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
sqlite3VdbeAddOp2(v, OP_Goto, 0, pLevel[-nOuter].addrBrk); sqlite3VdbeAddOp2(v, OP_Goto, 0, pLevel[-nOuter].addrBrk);
VdbeComment((v, "EXISTS break")); VdbeComment((v, "EXISTS break"));
} }
/* The common case: Advance to the next row */ sqlite3VdbeResolveLabel(v, pLevel->addrCont);
if( pLevel->addrCont ) sqlite3VdbeResolveLabel(v, pLevel->addrCont); if( pLevel->op!=OP_Noop ){
sqlite3VdbeAddOp3(v, pLevel->op, pLevel->p1, pLevel->p2, pLevel->p3); sqlite3VdbeAddOp3(v, pLevel->op, pLevel->p1, pLevel->p2, pLevel->p3);
sqlite3VdbeChangeP5(v, pLevel->p5); sqlite3VdbeChangeP5(v, pLevel->p5);
VdbeCoverage(v); VdbeCoverage(v);
@@ -174077,10 +174114,11 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
VdbeCoverage(v); VdbeCoverage(v);
} }
#ifndef SQLITE_DISABLE_SKIPAHEAD_DISTINCT #ifndef SQLITE_DISABLE_SKIPAHEAD_DISTINCT
if( addrSeek ) sqlite3VdbeJumpHere(v, addrSeek); if( addrSeek ){
sqlite3VdbeJumpHere(v, addrSeek);
addrSeek = 0;
}
#endif #endif
}else if( pLevel->addrCont ){
sqlite3VdbeResolveLabel(v, pLevel->addrCont);
} }
if( (pLoop->wsFlags & WHERE_IN_ABLE)!=0 && pLevel->u.in.nIn>0 ){ if( (pLoop->wsFlags & WHERE_IN_ABLE)!=0 && pLevel->u.in.nIn>0 ){
struct InLoop *pIn; struct InLoop *pIn;
@@ -219454,7 +219492,7 @@ static void rtreenode(sqlite3_context *ctx, int nArg, sqlite3_value **apArg){
if( node.zData==0 ) return; if( node.zData==0 ) return;
nData = sqlite3_value_bytes(apArg[1]); nData = sqlite3_value_bytes(apArg[1]);
if( nData<4 ) return; if( nData<4 ) return;
if( nData<NCELL(&node)*tree.nBytesPerCell ) return; if( nData<4+NCELL(&node)*tree.nBytesPerCell ) return;
pOut = sqlite3_str_new(0); pOut = sqlite3_str_new(0);
for(ii=0; ii<NCELL(&node); ii++){ for(ii=0; ii<NCELL(&node); ii++){
@@ -238535,7 +238573,13 @@ typedef sqlite3_uint64 u64;
# define FLEXARRAY 1 # define FLEXARRAY 1
#endif #endif
#endif #endif /* SQLITE_AMALGAMATION */
/*
** Constants for the largest and smallest possible 32-bit signed integers.
*/
# define LARGEST_INT32 ((int)(0x7fffffff))
# define SMALLEST_INT32 ((int)((-1) - LARGEST_INT32))
/* Truncate very long tokens to this many bytes. Hard limit is /* Truncate very long tokens to this many bytes. Hard limit is
** (65536-1-1-4-9)==65521 bytes. The limiting factor is the 16-bit offset ** (65536-1-1-4-9)==65521 bytes. The limiting factor is the 16-bit offset
@@ -253098,7 +253142,7 @@ static int sqlite3Fts5IndexMerge(Fts5Index *p, int nMerge){
fts5StructureRelease(pStruct); fts5StructureRelease(pStruct);
pStruct = pNew; pStruct = pNew;
nMin = 1; nMin = 1;
nMerge = nMerge*-1; nMerge = (nMerge==SMALLEST_INT32 ? LARGEST_INT32 : (nMerge*-1));
} }
if( pStruct && pStruct->nLevel ){ if( pStruct && pStruct->nLevel ){
if( fts5IndexMerge(p, &pStruct, nMerge, nMin) ){ if( fts5IndexMerge(p, &pStruct, nMerge, nMin) ){
@@ -260305,7 +260349,7 @@ static void fts5SourceIdFunc(
){ ){
assert( nArg==0 ); assert( nArg==0 );
UNUSED_PARAM2(nArg, apUnused); UNUSED_PARAM2(nArg, apUnused);
sqlite3_result_text(pCtx, "fts5: 2025-11-28 17:28:25 281fc0e9afc38674b9b0991943b9e9d1e64c6cbdb133d35f6f5c87ff6af38a88", -1, SQLITE_TRANSIENT); sqlite3_result_text(pCtx, "fts5: 2026-01-09 17:27:48 b270f8339eb13b504d0b2ba154ebca966b7dde08e40c3ed7d559749818cb2075", -1, SQLITE_TRANSIENT);
} }
/* /*

10
sqlite3-binding.h
View File

@@ -147,12 +147,12 @@ 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.51.1" #define SQLITE_VERSION "3.51.2"
#define SQLITE_VERSION_NUMBER 3051001 #define SQLITE_VERSION_NUMBER 3051002
#define SQLITE_SOURCE_ID "2025-11-28 17:28:25 281fc0e9afc38674b9b0991943b9e9d1e64c6cbdb133d35f6f5c87ff6af38a88" #define SQLITE_SOURCE_ID "2026-01-09 17:27:48 b270f8339eb13b504d0b2ba154ebca966b7dde08e40c3ed7d559749818cb2075"
#define SQLITE_SCM_BRANCH "branch-3.51" #define SQLITE_SCM_BRANCH "branch-3.51"
#define SQLITE_SCM_TAGS "release version-3.51.1" #define SQLITE_SCM_TAGS "release version-3.51.2"
#define SQLITE_SCM_DATETIME "2025-11-28T17:28:25.933Z" #define SQLITE_SCM_DATETIME "2026-01-09T17:27:48.405Z"
/* /*
** CAPI3REF: Run-Time Library Version Numbers ** CAPI3REF: Run-Time Library Version Numbers