Merge remote-tracking branch 'upstream/main'

Author: SarthakRawat-1

Cargo.lock

@@ -25,18 +25,18 @@ exclude = [
 ]
 
 [workspace.package]
-version = "0.9.25"
+version = "0.9.29"
 authors = ["the libSQL authors"]
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/tursodatabase/libsql"
 
 [workspace.dependencies]
-libsql-ffi = { path = "libsql-ffi", version = "0.9.25" }
-libsql-sys = { path = "libsql-sys", version = "0.9.25", default-features = false }
-libsql-hrana = { path = "libsql-hrana", version = "0.9.25" }
-libsql_replication = { path = "libsql-replication", version = "0.9.25" }
-rusqlite = { package = "libsql-rusqlite", path = "vendored/rusqlite", version = "0.9.25", default-features = false, features = [
+libsql-ffi = { path = "libsql-ffi", version = "0.9.29" }
+libsql-sys = { path = "libsql-sys", version = "0.9.29", default-features = false }
+libsql-hrana = { path = "libsql-hrana", version = "0.9.29" }
+libsql_replication = { path = "libsql-replication", version = "0.9.29" }
+rusqlite = { package = "libsql-rusqlite", path = "vendored/rusqlite", version = "0.9.29", default-features = false, features = [
     "libsql-experimental",
     "column_decltype",
     "load_extension",

Cargo.toml

@@ -33,6 +33,9 @@
 
 ---
 
+> [!NOTE]
+> This repository contains libSQL, a fork of SQLite developed by Turso. For the full SQLite rewriten in Rust (also by Turso), please visit [tursodatabase/turso](https://github.com/tursodatabase/turso).
+
 ## Documentation
 
 We aim to evolve it to suit many more use cases than SQLite was originally designed for, and plan to use third-party OSS code wherever it makes sense.
@@ -69,6 +72,7 @@ The comprehensive description can be found [here](libsql-sqlite3/doc/libsql_exte
 
 * [PHP](https://github.com/tursodatabase/turso-client-php)
 * [D](https://github.com/pdenapo/libsql-d) (experimental, based on the C driver)
+* [Ring](https://github.com/ysdragon/ring-libsql) (experimental, based on the C driver)
 
 ### GUI Support
 

README.md

@@ -6,7 +6,7 @@ The admin API is used to manage namespaces on a `sqld` instance. Namespaces are
 
 To enable the admin API, and manage namespaces, two extra flags need to be passed to `sqld`:
 
-- `--admin-listen-addr <addr>:<port>`: the address and port on which the admin API should listen. It must be different from the user API listen address (whi defaults to port 8080).
+- `--admin-listen-addr <addr>:<port>`: the address and port on which the admin API should listen. It must be different from the user API listen address (which defaults to port 8080).
 - `--enable-namespaces`: enable namespaces for the instance. By default namespaces are disabled.
 
 ## Routes

docs/ADMIN_API.md

@@ -17,7 +17,7 @@ docker run --name some-sqld-replica -p 8081:8080 -ti \
     -e SQLD_NODE=replica \
     -e SQLD_PRIMARY_URL=https://<host>:<port> \
     ghcr.io/tursodatabase/libsql-server:latest
-````
+```
 
 ## Running on Apple Silicon
 
@@ -122,7 +122,6 @@ inter-node communication. Recommended to leave this on default.
 Simple docker compose for local development:
 
 ```yaml
-version: "3"
 services:
   db:
     image: ghcr.io/tursodatabase/libsql-server:latest

docs/DOCKER.md

@@ -25,6 +25,7 @@ Welcome to the `sqld` user guide!
 The `sqld` program provides libsql over HTTP and supports transparent replication.
 
 ![libsql cluster overview.](sqld-overview.png)
+
 <p align="center">
 Figure 1. Overview of libsql clustering.
 </p>
@@ -82,7 +83,7 @@ You now have a `sqld` primary server listening to SQL over HTTP at `127.0.0.1:80
 
 ### Launching a replica server
 
-To start a a `sqld` server in replica mode, run:
+To start a `sqld` server in replica mode, run:
 
 ```console
 sqld \
@@ -150,7 +151,7 @@ curl -X POST -d '{"statements": ["select * from testme"]}' $YOUR_APP.fly.dev
 ```
 
 ```json
-[{"b":2,"a":1,"c":3}]
+[{ "b": 2, "a": 1, "c": 3 }]
 ```
 
 ## Incremental snapshots
@@ -182,7 +183,7 @@ and then configure `sqld` to generate an incremental snapshot every 5 seconds an
 sqld --snapshot-exec ./snapshot.sh --max-log-duration 5
 ```
 
-When you write to the `sqld` database, you will eventually see log line such as:
+When you write to the `sqld` database, you will eventually see a log line such as:
 
 ```console
 2023-08-11T08:21:04.183564Z  INFO sqld::replication::snapshot: snapshot `e126f594-90f4-45be-9350-bc8a01160de9-0-2.snap` successfully created
@@ -254,7 +255,7 @@ For example, if you have the following entries in your `/etc/hosts` file:
 127.0.0.1       db2.local
 ```
 
-You can access `db1` with the `http://db1.local:8080`URL and `db2` with `http://db2.local:8080`.
+You can access `db1` with the `http://db1.local:8080` URL and `db2` with `http://db2.local:8080`.
 The database files for the databases are stored in `<data dir>/dbs/db1` and `<data dir/dbs/db2`, respectively.
 
 ### Path based routing

docs/USER_GUIDE.md

@@ -7,6 +7,12 @@
 ** License:     MIT
 */
 
+/*
+** Forward declaration for db codec check function.
+** Used to update cached codec status after encryption changes.
+*/
+int libsql_db_has_codec(sqlite3_vfs* pVfs, const char* zFilename);
+
 /*
 ** "Special" version of function sqlite3BtreeSetPageSize
 ** This version allows to reduce the number of reserved bytes per page,
@@ -585,6 +591,8 @@ sqlite3_rekey_v2(sqlite3* db, const char* zDbName, const void* zKey, int nKey)
     {
       sqlite3mcSetIsEncrypted(codec, 0);
     }
+    /* Update both pager and database cached codec status after changing encryption */
+    db->aDb[dbIndex].hasCodec = pPager->hasCodec = libsql_db_has_codec(pPager->pVfs, pPager->zFilename);
   }
   else
   {