aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubenwardy <rw@rubenwardy.com>2020-07-07 19:30:35 +0100
committerrubenwardy <rw@rubenwardy.com>2020-07-07 19:31:14 +0100
commit42b0d612ef488dd5b4836fa303aeebe424f09e92 (patch)
tree3f5445be34d84b8afed57381b1c7116327b7004f /src
parentebb721a476ada0350b73fe44efa66850397b9e96 (diff)
downloadminetest-42b0d612ef488dd5b4836fa303aeebe424f09e92.tar.gz
minetest-42b0d612ef488dd5b4836fa303aeebe424f09e92.tar.bz2
minetest-42b0d612ef488dd5b4836fa303aeebe424f09e92.zip
Fix build due to revert error
Diffstat (limited to 'src')
-rw-r--r--src/database/database-postgresql.cpp10
-rw-r--r--src/database/database-postgresql.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/database/database-postgresql.cpp b/src/database/database-postgresql.cpp
index 6acfb5937..e1bb39928 100644
--- a/src/database/database-postgresql.cpp
+++ b/src/database/database-postgresql.cpp
@@ -678,7 +678,7 @@ void AuthDatabasePostgreSQL::initStatements()
bool AuthDatabasePostgreSQL::getAuth(const std::string &name, AuthEntry &res)
{
- pingDatabase();
+ verifyDatabase();
const char *values[] = { name.c_str() };
PGresult *result = execPrepared("auth_read", 1, values, false, false);
@@ -710,7 +710,7 @@ bool AuthDatabasePostgreSQL::getAuth(const std::string &name, AuthEntry &res)
bool AuthDatabasePostgreSQL::saveAuth(const AuthEntry &authEntry)
{
- pingDatabase();
+ verifyDatabase();
beginSave();
@@ -732,7 +732,7 @@ bool AuthDatabasePostgreSQL::saveAuth(const AuthEntry &authEntry)
bool AuthDatabasePostgreSQL::createAuth(AuthEntry &authEntry)
{
- pingDatabase();
+ verifyDatabase();
std::string lastLoginStr = itos(authEntry.last_login);
const char *values[] = {
@@ -764,7 +764,7 @@ bool AuthDatabasePostgreSQL::createAuth(AuthEntry &authEntry)
bool AuthDatabasePostgreSQL::deleteAuth(const std::string &name)
{
- pingDatabase();
+ verifyDatabase();
const char *values[] = { name.c_str() };
execPrepared("auth_delete", 1, values);
@@ -775,7 +775,7 @@ bool AuthDatabasePostgreSQL::deleteAuth(const std::string &name)
void AuthDatabasePostgreSQL::listNames(std::vector<std::string> &res)
{
- pingDatabase();
+ verifyDatabase();
PGresult *results = execPrepared("auth_list_names", 0,
NULL, NULL, NULL, false, false);
diff --git a/src/database/database-postgresql.h b/src/database/database-postgresql.h
index 409e62fe0..f47deda33 100644
--- a/src/database/database-postgresql.h
+++ b/src/database/database-postgresql.h
@@ -152,7 +152,7 @@ public:
AuthDatabasePostgreSQL(const std::string &connect_string);
virtual ~AuthDatabasePostgreSQL() = default;
- virtual void pingDatabase() { Database_PostgreSQL::pingDatabase(); }
+ virtual void verifyDatabase() { Database_PostgreSQL::verifyDatabase(); }
virtual bool getAuth(const std::string &name, AuthEntry &res);
virtual bool saveAuth(const AuthEntry &authEntry);