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

Fixed incorrect column names

Browse Source
This commit is contained in:
Craig Williams
2020-10-15 11:28:59 +01:00
parent 572cb38e0f
commit b5c05732de
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modb_groups.c
View File

@@ -243,7 +243,7 @@ int modbGroupList(stored_conn *sconn, modb_ref *modb, int with_deleted, int with
struct group_t *group;
if (with_deleted == 0) {
wb = where(0, "deleted_on", IS_NULL, TYPE_RAW, 0, 0);
wb = where(0, "deleted", IS_NULL, TYPE_RAW, 0, 0);
}
res = doGroupsQuery(sconn, modb, wb, groups, n_groups);
if (wb != 0) {

8
src/modb_metadata.c
View File

@@ -245,7 +245,7 @@ int modbMetadataListByOwnerId(stored_conn *sconn, modb_ref *modb, unsigned int o
wb = where(0, "owner_id", EQ, TYPE_ID, owner_id);
if (with_deleted == 0) {
wb = whereAnd(wb, where(0, "deleted_on", IS_NULL, TYPE_RAW, 0, 0));
wb = whereAnd(wb, where(0, "deleted", IS_NULL, TYPE_RAW, 0, 0));
}
res = doMetadataListQuery(sconn, modb, wb, metadata_list, n_metadatas);
if (wb != 0) {
@@ -291,7 +291,7 @@ int modbMetadataList(stored_conn *sconn, modb_ref *modb, int with_deleted,
int res;
if (with_deleted == 0) {
wb = where(0, "deleted_on", IS_NULL, TYPE_RAW, 0, 0);
wb = where(0, "deleted", IS_NULL, TYPE_RAW, 0, 0);
}
res = doMetadataListQuery(sconn, modb, wb, metadata_list, n_metadatas);
if (wb != 0) {
@@ -484,7 +484,7 @@ int modbMetadataDelete(stored_conn *sconn, modb_ref *modb, unsigned int id)
int64_t qry_ret;
modbTableName(&table, &table_len, modb, METADATA_TABLE, STR_LEN(METADATA_TABLE));
qry_ret = softDeleteByIdQuery(sconn, table, table_len, "id", id);
qry_ret = softDeleteByIdQuery(sconn, table, table_len, "mdo_id", id);
modbFreeTableName(&table);
return (int)qry_ret;
@@ -496,7 +496,7 @@ int modbMetadataDestroy(stored_conn *sconn, modb_ref *modb, unsigned int id)
int64_t qry_ret;
modbTableName(&table, &table_len, modb, METADATA_TABLE, STR_LEN(METADATA_TABLE));
qry_ret = deleteByIdQuery(sconn, table, table_len, "id", id);
qry_ret = deleteByIdQuery(sconn, table, table_len, "mdo_id", id);
modbFreeTableName(&table);
return (int)qry_ret;

6
src/modb_objects.c
View File

@@ -199,7 +199,7 @@ int modbObjectList(stored_conn *sconn, modb_ref *modb, int with_deleted,
int res;
if (with_deleted == 0) {
wb = where(0, "deleted_on", IS_NULL, TYPE_RAW, 0, 0);
wb = where(0, "deleted", IS_NULL, TYPE_RAW, 0, 0);
}
res = doObjectsQuery(sconn, modb, wb, objects, n_objects);
if (wb != 0) {
@@ -279,7 +279,7 @@ int modbObjectDelete(stored_conn *sconn, modb_ref *modb, unsigned int id)
int64_t qry_ret;
modbTableName(&table, &table_len, modb, OBJECTS_TABLE, STR_LEN(OBJECTS_TABLE));
qry_ret = softDeleteByIdQuery(sconn, table, table_len, "id", id);
qry_ret = softDeleteByIdQuery(sconn, table, table_len, "mdo_id", id);
modbFreeTableName(&table);
return (int)qry_ret;
@@ -291,7 +291,7 @@ int modbObjectDestroy(stored_conn *sconn, modb_ref *modb, unsigned int id)
int64_t qry_ret;
modbTableName(&table, &table_len, modb, OBJECTS_TABLE, STR_LEN(OBJECTS_TABLE));
qry_ret = deleteByIdQuery(sconn, table, table_len, "id", id);
qry_ret = deleteByIdQuery(sconn, table, table_len, "mdo_id", id);
modbFreeTableName(&table);
return (int)qry_ret;

2
src/modb_users.c
View File

@@ -281,7 +281,7 @@ int modbUserList(stored_conn *sconn, modb_ref *modb, int with_deleted, int with_
struct user_t *user;
if (with_deleted == 0) {
wb = where(0, "deleted_on", IS_NULL, TYPE_RAW, 0, 0);
wb = where(0, "deleted", IS_NULL, TYPE_RAW, 0, 0);
}
res = doUsersQuery(sconn, modb, wb, users, n_users);
if (wb != 0) {