Skip to content

Commit

Permalink
Merge pull request #1614 from Expensify/main
Browse files Browse the repository at this point in the history
Update expensify_prod branch
  • Loading branch information
Gonals authored Nov 13, 2023
2 parents a0b1645 + 2477dd1 commit 3d7c3df
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
12 changes: 7 additions & 5 deletions libstuff/sqlite3.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
** separate file. This file contains only code for the core SQLite library.
**
** The content in this amalgamation comes from Fossil check-in
** 8ecf390dafedc64ffa75665b381c2fccb69.
** e3fc4fc23e55b6cb75b13b9bb0696c6ad51.
*/
#define SQLITE_CORE 1
#define SQLITE_AMALGAMATION 1
Expand Down Expand Up @@ -462,7 +462,7 @@ extern "C" {
*/
#define SQLITE_VERSION "3.43.1"
#define SQLITE_VERSION_NUMBER 3043001
#define SQLITE_SOURCE_ID "2023-09-09 15:30:19 48ecf390dafedc64ffa75665b381c2fccb69f4df8285639734410ee51e677a4f"
#define SQLITE_SOURCE_ID "2023-11-10 13:13:10 ce3fc4fc23e55b6cb75b13b9bb0696c6ad5178c7f02cd5fef1c851f1391d75d5"

/*
** CAPI3REF: Run-Time Library Version Numbers
Expand Down Expand Up @@ -206839,6 +206839,7 @@ static void jsonReplaceFunc(
}
pParse = jsonParseCached(ctx, argv[0], ctx, argc>1);
if( pParse==0 ) return;
pParse->nJPRef++;
for(i=1; i<(u32)argc; i+=2){
zPath = (const char*)sqlite3_value_text(argv[i]);
pParse->useMod = 1;
Expand All @@ -206851,6 +206852,7 @@ static void jsonReplaceFunc(
jsonReturnJson(pParse, pParse->aNode, ctx, 1);
replace_err:
jsonDebugPrintParse(pParse);
jsonParseFree(pParse);
}


Expand Down Expand Up @@ -206885,6 +206887,7 @@ static void jsonSetFunc(
}
pParse = jsonParseCached(ctx, argv[0], ctx, argc>1);
if( pParse==0 ) return;
pParse->nJPRef++;
for(i=1; i<(u32)argc; i+=2){
zPath = (const char*)sqlite3_value_text(argv[i]);
bApnd = 0;
Expand All @@ -206901,9 +206904,8 @@ static void jsonSetFunc(
}
jsonDebugPrintParse(pParse);
jsonReturnJson(pParse, pParse->aNode, ctx, 1);

jsonSetDone:
/* no cleanup required */;
jsonParseFree(pParse);
}

/*
Expand Down Expand Up @@ -248490,7 +248492,7 @@ static void fts5SourceIdFunc(
){
assert( nArg==0 );
UNUSED_PARAM2(nArg, apUnused);
sqlite3_result_text(pCtx, "fts5: 2023-09-09 15:30:19 48ecf390dafedc64ffa75665b381c2fccb69f4df8285639734410ee51e677a4f", -1, SQLITE_TRANSIENT);
sqlite3_result_text(pCtx, "fts5: 2023-11-10 13:13:10 ce3fc4fc23e55b6cb75b13b9bb0696c6ad5178c7f02cd5fef1c851f1391d75d5", -1, SQLITE_TRANSIENT);
}

/*
Expand Down
2 changes: 1 addition & 1 deletion libstuff/sqlite3.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ extern "C" {
*/
#define SQLITE_VERSION "3.43.1"
#define SQLITE_VERSION_NUMBER 3043001
#define SQLITE_SOURCE_ID "2023-09-09 15:30:19 48ecf390dafedc64ffa75665b381c2fccb69f4df8285639734410ee51e677a4f"
#define SQLITE_SOURCE_ID "2023-11-10 13:13:10 ce3fc4fc23e55b6cb75b13b9bb0696c6ad5178c7f02cd5fef1c851f1391d75d5"

/*
** CAPI3REF: Run-Time Library Version Numbers
Expand Down

0 comments on commit 3d7c3df

Please sign in to comment.