Enable rusqlite unlock_notify feature

This commit is contained in:
Edouard Oger 2020-07-09 12:28:07 -04:00
Родитель 795f19f45b
Коммит 0f35356520
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: A2F740742307674A
9 изменённых файлов: 6 добавлений и 16 удалений

2
Cargo.lock сгенерированный
Просмотреть файл

@ -1150,7 +1150,6 @@ dependencies = [
"log 0.4.8",
"logins",
"prost",
"rusqlite",
"serde_json",
"sql-support",
"sync15",
@ -1856,7 +1855,6 @@ dependencies = [
"log 0.4.8",
"prost",
"push",
"rusqlite",
"serde_json",
"url",
"viaduct",

Просмотреть файл

@ -30,7 +30,7 @@ anyhow = "1.0"
[dependencies.rusqlite]
version = "0.23.1"
features = ["sqlcipher", "limits"]
features = ["sqlcipher", "limits", "unlock_notify"]
[dev-dependencies]
more-asserts = "0.2"

Просмотреть файл

@ -22,10 +22,6 @@ sql-support = { path = "../../support/sql" }
ffi-support = "0.4"
[dependencies.rusqlite]
version = "0.23.1"
features = ["sqlcipher"]
[dependencies.logins]
path = ".."

Просмотреть файл

@ -36,7 +36,7 @@ anyhow = "1.0"
[dependencies.rusqlite]
version = "0.23.1"
features = ["functions", "bundled"]
features = ["functions", "bundled", "unlock_notify"]
[dev-dependencies]
more-asserts = "0.2"

Просмотреть файл

@ -17,7 +17,7 @@ bincode = "1.2"
lazy_static = "1.4"
base64 = "0.12"
log = "0.4"
rusqlite = { version = "0.23.1", features = ["bundled"] }
rusqlite = { version = "0.23.1", features = ["bundled", "unlock_notify"] }
url = "2.1"
viaduct = { path = "../viaduct" }
ffi-support = "0.4"

Просмотреть файл

@ -20,8 +20,4 @@ push = { path = ".." }
viaduct = { path = "../../viaduct" }
prost = "0.6"
[dependencies.rusqlite]
version = "0.23.1"
features = ["limits", "functions"]
[features]

Просмотреть файл

@ -17,4 +17,4 @@ ffi-support = "0.4"
[dependencies.rusqlite]
version = "0.23.1"
features = ["functions", "limits", "bundled"]
features = ["functions", "limits", "bundled", "unlock_notify"]

Просмотреть файл

@ -25,7 +25,7 @@ url = { version = "2.1", features = ["serde"] }
[dependencies.rusqlite]
version = "0.23.1"
features = ["functions", "bundled", "serde_json"]
features = ["functions", "bundled", "serde_json", "unlock_notify"]
[dev-dependencies]
env_logger = "0.7"

Просмотреть файл

@ -69,6 +69,7 @@ SQLCIPHER_CFLAGS=" \
-DSQLITE_ENABLE_FTS3_PARENTHESIS \
-DSQLITE_ENABLE_FTS4 \
-DSQLITE_ENABLE_FTS5 \
-DSQLITE_ENABLE_UNLOCK_NOTIFY \
-DHAVE_USLEEP=1 \
-DSQLCIPHER_CRYPTO_NSS \
-I${NSS_DIR}/include \
@ -80,7 +81,6 @@ SQLCIPHER_CFLAGS=" \
# -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 \
# -DSQLITE_ENABLE_LOAD_EXTENSION \
# -DSQLITE_ENABLE_COLUMN_METADATA \
# -DSQLITE_ENABLE_UNLOCK_NOTIFY \
# -DSQLITE_ENABLE_RTREE \
# -DSQLITE_ENABLE_STAT3 \
# -DSQLITE_ENABLE_STAT4 \