From 431a38994496ee9d9d5a785065a68a7ea10c471f Mon Sep 17 00:00:00 2001 From: Vincenzo Palazzo Date: Sun, 21 May 2023 14:57:17 +0200 Subject: [PATCH] radicle: Use "bundled" sqlite dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Our build was faking the inclusion of SQLite and dynamically linking it in the 'radicle' crate and other components. This patch solves the following error and requires reinstallation of the `radicle-cli`, `radicle-node`, and, if used, the `radicle-httpd` ``` ✗ Sync failed: internal error: malformed database schema (node-policies) - near "strict": syntax error (code 11): malformed database schema (node-policies) - near "strict": syntax error (code 11) ``` Tested-by: Vincenzo Palazzo Signed-off-by: Vincenzo Palazzo --- Cargo.lock | 2 +- radicle-node/Cargo.toml | 1 - radicle/Cargo.toml | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6dd43d05..7f8e30b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1920,6 +1920,7 @@ dependencies = [ "serde_json", "siphasher", "sqlite", + "sqlite3-src", "tempfile", "thiserror", "unicode-normalization", @@ -2106,7 +2107,6 @@ dependencies = [ "serde_json", "snapbox", "sqlite", - "sqlite3-src", "tempfile", "thiserror", ] diff --git a/radicle-node/Cargo.toml b/radicle-node/Cargo.toml index 9ae48d31..34f74314 100644 --- a/radicle-node/Cargo.toml +++ b/radicle-node/Cargo.toml @@ -31,7 +31,6 @@ qcheck = { version = "1", default-features = false, optional = true } # through radicle radicle-git-ext = { version = "0.5.0", features = ["serde"] } sqlite = { version = "0.30.3" } -sqlite3-src = { version = "0.4.0", features = ["bundled"] } # Ensures static linking scrypt = { version = "0.10.0", default-features = false } serde = { version = "1", features = ["derive"] } serde_json = { version = "1", features = ["preserve_order"] } diff --git a/radicle/Cargo.toml b/radicle/Cargo.toml index 553cf901..b8755e16 100644 --- a/radicle/Cargo.toml +++ b/radicle/Cargo.toml @@ -56,6 +56,10 @@ version = "1" default-features = false optional = true +[dependencies.sqlite3-src] +version = "0.4" +features = ["bundled"] + [dev-dependencies] pretty_assertions = { version = "1.3.0" } qcheck-macros = { version = "1", default-features = false }