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

Replace STICKER_SQL_INSERT and STICKER_SQL_UPDATE with STICKER_SQL_SET that lets handle sqlite insertion or update of the sticker value. #2162

Merged
merged 1 commit into from
Jan 30, 2025
Merged

Replace STICKER_SQL_INSERT and STICKER_SQL_UPDATE with STICKER_SQL_SET that lets handle sqlite insertion or update of the sticker value. #2162

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
65 changes: 12 additions & 53 deletions src/sticker/Database.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ enum sticker_sql_find {
enum sticker_sql {
STICKER_SQL_GET,
STICKER_SQL_LIST,
STICKER_SQL_UPDATE,
STICKER_SQL_INSERT,
STICKER_SQL_SET,
STICKER_SQL_DELETE,
STICKER_SQL_DELETE_VALUE,
STICKER_SQL_DISTINCT_TYPE_URI,
Expand Down Expand Up @@ -88,10 +87,10 @@ static constexpr auto sticker_sql = std::array {
"SELECT value FROM sticker WHERE type=? AND uri=? AND name=?",
//[STICKER_SQL_LIST] =
"SELECT name,value FROM sticker WHERE type=? AND uri=?",
//[STICKER_SQL_UPDATE] =
"UPDATE sticker SET value=? WHERE type=? AND uri=? AND name=?",
//[STICKER_SQL_INSERT] =
"INSERT INTO sticker(type,uri,name,value) VALUES(?, ?, ?, ?)",
//[STICKER_SQL_SET] =
"INSERT INTO sticker(type, uri, name, value) VALUES(?, ?, ?, ?) "
"ON CONFLICT(type, uri, name) DO "
"UPDATE set value = ?",
//[STICKER_SQL_DELETE] =
"DELETE FROM sticker WHERE type=? AND uri=?",
//[STICKER_SQL_DELETE_VALUE] =
Expand Down Expand Up @@ -227,45 +226,21 @@ StickerDatabase::ListValues(std::map<std::string, std::string, std::less<>> &tab
});
}

bool
StickerDatabase::UpdateValue(const char *type, const char *uri,
const char *name, const char *value)
void
StickerDatabase::StoreValue(const char *type, const char *uri,
const char *name, const char *value)
{
sqlite3_stmt *const s = stmt[STICKER_SQL_UPDATE];

assert(type != nullptr);
assert(uri != nullptr);
assert(name != nullptr);
assert(*name != 0);
assert(value != nullptr);

BindAll(s, value, type, uri, name);

AtScopeExit(s) {
sqlite3_reset(s);
sqlite3_clear_bindings(s);
};

bool modified = ExecuteModified(s);

if (modified)
idle_add(IDLE_STICKER);
return modified;
}

void
StickerDatabase::InsertValue(const char *type, const char *uri,
const char *name, const char *value)
{
sqlite3_stmt *const s = stmt[STICKER_SQL_INSERT];
if (StringIsEmpty(name))
return;

assert(type != nullptr);
assert(uri != nullptr);
assert(name != nullptr);
assert(*name != 0);
assert(value != nullptr);
sqlite3_stmt *const s = stmt[STICKER_SQL_SET];

BindAll(s, type, uri, name, value);
BindAll(s, type, uri, name, value, value);

AtScopeExit(s) {
sqlite3_reset(s);
Expand All @@ -276,22 +251,6 @@ StickerDatabase::InsertValue(const char *type, const char *uri,
idle_add(IDLE_STICKER);
}

void
StickerDatabase::StoreValue(const char *type, const char *uri,
const char *name, const char *value)
{
assert(type != nullptr);
assert(uri != nullptr);
assert(name != nullptr);
assert(value != nullptr);

if (StringIsEmpty(name))
return;

if (!UpdateValue(type, uri, name, value))
InsertValue(type, uri, name, value);
}

void
StickerDatabase::IncValue(const char *type, const char *uri,
const char *name, const char *value)
Expand Down
3 changes: 1 addition & 2 deletions src/sticker/Database.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ class StickerDatabase {
enum SQL {
SQL_GET,
SQL_LIST,
SQL_UPDATE,
SQL_INSERT,
SQL_SET,
SQL_DELETE,
SQL_DELETE_VALUE,
SQL_DISTINCT_TYPE_URI,
Expand Down