Skip to content

Commit e2e3a6e

Browse files
committed
libsql-ffi: Update bundled SQLite code
1 parent c9217df commit e2e3a6e

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183219,6 +183219,7 @@ int libsql_wal_frame_count(
183219183219
sqlite3_mutex_enter(db->mutex);
183220183220
pPager = sqlite3BtreePager(db->aDb[0].pBt);
183221183221
rc = sqlite3PagerWalFrameCount(pPager, pnFrame);
183222+
sqlite3Error(db, rc);
183222183223
sqlite3_mutex_leave(db->mutex);
183223183224
return rc;
183224183225
#endif
@@ -183244,12 +183245,13 @@ int libsql_wal_get_frame(
183244183245
if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
183245183246
#endif
183246183247

183247-
sqlite3_mutex_enter(db->mutex);
183248-
pPager = sqlite3BtreePager(db->aDb[0].pBt);
183249-
rc = sqlite3PagerWalReadFrameRaw(pPager, iFrame, pBuf, nBuf);
183250-
sqlite3_mutex_leave(db->mutex);
183248+
sqlite3_mutex_enter(db->mutex);
183249+
pPager = sqlite3BtreePager(db->aDb[0].pBt);
183250+
rc = sqlite3PagerWalReadFrameRaw(pPager, iFrame, pBuf, nBuf);
183251+
sqlite3Error(db, rc);
183252+
sqlite3_mutex_leave(db->mutex);
183251183253

183252-
return rc;
183254+
return rc;
183253183255
#endif
183254183256
}
183255183257

@@ -183276,6 +183278,7 @@ int libsql_wal_insert_begin(sqlite3 *db) {
183276183278
goto out_unlock;
183277183279
}
183278183280
out_unlock:
183281+
sqlite3Error(db, rc);
183279183282
sqlite3_mutex_leave(db->mutex);
183280183283
return rc;
183281183284
}
@@ -183291,6 +183294,7 @@ int libsql_wal_insert_end(sqlite3 *db) {
183291183294
goto out_unlock;
183292183295
}
183293183296
out_unlock:
183297+
sqlite3Error(db, rc);
183294183298
sqlite3_mutex_leave(db->mutex);
183295183299
return rc;
183296183300
}
@@ -183322,6 +183326,7 @@ int libsql_wal_insert_frame(
183322183326
goto out_unlock;
183323183327
}
183324183328
out_unlock:
183329+
sqlite3Error(db, rc);
183325183330
sqlite3_mutex_leave(db->mutex);
183326183331

183327183332
return rc;

libsql-ffi/bundled/src/sqlite3.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183219,6 +183219,7 @@ int libsql_wal_frame_count(
183219183219
sqlite3_mutex_enter(db->mutex);
183220183220
pPager = sqlite3BtreePager(db->aDb[0].pBt);
183221183221
rc = sqlite3PagerWalFrameCount(pPager, pnFrame);
183222+
sqlite3Error(db, rc);
183222183223
sqlite3_mutex_leave(db->mutex);
183223183224
return rc;
183224183225
#endif
@@ -183244,12 +183245,13 @@ int libsql_wal_get_frame(
183244183245
if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
183245183246
#endif
183246183247

183247-
sqlite3_mutex_enter(db->mutex);
183248-
pPager = sqlite3BtreePager(db->aDb[0].pBt);
183249-
rc = sqlite3PagerWalReadFrameRaw(pPager, iFrame, pBuf, nBuf);
183250-
sqlite3_mutex_leave(db->mutex);
183248+
sqlite3_mutex_enter(db->mutex);
183249+
pPager = sqlite3BtreePager(db->aDb[0].pBt);
183250+
rc = sqlite3PagerWalReadFrameRaw(pPager, iFrame, pBuf, nBuf);
183251+
sqlite3Error(db, rc);
183252+
sqlite3_mutex_leave(db->mutex);
183251183253

183252-
return rc;
183254+
return rc;
183253183255
#endif
183254183256
}
183255183257

@@ -183276,6 +183278,7 @@ int libsql_wal_insert_begin(sqlite3 *db) {
183276183278
goto out_unlock;
183277183279
}
183278183280
out_unlock:
183281+
sqlite3Error(db, rc);
183279183282
sqlite3_mutex_leave(db->mutex);
183280183283
return rc;
183281183284
}
@@ -183291,6 +183294,7 @@ int libsql_wal_insert_end(sqlite3 *db) {
183291183294
goto out_unlock;
183292183295
}
183293183296
out_unlock:
183297+
sqlite3Error(db, rc);
183294183298
sqlite3_mutex_leave(db->mutex);
183295183299
return rc;
183296183300
}
@@ -183322,6 +183326,7 @@ int libsql_wal_insert_frame(
183322183326
goto out_unlock;
183323183327
}
183324183328
out_unlock:
183329+
sqlite3Error(db, rc);
183325183330
sqlite3_mutex_leave(db->mutex);
183326183331

183327183332
return rc;

0 commit comments

Comments
 (0)