R/rmodb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the delete helpers

Browse Source
This commit is contained in:
Craig Williams
2020-10-07 17:16:40 +01:00
parent 3a213123c4
commit 27ffe3177f
2 changed files with 33 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
src/modb_accounting.c
View File

@@ -158,61 +158,33 @@ int64_t modbUserUpdate(stored_conn *sconn, modb_ref *modb, unsigned int id,
return 1; return 1;
} }
int modbUserDelete(stored_conn *sconn, modb_ref *modb, int id) int modbUserDelete(stored_conn *sconn, modb_ref *modb, unsigned int id)
{ {
str_builder *sb; int qry_ret;
char *qry; char *table;
size_t qry_len;
uint64_t qry_ret;
if ((sb = strbld_create()) == 0) { if ((table = modbTableName(modb, USERS_TABLE, STR_LEN(USERS_TABLE), 0)) == 0) {
return 0;
}
strbld_str(sb, "UPDATE ", 0);
modbTableName_sb(sb, modb, USERS_TABLE, strlen(USERS_TABLE), '`');
strbld_str(sb, " SET `deleted` = CURRENT_TIMESTAMP() WHERE `id` = ", 0);
db_value_sb(sb, TYPE_UINT32, 1, id);
if (strbld_finalize_or_destroy(&sb, &qry, &qry_len) != 0) {
return 0; return 0;
} }
qry_ret = simpleQuery(sconn, qry, qry_len); qry_ret = softDeleteByIdQuery(sconn, table, "id", id);
free(qry); free(table);
// Query failed return qry_ret;
if (qry_ret == (uint64_t)-1) {
return 0;
} }
int modbUserDestroy(stored_conn *sconn, modb_ref *modb, unsigned int id)
return 1;
}
int modbUserDestroy(stored_conn *sconn, modb_ref *modb, int id)
{ {
str_builder *sb; int qry_ret;
char *qry; char *table;
size_t qry_len;
uint64_t qry_ret;
if ((sb = strbld_create()) == 0) { if ((table = modbTableName(modb, USERS_TABLE, STR_LEN(USERS_TABLE), 0)) == 0) {
return 0;
}
strbld_str(sb, "DELETE FROM ", 0);
modbTableName_sb(sb, modb, USERS_TABLE, strlen(USERS_TABLE), '`');
strbld_str(sb, " WHERE `id` = ", 0);
db_value_sb(sb, TYPE_UINT32, 1, id);
if (strbld_finalize_or_destroy(&sb, &qry, &qry_len) != 0) {
return 0; return 0;
} }
qry_ret = simpleQuery(sconn, qry, qry_len); qry_ret = deleteByIdQuery(sconn, table, "id", id);
free(qry); free(table);
// Query failed return qry_ret;
if (qry_ret == (uint64_t)-1) {
return 0;
}
return 1;
} }
int modbFetchUserGroupIds(stored_conn *sconn, modb_ref *modb, int modbFetchUserGroupIds(stored_conn *sconn, modb_ref *modb,
@@ -421,61 +393,33 @@ int64_t modbGroupUpdate(stored_conn *sconn, modb_ref *modb, unsigned int id,
return 1; return 1;
} }
int modbGroupDelete(stored_conn *sconn, modb_ref *modb, int id) int modbGroupDelete(stored_conn *sconn, modb_ref *modb, unsigned int id)
{ {
str_builder *sb; int qry_ret;
char *qry; char *table;
size_t qry_len;
uint64_t qry_ret;
if ((sb = strbld_create()) == 0) { if ((table = modbTableName(modb, GROUPS_TABLE, STR_LEN(GROUPS_TABLE), 0)) == 0) {
return 0;
}
strbld_str(sb, "UPDATE ", 0);
modbTableName_sb(sb, modb, GROUPS_TABLE, strlen(GROUPS_TABLE), '`');
strbld_str(sb, " SET `deleted` = CURRENT_TIMESTAMP() WHERE `id` = ", 0);
db_value_sb(sb, TYPE_UINT32, 1, id);
if (strbld_finalize_or_destroy(&sb, &qry, &qry_len) != 0) {
return 0; return 0;
} }
qry_ret = simpleQuery(sconn, qry, qry_len); qry_ret = softDeleteByIdQuery(sconn, table, "id", id);
free(qry); free(table);
// Query failed return qry_ret;
if (qry_ret == (uint64_t)-1) {
return 0;
} }
int modbGroupDestroy(stored_conn *sconn, modb_ref *modb, unsigned int id)
return 1;
}
int modbGroupDestroy(stored_conn *sconn, modb_ref *modb, int id)
{ {
str_builder *sb; int qry_ret;
char *qry; char *table;
size_t qry_len;
uint64_t qry_ret;
if ((sb = strbld_create()) == 0) { if ((table = modbTableName(modb, GROUPS_TABLE, STR_LEN(GROUPS_TABLE), 0)) == 0) {
return 0;
}
strbld_str(sb, "DELETE FROM ", 0);
modbTableName_sb(sb, modb, GROUPS_TABLE, strlen(GROUPS_TABLE), '`');
strbld_str(sb, " WHERE `id` = ", 0);
db_value_sb(sb, TYPE_UINT32, 1, id);
if (strbld_finalize_or_destroy(&sb, &qry, &qry_len) != 0) {
return 0; return 0;
} }
qry_ret = simpleQuery(sconn, qry, qry_len); qry_ret = deleteByIdQuery(sconn, table, "id", id);
free(qry); free(table);
// Query failed return qry_ret;
if (qry_ret == (uint64_t)-1) {
return 0;
}
return 1;
} }
int modbFetchGroupUserIds(stored_conn *sconn, modb_ref *modb, struct group_t *group, int modbFetchGroupUserIds(stored_conn *sconn, modb_ref *modb, struct group_t *group,

8
src/modb_accounting.h
View File

@@ -22,8 +22,8 @@ int64_t modbUserCreate(stored_conn *sconn, modb_ref *modb,
unsigned int id, const char *username, const char *email); unsigned int id, const char *username, const char *email);
int64_t modbUserUpdate(stored_conn *sconn, modb_ref *modb, unsigned int id, int64_t modbUserUpdate(stored_conn *sconn, modb_ref *modb, unsigned int id,
const char *username, const char *email); const char *username, const char *email);
int modbUserDelete(stored_conn *sconn, modb_ref *modb, int id); int modbUserDelete(stored_conn *sconn, modb_ref *modb, unsigned int id);
int modbUserDestroy(stored_conn *sconn, modb_ref *modb, int id); int modbUserDestroy(stored_conn *sconn, modb_ref *modb, unsigned int id);
int modbFetchUserGroupIds(stored_conn *sconn, modb_ref *modb, int modbFetchUserGroupIds(stored_conn *sconn, modb_ref *modb,
struct user_t *user, int with_deleted); struct user_t *user, int with_deleted);
@@ -43,8 +43,8 @@ int64_t modbGroupCreate(stored_conn *sconn, modb_ref *modb,
unsigned int id, const char *name); unsigned int id, const char *name);
int64_t modbGroupUpdate(stored_conn *sconn, modb_ref *modb, unsigned int id, int64_t modbGroupUpdate(stored_conn *sconn, modb_ref *modb, unsigned int id,
const char *name); const char *name);
int modbGroupDelete(stored_conn *sconn, modb_ref *modb, int id); int modbGroupDelete(stored_conn *sconn, modb_ref *modb, unsigned int id);
int modbGroupDestroy(stored_conn *sconn, modb_ref *modb, int id); int modbGroupDestroy(stored_conn *sconn, modb_ref *modb, unsigned int id);
int modbFetchGroupUserIds(stored_conn *sconn, modb_ref *modb, struct group_t *group, int modbFetchGroupUserIds(stored_conn *sconn, modb_ref *modb, struct group_t *group,
int with_deleted); int with_deleted);