Skip to content

[db] Move get_long from DB_BASE to DB_CONN #7402

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

Merged
davidpanderson merged 1 commit into from
Nov 11, 2026
Merged

[db] Move get_long from DB_BASE to DB_CONN #7402

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions db/db_base.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ int DB_BASE::get_field_str(const char* field, char* buf, int buflen) {
int DB_BASE::max_id(DB_ID_TYPE& n, const char* clause) {
char query[MAX_QUERY_LEN];
sprintf(query, "select max(id) from %s %s", table_name, clause);
return get_long(query, n);
return db->get_long(query, n);
}

/////////////// FUNCTIONS THAT DON'T REQUIRE AN ID FIELD ///////////////
Expand Down Expand Up @@ -415,14 +415,14 @@ int DB_BASE::end_enumerate() {
return 0;
}

int DB_BASE::get_long(const char* query, long& n) {
int DB_CONN::get_long(const char* query, long& n) {
int retval;
MYSQL_ROW row;
MYSQL_RES* resp;

retval = db->do_query(query);
retval = do_query(query);
if (retval) return retval;
resp = mysql_store_result(db->mysql);
resp = mysql_store_result(mysql);
if (!resp) return ERR_DB_NOT_FOUND;
row = mysql_fetch_row(resp);
if (!row || !row[0]) {
Expand Down Expand Up @@ -458,7 +458,7 @@ int DB_BASE::count(long& n, const char* clause) {

sprintf(query, "select count(*) from %s %s", table_name, clause);

return get_long(query, n);
return db->get_long(query, n);
}

int DB_BASE::sum(double& x, const char* field, const char* clause) {
Expand Down
2 changes: 1 addition & 1 deletion db/db_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ class DB_CONN {
int rollback_transaction();
int commit_transaction();
int get_double(const char* query, double&);
int get_long(const char* query, long&);

MYSQL* mysql;
};
Expand Down Expand Up @@ -106,7 +107,6 @@ class DB_BASE {
int count(long&, const char* clause="");
int max_id(DB_ID_TYPE&, const char* clause="");
int sum(double&, const char* field, const char* clause="");
int get_long(const char* query, long&);
int affected_rows();

DB_CONN* db;
Expand Down
Loading