Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mysql: rename variables based on WebKit style #2321

Merged
merged 1 commit into from
Dec 9, 2021
Merged

mysql: rename variables based on WebKit style #2321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/database/mysql/mysql_database.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,44 +351,44 @@ void MySQLDatabase::_exec(const std::string& query)

/* MysqlResult */

MysqlResult::MysqlResult(MYSQL_RES* mysql_res)
: mysql_res(mysql_res)
MysqlResult::MysqlResult(MYSQL_RES* mysqlRes)
: mysqlRes(mysqlRes)
{
}

MysqlResult::~MysqlResult()
{
if (mysql_res) {
if (mysqlRes) {
if (!nullRead) {
while (mysql_fetch_row(mysql_res))
while (mysql_fetch_row(mysqlRes))
; // read out data
}
mysql_free_result(mysql_res);
mysql_res = nullptr;
mysql_free_result(mysqlRes);
mysqlRes = nullptr;
}
}

std::unique_ptr<SQLRow> MysqlResult::nextRow()
{
if (auto mysqlRow = mysql_fetch_row(mysql_res); mysqlRow) {
return std::make_unique<MysqlRow>(mysqlRow);
if (auto m = mysql_fetch_row(mysqlRes)) {
return std::make_unique<MysqlRow>(m);
}
nullRead = true;
mysql_free_result(mysql_res);
mysql_res = nullptr;
mysql_free_result(mysqlRes);
mysqlRes = nullptr;
return nullptr;
}

/* MysqlRow */

MysqlRow::MysqlRow(MYSQL_ROW mysqlRow)
: mysql_row(mysqlRow)
: mysqlRow(mysqlRow)
{
}

char* MysqlRow::col_c_str(int index) const
{
return mysql_row[index];
return mysqlRow[index];
}

#endif // HAVE_MYSQL
8 changes: 4 additions & 4 deletions src/database/mysql/mysql_database.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class MySQLDatabaseWithTransactions : public SqlWithTransactions, public MySQLDa

class MysqlResult : public SQLResult {
public:
explicit MysqlResult(MYSQL_RES* mysql_res);
explicit MysqlResult(MYSQL_RES* mysqlRes);
~MysqlResult() override;

MysqlResult(const MysqlResult&) = delete;
Expand All @@ -101,8 +101,8 @@ class MysqlResult : public SQLResult {
private:
int nullRead {};
std::unique_ptr<SQLRow> nextRow() override;
unsigned long long getNumRows() const override { return mysql_num_rows(mysql_res); }
MYSQL_RES* mysql_res;
unsigned long long getNumRows() const override { return mysql_num_rows(mysqlRes); }
MYSQL_RES* mysqlRes;

friend class MysqlRow;
friend class MySQLDatabase;
Expand All @@ -115,7 +115,7 @@ class MysqlRow : public SQLRow {
private:
char* col_c_str(int index) const override;

MYSQL_ROW mysql_row;
MYSQL_ROW mysqlRow;
};

#endif // __mysql_database_H__
Expand Down