blue/pica
1
0
Fork 1
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Currencies request debug, sign now is handled in statement results

Browse source
This commit is contained in:
Blue 2024-03-28 20:20:21 -03:00
parent db37abacd2
commit 07003c2fe6
Signed by: blue
GPG key ID: 9B203B252A63EE38
9 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
database/migrations/m0.sql
View file

@ -132,5 +132,5 @@ VALUES ('created', UTC_TIMESTAMP());
--creating default currencies
INSERT IGNORE INTO
currencies (`code`, `title`, `manual`, `description`, `type`, `value`)
VALUES ('USD', 'United States Dollar', TRUE, 'Base currency', 0, 1);
currencies (`code`, `title`, `manual`, `description`, `type`, `value`, `icon`)
VALUES ('USD', 'United States Dollar', TRUE, 'Base currency', 1, 1, 'currency-usd');

6
database/mysql/mysql.cpp
View file

@ -27,8 +27,8 @@ constexpr const char* insertAsset = "INSERT INTO assets (`owner`, `currency`, `t
" VALUES (?, ?, ?, ?, ?, ?, 1)";
constexpr const char* removeAsset = "DELETE FROM assets where `id` = ? AND `owner` = ?";
constexpr const char* selectUsedCurrencies = "SELECT c.id, c.code, c.title, c.manual, c.icon FROM currencies c"
"JOIN assets a ON c.id = a.currency"
"WHERE a.owner = ?";
" JOIN assets a ON c.id = a.currency"
" WHERE a.owner = ?";
static const std::filesystem::path buildSQLPath = "database";
@ -379,7 +379,7 @@ bool DB::MySQL::deleteAsset(uint32_t assetId, uint32_t actorId) {
}
std::vector<DB::Currency> DB::MySQL::listUsedCurrencies(uint32_t owner) {
Statement list(&connection, removeAsset);
Statement list(&connection, selectUsedCurrencies);
list.bind(&owner, MYSQL_TYPE_LONG, true);
list.execute();

9
database/mysql/statement.cpp
View file

@ -114,13 +114,16 @@ std::vector<std::vector<std::any>> DB::MySQL::Statement::fetchResult() {
bind[i].buffer_type = field->type;
bind[i].buffer_length = field->length;
bind[i].length = &lengths[i];
if (field->flags & UNSIGNED_FLAG)
bind[i].is_unsigned = 1;
}
if (mysql_stmt_bind_result(raw, bind) != 0)
throw std::runtime_error(std::string("Error binding on fetching statement result: ") + mysql_stmt_error(raw));
std::vector<std::vector<std::any>> result;
while (mysql_stmt_fetch(raw) == 0) {
int rc;
while ((rc = mysql_stmt_fetch(raw)) == 0) {
std::vector<std::any>& row = result.emplace_back(numColumns);
for (unsigned int i = 0; i < numColumns; ++i) {
switch (bind[i].buffer_type) {
@ -146,6 +149,10 @@ std::vector<std::vector<std::any>> DB::MySQL::Statement::fetchResult() {
}
}
}
if (rc == 1)
throw std::runtime_error(std::string("Error occured fetching data ") + mysql_stmt_error(raw));
else if (rc == MYSQL_DATA_TRUNCATED)
throw std::runtime_error("Data has been truncated");
return result;
}

2
database/schema/asset.cpp
View file

@ -38,7 +38,7 @@ nlohmann::json DB::Asset::toJSON () const {
result["id"] = id;
//result["owner"] = owner;
//result["currency"] = currency;
result["currency"] = currency;
result["title"] = title;
result["icon"] = icon;
result["color"] = color;