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

Simplified database creation

Browse Source
This commit is contained in:
Craig Williams
2020-10-07 15:09:29 +01:00
parent 19cac8d09f
commit 022bc6a35d
4 changed files with 31 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/modb_database.c
View File

@@ -1,13 +1,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include "modb_management.h"
#include "strext.h"
#include "modb_database.h"
#include "modb_p.h"
#include "modb_management_p.h"
#include "modb_database_p.h"
int modbUse(stored_conn *sconn, modb_ref *modb, int override)
@@ -24,87 +17,40 @@ void modbReleaseUse(stored_conn *sconn)
}
int modbCreate(stored_conn *sconn, modb_ref *modb)
int modbCreate(stored_conn *sconn, modb_ref *modb, column_data **col_data, size_t n_cols)
{
if (createSysTable(sconn, modb) == (uint64_t)-1) {
return 0;
}
if (createMetaTable(sconn, modb) == (uint64_t)-1) {
destroyMODBTable(sconn, modb, SYS_TABLE, STR_LEN(SYS_TABLE));
return 0;
}
if (createObjectsTable(sconn, modb) == (uint64_t)-1) {
destroyMODBTable(sconn, modb, META_TABLE, STR_LEN(META_TABLE));
destroyMODBTable(sconn, modb, SYS_TABLE, STR_LEN(SYS_TABLE));
return 0;
}
if (createMDOGroupsTable(sconn, modb) == (uint64_t)-1) {
destroyMODBTable(sconn, modb, OBJECTS_TABLE, STR_LEN(OBJECTS_TABLE));
destroyMODBTable(sconn, modb, META_TABLE, STR_LEN(META_TABLE));
destroyMODBTable(sconn, modb, SYS_TABLE, STR_LEN(SYS_TABLE));
return 0;
int err = (createSysTable(sconn, modb) == (uint64_t)-1)
|| (createMetaTable(sconn, modb) == (uint64_t)-1)
|| (createObjectsTable(sconn, modb) == (uint64_t)-1)
|| (createMDOGroupsTable(sconn, modb) == (uint64_t)-1)
|| (createUsersTable(sconn, modb) == (uint64_t)-1)
|| (createGroupsTable(sconn, modb) == (uint64_t)-1)
|| (createUserGroupsTable(sconn, modb) == (uint64_t)-1);
if (col_data != 0) {
err = err || createMetaExtTable(sconn, modb, col_data, n_cols);
}
return 1;
return !err;
}
int modbExists(stored_conn *sconn, modb_ref *modb)
{
return MODBTableExists(sconn, modb, META_TABLE, STR_LEN(META_TABLE));
}
int modbHasExtendedMetadata(stored_conn *sconn, modb_ref *modb)
{
return MODBTableExists(sconn, modb, META_EXT_TABLE, STR_LEN(META_EXT_TABLE));
}
int modbDestroy(stored_conn *sconn, modb_ref *modb)
{
uint64_t err = 0
| destroyMODBTable(sconn, modb, MDO_GROUPS_TABLE, STR_LEN(MDO_GROUPS_TABLE))
| destroyMODBTable(sconn, modb, OBJECTS_TABLE, STR_LEN(OBJECTS_TABLE))
| destroyMODBTable(sconn, modb, META_TABLE, STR_LEN(META_TABLE))
| destroyMODBTable(sconn, modb, SYS_TABLE, STR_LEN(SYS_TABLE));
return err == 0;
}
int modbAccountingCreate(stored_conn *sconn, modb_ref *modb)
{
if (createUsersTable(sconn, modb) == (uint64_t)-1) {
return 0;
}
if (createGroupsTable(sconn, modb) == (uint64_t)-1) {
destroyMODBTable(sconn, modb, USERS_TABLE, STR_LEN(USERS_TABLE));
return 0;
}
if (createUserGroupsTable(sconn, modb) == (uint64_t)-1) {
destroyMODBTable(sconn, modb, GROUPS_TABLE, STR_LEN(GROUPS_TABLE));
destroyMODBTable(sconn, modb, USERS_TABLE, STR_LEN(USERS_TABLE));
return 0;
}
return 1;
}
int modbAccountingExists(stored_conn *sconn, modb_ref *modb)
{
return MODBTableExists(sconn, modb, USERS_TABLE, STR_LEN(USERS_TABLE));
}
int modbAccountingDestroy(stored_conn *sconn, modb_ref *modb)
{
uint64_t err = 0
| destroyMODBTable(sconn, modb, SYS_TABLE, STR_LEN(SYS_TABLE))
| destroyMODBTable(sconn, modb, USER_GROUPS_TABLE, STR_LEN(USER_GROUPS_TABLE))
| destroyMODBTable(sconn, modb, GROUPS_TABLE, STR_LEN(GROUPS_TABLE))
| destroyMODBTable(sconn, modb, USERS_TABLE, STR_LEN(USERS_TABLE));
return err == 0;
}
int modbMetaExtCreate(stored_conn *sconn, modb_ref *modb,
column_data **col_data, size_t cols)
{
uint64_t err = 0
| createMetaExtTable(sconn, modb, col_data, cols);
return err == 0;
}
int modbMetaExtExists(stored_conn *sconn, modb_ref *modb)
{
return MODBTableExists(sconn, modb, META_EXT_TABLE, STR_LEN(META_EXT_TABLE));
}
int modbMetaExtDestroy(stored_conn *sconn, modb_ref *modb)
{
uint64_t err = 0
| destroyMODBTable(sconn, modb, USERS_TABLE, STR_LEN(USERS_TABLE))
| destroyMODBTable(sconn, modb, META_EXT_TABLE, STR_LEN(META_EXT_TABLE));
return err == 0;
}