From f073c790c5ac4fdff024246056c96c9b694c13c6 Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 22 Sep 2021 17:20:10 +0300 Subject: [PATCH] Make DbKey required to construct SqliteConnectionSafe. --- benchmark/bench_db.cpp | 2 +- benchmark/bench_tddb.cpp | 2 +- tddb/td/db/SqliteConnectionSafe.h | 2 +- test/db.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/benchmark/bench_db.cpp b/benchmark/bench_db.cpp index 7c1e69318..bb557fd79 100644 --- a/benchmark/bench_db.cpp +++ b/benchmark/bench_db.cpp @@ -188,7 +188,7 @@ class SqliteKeyValueAsyncBench final : public td::Benchmark { td::string sql_db_name = "testdb.sqlite"; td::SqliteDb::destroy(sql_db_name).ignore(); - sql_connection_ = std::make_shared(sql_db_name); + sql_connection_ = std::make_shared(sql_db_name, td::DbKey::empty()); auto &db = sql_connection_->get(); TRY_STATUS(init_db(db)); diff --git a/benchmark/bench_tddb.cpp b/benchmark/bench_tddb.cpp index 575f9e0e4..8e172af01 100644 --- a/benchmark/bench_tddb.cpp +++ b/benchmark/bench_tddb.cpp @@ -94,7 +94,7 @@ class MessagesDbBench final : public Benchmark { auto guard = scheduler_->get_main_guard(); string sql_db_name = "testdb.sqlite"; - sql_connection_ = std::make_shared(sql_db_name); + sql_connection_ = std::make_shared(sql_db_name, DbKey::empty()); auto &db = sql_connection_->get(); TRY_STATUS(init_db(db)); diff --git a/tddb/td/db/SqliteConnectionSafe.h b/tddb/td/db/SqliteConnectionSafe.h index 8a49548d2..efb14468a 100644 --- a/tddb/td/db/SqliteConnectionSafe.h +++ b/tddb/td/db/SqliteConnectionSafe.h @@ -19,7 +19,7 @@ namespace td { class SqliteConnectionSafe { public: SqliteConnectionSafe() = default; - explicit SqliteConnectionSafe(string path, DbKey key = DbKey::empty(), optional cipher_version = {}); + SqliteConnectionSafe(string path, DbKey key, optional cipher_version = {}); SqliteDb &get(); void set(SqliteDb &&db); diff --git a/test/db.cpp b/test/db.cpp index 59a3c8ed4..e378e0452 100644 --- a/test/db.cpp +++ b/test/db.cpp @@ -305,7 +305,7 @@ class SqliteKV { return 0; } Status init(string name) { - auto sql_connection = std::make_shared(name); + auto sql_connection = std::make_shared(name, DbKey::empty()); kv_ = std::make_shared("kv", sql_connection); return Status::OK(); }