From e2e3a6e85bab280094385b1eeda51e64e70c778c Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Tue, 26 Nov 2024 12:22:40 +0200 Subject: [PATCH] libsql-ffi: Update bundled SQLite code --- .../bundled/SQLite3MultipleCiphers/src/sqlite3.c | 15 ++++++++++----- libsql-ffi/bundled/src/sqlite3.c | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.c b/libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.c index caeb03816e..dcf254a18a 100644 --- a/libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.c +++ b/libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.c @@ -183219,6 +183219,7 @@ int libsql_wal_frame_count( sqlite3_mutex_enter(db->mutex); pPager = sqlite3BtreePager(db->aDb[0].pBt); rc = sqlite3PagerWalFrameCount(pPager, pnFrame); + sqlite3Error(db, rc); sqlite3_mutex_leave(db->mutex); return rc; #endif @@ -183244,12 +183245,13 @@ int libsql_wal_get_frame( if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT; #endif - sqlite3_mutex_enter(db->mutex); - pPager = sqlite3BtreePager(db->aDb[0].pBt); - rc = sqlite3PagerWalReadFrameRaw(pPager, iFrame, pBuf, nBuf); - sqlite3_mutex_leave(db->mutex); + sqlite3_mutex_enter(db->mutex); + pPager = sqlite3BtreePager(db->aDb[0].pBt); + rc = sqlite3PagerWalReadFrameRaw(pPager, iFrame, pBuf, nBuf); + sqlite3Error(db, rc); + sqlite3_mutex_leave(db->mutex); - return rc; + return rc; #endif } @@ -183276,6 +183278,7 @@ int libsql_wal_insert_begin(sqlite3 *db) { goto out_unlock; } out_unlock: + sqlite3Error(db, rc); sqlite3_mutex_leave(db->mutex); return rc; } @@ -183291,6 +183294,7 @@ int libsql_wal_insert_end(sqlite3 *db) { goto out_unlock; } out_unlock: + sqlite3Error(db, rc); sqlite3_mutex_leave(db->mutex); return rc; } @@ -183322,6 +183326,7 @@ int libsql_wal_insert_frame( goto out_unlock; } out_unlock: + sqlite3Error(db, rc); sqlite3_mutex_leave(db->mutex); return rc; diff --git a/libsql-ffi/bundled/src/sqlite3.c b/libsql-ffi/bundled/src/sqlite3.c index caeb03816e..dcf254a18a 100644 --- a/libsql-ffi/bundled/src/sqlite3.c +++ b/libsql-ffi/bundled/src/sqlite3.c @@ -183219,6 +183219,7 @@ int libsql_wal_frame_count( sqlite3_mutex_enter(db->mutex); pPager = sqlite3BtreePager(db->aDb[0].pBt); rc = sqlite3PagerWalFrameCount(pPager, pnFrame); + sqlite3Error(db, rc); sqlite3_mutex_leave(db->mutex); return rc; #endif @@ -183244,12 +183245,13 @@ int libsql_wal_get_frame( if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT; #endif - sqlite3_mutex_enter(db->mutex); - pPager = sqlite3BtreePager(db->aDb[0].pBt); - rc = sqlite3PagerWalReadFrameRaw(pPager, iFrame, pBuf, nBuf); - sqlite3_mutex_leave(db->mutex); + sqlite3_mutex_enter(db->mutex); + pPager = sqlite3BtreePager(db->aDb[0].pBt); + rc = sqlite3PagerWalReadFrameRaw(pPager, iFrame, pBuf, nBuf); + sqlite3Error(db, rc); + sqlite3_mutex_leave(db->mutex); - return rc; + return rc; #endif } @@ -183276,6 +183278,7 @@ int libsql_wal_insert_begin(sqlite3 *db) { goto out_unlock; } out_unlock: + sqlite3Error(db, rc); sqlite3_mutex_leave(db->mutex); return rc; } @@ -183291,6 +183294,7 @@ int libsql_wal_insert_end(sqlite3 *db) { goto out_unlock; } out_unlock: + sqlite3Error(db, rc); sqlite3_mutex_leave(db->mutex); return rc; } @@ -183322,6 +183326,7 @@ int libsql_wal_insert_frame( goto out_unlock; } out_unlock: + sqlite3Error(db, rc); sqlite3_mutex_leave(db->mutex); return rc;