Skip to content

Commit 42b0d61

Browse files
committedJul 7, 2020
Fix build due to revert error
1 parent ebb721a commit 42b0d61

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed
 

Diff for: ‎src/database/database-postgresql.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ void AuthDatabasePostgreSQL::initStatements()
678678

679679
bool AuthDatabasePostgreSQL::getAuth(const std::string &name, AuthEntry &res)
680680
{
681-
pingDatabase();
681+
verifyDatabase();
682682

683683
const char *values[] = { name.c_str() };
684684
PGresult *result = execPrepared("auth_read", 1, values, false, false);
@@ -710,7 +710,7 @@ bool AuthDatabasePostgreSQL::getAuth(const std::string &name, AuthEntry &res)
710710

711711
bool AuthDatabasePostgreSQL::saveAuth(const AuthEntry &authEntry)
712712
{
713-
pingDatabase();
713+
verifyDatabase();
714714

715715
beginSave();
716716

@@ -732,7 +732,7 @@ bool AuthDatabasePostgreSQL::saveAuth(const AuthEntry &authEntry)
732732

733733
bool AuthDatabasePostgreSQL::createAuth(AuthEntry &authEntry)
734734
{
735-
pingDatabase();
735+
verifyDatabase();
736736

737737
std::string lastLoginStr = itos(authEntry.last_login);
738738
const char *values[] = {
@@ -764,7 +764,7 @@ bool AuthDatabasePostgreSQL::createAuth(AuthEntry &authEntry)
764764

765765
bool AuthDatabasePostgreSQL::deleteAuth(const std::string &name)
766766
{
767-
pingDatabase();
767+
verifyDatabase();
768768

769769
const char *values[] = { name.c_str() };
770770
execPrepared("auth_delete", 1, values);
@@ -775,7 +775,7 @@ bool AuthDatabasePostgreSQL::deleteAuth(const std::string &name)
775775

776776
void AuthDatabasePostgreSQL::listNames(std::vector<std::string> &res)
777777
{
778-
pingDatabase();
778+
verifyDatabase();
779779

780780
PGresult *results = execPrepared("auth_list_names", 0,
781781
NULL, NULL, NULL, false, false);

Diff for: ‎src/database/database-postgresql.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class AuthDatabasePostgreSQL : private Database_PostgreSQL, public AuthDatabase
152152
AuthDatabasePostgreSQL(const std::string &connect_string);
153153
virtual ~AuthDatabasePostgreSQL() = default;
154154

155-
virtual void pingDatabase() { Database_PostgreSQL::pingDatabase(); }
155+
virtual void verifyDatabase() { Database_PostgreSQL::verifyDatabase(); }
156156

157157
virtual bool getAuth(const std::string &name, AuthEntry &res);
158158
virtual bool saveAuth(const AuthEntry &authEntry);

0 commit comments

Comments
 (0)
Please sign in to comment.