Fix a lot of clang-tidy warningsHEADlibdbpp-postgresql-1.4.10main

1 files changed, 14 insertions, 13 deletions

diff --git a/libpqpp/pq-mock.cpp b/libpqpp/pq-mock.cpp
index e7faf32..f80c4fd 100644
--- a/libpqpp/pq-mock.cpp
+++ b/libpqpp/pq-mock.cpp
@@ -14,14 +14,15 @@ NAMEDFACTORY("postgresql", PQ::Mock, DB::MockDatabaseFactory)
 
 namespace PQ {
 
-	Mock::Mock(const std::string & masterdb, const std::string & name, const std::vector<std::filesystem::path> & ss) :
+	Mock::Mock(
+			const std::string & masterdb, const std::string & name, const std::vector<std::filesystem::path> & setup) :
 		MockServerDatabase(masterdb, name, "postgresql"),
 		tablespacePath(std::filesystem::temp_directory_path() / testDbName),
 		serverVersion(std::static_pointer_cast<Connection>(master)->serverVersion())
 	{
 		try {
 			CreateNewDatabase();
-			PlaySchemaScripts(ss);
+			PlaySchemaScripts(setup);
 			SetTablesToUnlogged();
 		}
 		catch (...) {
@@ -46,7 +47,7 @@ namespace PQ {
 		if (!hasUnloggedTables()) {
 			return;
 		}
-		auto s = master->select(R"SQL(
+		auto tables = master->select(R"SQL(
 SELECT n.nspname, c.relname
 FROM pg_class c, pg_namespace n
 WHERE c.relkind = 'r'
@@ -61,15 +62,15 @@ AND NOT EXISTS (
 	AND ck.relpersistence = 'p')
 AND n.oid = c.relnamespace
 ORDER BY 1, 2)SQL");
-		s->bindParamS(0, "pg_catalog");
-		s->bindParamS(1, "information_schema");
-		while ([&s, this]() {
-			unsigned int n = 0;
-			for (const auto [nspname, relname] : s->as<std::string, std::string>()) {
+		tables->bindParamS(0, "pg_catalog");
+		tables->bindParamS(1, "information_schema");
+		while ([&tables, this]() {
+			unsigned int tableCount = 0;
+			for (const auto [nspname, relname] : tables->as<std::string, std::string>()) {
 				master->execute(MockSetUnlogged::get(nspname, relname));
-				n += 1;
+				tableCount += 1;
 			}
-			return n;
+			return tableCount;
 		}()) {
 			;
 		}
@@ -117,10 +118,10 @@ ORDER BY 1, 2)SQL");
 	void
 	Mock::DropDatabase() const
 	{
-		auto t = master->modify(
+		auto terminate = master->modify(
 				"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE LOWER(datname) = LOWER(?)");
-		t->bindParamS(0, testDbName);
-		t->execute();
+		terminate->bindParamS(0, testDbName);
+		terminate->execute();
 		MockServerDatabase::DropDatabase();
 		if (hasCopyToProgram()) {
 			master->execute(MockDropTablespace::get(testDbName));