From cb459a5589c543076f198f10f314f969aa393a57 Mon Sep 17 00:00:00 2001 From: Dominik Roos Date: Wed, 18 Oct 2023 14:17:28 +0200 Subject: [PATCH] PATCH: patches/com_github_scionproto_scion/db_use_mattn_sqlite.patch --- private/storage/db/BUILD.bazel | 4 ++-- private/storage/db/sqlite_mattn.go | 2 -- private/storage/db/sqlite_modernc.go | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/private/storage/db/BUILD.bazel b/private/storage/db/BUILD.bazel index 9ed6145d99..2ea9da993e 100644 --- a/private/storage/db/BUILD.bazel +++ b/private/storage/db/BUILD.bazel @@ -9,7 +9,7 @@ go_library( "metrics.go", "sqler.go", "sqlite.go", - "sqlite_modernc.go", + "sqlite_mattn.go", ], importpath = "github.com/scionproto/scion/private/storage/db", visibility = ["//visibility:public"], @@ -17,7 +17,7 @@ go_library( "//pkg/private/common:go_default_library", "//pkg/private/prom:go_default_library", "//pkg/private/serrors:go_default_library", - "@org_modernc_sqlite//:go_default_library", + "@com_github_mattn_go_sqlite3//:go_default_library", ], ) diff --git a/private/storage/db/sqlite_mattn.go b/private/storage/db/sqlite_mattn.go index 805a646096..ed6150ff91 100644 --- a/private/storage/db/sqlite_mattn.go +++ b/private/storage/db/sqlite_mattn.go @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build sqlite_mattn - package db import ( diff --git a/private/storage/db/sqlite_modernc.go b/private/storage/db/sqlite_modernc.go index 951985b23e..a6cebd0cb0 100644 --- a/private/storage/db/sqlite_modernc.go +++ b/private/storage/db/sqlite_modernc.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build sqlite_modernc || !sqlite_mattn +//go:build sqlite_modernc // Note that above go:build expression makes modernc the default by matching // the absence of sqlite_mattn. Should there be more alternatives, please