From 8caf013a9b8d709ed7c3d5e9febee0067e6fcf1f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 23 Dec 2024 21:53:32 +0100 Subject: Replace String::compose with fmt::format(). --- src/lib/sqlite_table.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/lib/sqlite_table.cc') diff --git a/src/lib/sqlite_table.cc b/src/lib/sqlite_table.cc index f00fa6b74..03c0278df 100644 --- a/src/lib/sqlite_table.cc +++ b/src/lib/sqlite_table.cc @@ -20,9 +20,9 @@ #include "dcpomatic_assert.h" -#include "compose.hpp" #include "sqlite_table.h" #include "util.h" +#include using std::string; @@ -46,7 +46,7 @@ SQLiteTable::create() const for (size_t i = 0; i < _columns.size(); ++i) { columns[i] = _columns[i] + " " + _types[i]; } - return String::compose("CREATE TABLE IF NOT EXISTS %1 (id INTEGER PRIMARY KEY, %2)", _name, join_strings(columns, ", ")); + return fmt::format("CREATE TABLE IF NOT EXISTS {} (id INTEGER PRIMARY KEY, {})", _name, join_strings(columns, ", ")); } @@ -55,7 +55,7 @@ SQLiteTable::insert() const { DCPOMATIC_ASSERT(!_columns.empty()); vector placeholders(_columns.size(), "?"); - return String::compose("INSERT INTO %1 (%2) VALUES (%3)", _name, join_strings(_columns, ", "), join_strings(placeholders, ", ")); + return fmt::format("INSERT INTO {} ({}) VALUES ({})", _name, join_strings(_columns, ", "), join_strings(placeholders, ", ")); } @@ -68,12 +68,12 @@ SQLiteTable::update(string const& condition) const placeholders[i] = _columns[i] + "=?"; } - return String::compose("UPDATE %1 SET %2 %3", _name, join_strings(placeholders, ", "), condition); + return fmt::format("UPDATE {} SET {} {}", _name, join_strings(placeholders, ", "), condition); } string SQLiteTable::select(string const& condition) const { - return String::compose("SELECT id,%1 FROM %2 %3", join_strings(_columns, ","), _name, condition); + return fmt::format("SELECT id,{} FROM {} {}", join_strings(_columns, ","), _name, condition); } -- cgit v1.2.3