Move templated functions to `sqlite-impl.hh`

This ensures that use-sites properly trigger new monomorphisations on
one hand, and on the other hand keeps the main `sqlite.hh` clean and
interface-only. I think that is good practice in general, but in this
situation in particular we do indeed have `sqlite.hh` users that don't
need the `throw_` function.

1 files changed, 1 insertions, 31 deletions

diff --git a/src/libstore/sqlite.cc b/src/libstore/sqlite.cc
index 32d2fc021..80290fa87 100644
--- a/src/libstore/sqlite.cc
+++ b/src/libstore/sqlite.cc
@@ -1,4 +1,5 @@
 #include "sqlite.hh"
+#include "sqlite-impl.hh"
 #include "globals.hh"
 #include "util.hh"
 
@@ -8,37 +9,6 @@
 
 namespace nix {
 
-template<typename... Args>
-SQLiteError::SQLiteError(const char *path, int errNo, int extendedErrNo, const Args & ... args)
-  : Error(""), path(path), errNo(errNo), extendedErrNo(extendedErrNo)
-{
-    auto hf = hintfmt(args...);
-    err.msg = hintfmt("%s: %s (in '%s')",
-        normaltxt(hf.str()),
-        sqlite3_errstr(extendedErrNo),
-        path ? path : "(in-memory)");
-}
-
-template<typename... Args>
-[[noreturn]] void SQLiteError::throw_(sqlite3 * db, const std::string & fs, const Args & ... args)
-{
-    int err = sqlite3_errcode(db);
-    int exterr = sqlite3_extended_errcode(db);
-
-    auto path = sqlite3_db_filename(db, nullptr);
-
-    if (err == SQLITE_BUSY || err == SQLITE_PROTOCOL) {
-        auto exp = SQLiteBusy(path, err, exterr, fs, args...);
-        exp.err.msg = hintfmt(
-            err == SQLITE_PROTOCOL
-                ? "SQLite database '%s' is busy (SQLITE_PROTOCOL)"
-                : "SQLite database '%s' is busy",
-            path ? path : "(in-memory)");
-        throw exp;
-    } else
-        throw SQLiteError(path, err, exterr, fs, args...);
-}
-
 SQLite::SQLite(const Path & path, bool create)
 {
     // useSQLiteWAL also indicates what virtual file system we need.  Using