From 2d8aa233be55c4a7769d73897649b704b7773a3a Mon Sep 17 00:00:00 2001 From: Cheng Date: Sun, 14 May 2023 10:18:25 +0800 Subject: [PATCH] changed to immediate, and update wxWidgets version --- docs/setup/download_and_build_on_windows.md | 2 +- src/db_accessors.h | 2 +- src/frame.cpp | 2 +- src/stdafx.h | 2 +- src/unit_test.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/setup/download_and_build_on_windows.md b/docs/setup/download_and_build_on_windows.md index deb015e..20d4906 100644 --- a/docs/setup/download_and_build_on_windows.md +++ b/docs/setup/download_and_build_on_windows.md @@ -8,7 +8,7 @@ In a Git bash command prompt, `cd` to the directory where you intend to install the source code. ```bash -git clone --recursive git@cpal.pw:~/wallet +git clone --recursive git@rho.la:~/wallet ``` Then launch the visual studio X64 native tools command prompt. `cd` to the diff --git a/src/db_accessors.h b/src/db_accessors.h index 12172d3..72c037c 100644 --- a/src/db_accessors.h +++ b/src/db_accessors.h @@ -187,7 +187,7 @@ class sql_insert_name { ro::sql csql_rollback; public: sql_insert_name(ISqlite3* p) : - csql_begin(p, R"|(BEGIN;)|"), + csql_begin(p, R"|(BEGIN IMMEDIATE;)|"), csql_into_names(p, R"|(INSERT OR FAIL INTO "Names" VALUES(?1);)|"), csql_namekey_into_keys(p, R"|(INSERT OR FAIL INTO "Keys" VALUES(?1, last_insert_rowid(), 1);)|"), csql_commit(p, R"|(COMMIT;)|"), diff --git a/src/frame.cpp b/src/frame.cpp index 6bcac83..7483213 100644 --- a/src/frame.cpp +++ b/src/frame.cpp @@ -245,7 +245,7 @@ void Frame::NewWallet(wxFileName& filename, ristretto255::hash<256>& secret) { db->exec(R"|( PRAGMA journal_mode = WAL; PRAGMA synchronous = 1; -BEGIN TRANSACTION; +BEGIN IMMEDIATE TRANSACTION; CREATE TABLE "Keys"( "pubkey" BLOB NOT NULL UNIQUE PRIMARY KEY, "id" integer NOT NULL, diff --git a/src/stdafx.h b/src/stdafx.h index f094218..b578fed 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -62,7 +62,7 @@ constexpr bool b_WINDOWS = false; static_assert(wxUSE_UNSAFE_WXSTRING_CONV == 1, R"(In fully utf environment, (wallet.manifest plus /utf-8 compile option) all string conversions are safe.)"); -static_assert(wxMAJOR_VERSION == 3 && wxMINOR_VERSION == 2 && wxRELEASE_NUMBER == 2 && wxSUBRELEASE_NUMBER == 1, "expecting wxWidgets 3.2.2.1"); +static_assert(wxMAJOR_VERSION == 3 && wxMINOR_VERSION == 2 && wxRELEASE_NUMBER == 2 && wxSUBRELEASE_NUMBER == 1 && wxVERSION_STRING == wxT("wxWidgets 3.2.2.1"), "expecting wxWidgets 3.2.2.1"); static_assert(wxUSE_IPV6 == 1, "IP6 unavailable in wxWidgets"); static_assert(WXWIN_COMPATIBILITY_3_0 == 0, "wxWidgets api out of date"); static_assert(wxUSE_COMPILER_TLS == (b_WINDOWS ? 2 : 1), "out of date workarounds in wxWidgets for windows bugs"); diff --git a/src/unit_test.cpp b/src/unit_test.cpp index 78b045b..40f6faa 100644 --- a/src/unit_test.cpp +++ b/src/unit_test.cpp @@ -424,7 +424,7 @@ static bool OpenWallet(void) { db->exec(R"|( PRAGMA journal_mode = WAL; PRAGMA synchronous = 1; -BEGIN TRANSACTION; +BEGIN IMMEDIATE TRANSACTION; CREATE TABLE "Keys"( "pubkey" BLOB NOT NULL UNIQUE PRIMARY KEY, "id" integer NOT NULL,