From 989662942eacd455c45dde23afd830bc2e43d53c Mon Sep 17 00:00:00 2001 From: avsdev-cw Date: Mon, 5 Oct 2020 17:23:37 +0100 Subject: [PATCH] Moved definitions from modb to modb_manage (1 of 2) --- src/{modb.c => modb_manage.c} | 3 +- src/{modb.h => modb_manage.h} | 0 src/{modb_p.c => modb_manage_p.c} | 63 +++++++++++-------------------- src/{modb_p.h => modb_manage_p.h} | 16 +------- 4 files changed, 27 insertions(+), 55 deletions(-) rename src/{modb.c => modb_manage.c} (98%) rename src/{modb.h => modb_manage.h} (100%) rename src/{modb_p.c => modb_manage_p.c} (88%) rename src/{modb_p.h => modb_manage_p.h} (80%) diff --git a/src/modb.c b/src/modb_manage.c similarity index 98% rename from src/modb.c rename to src/modb_manage.c index 7391517..f562385 100644 --- a/src/modb.c +++ b/src/modb_manage.c @@ -3,10 +3,11 @@ #include #include -#include "modb.h" +#include "modb_manage.h" #include "strext.h" #include "modb_p.h" +#include "modb_manage_p.h" int modbUse(struct stored_conn_t *sconn, struct modb_t *modb, int override) diff --git a/src/modb.h b/src/modb_manage.h similarity index 100% rename from src/modb.h rename to src/modb_manage.h diff --git a/src/modb_p.c b/src/modb_manage_p.c similarity index 88% rename from src/modb_p.c rename to src/modb_manage_p.c index 7e07991..e647ab9 100644 --- a/src/modb_p.c +++ b/src/modb_manage_p.c @@ -3,6 +3,7 @@ #include #include +#include "modb_manage_p.h" #include "modb_p.h" #include "strext.h" @@ -30,10 +31,8 @@ uint64_t createSysTable(struct stored_conn_t *sconn, struct modb_t *modb) return (uint64_t)-1; } strbld_str(sb, "CREATE TABLE `", 0); - strbld_str(sb, modb->name, modb->name_len); - strbld_str(sb, SYS_TABLE, STR_LEN(SYS_TABLE)); - strbld_str(sb, "` ", 2); - strbld_str(sb, "(" + modbTableName_sb(sb, modb, SYS_TABLE, STR_LEN(SYS_TABLE)); + strbld_str(sb, "` (" "`key` VARCHAR(255) NULL, " "`value` VARCHAR(255) NULL, " "UNIQUE(`key`)" @@ -58,10 +57,8 @@ uint64_t createMetaTable(struct stored_conn_t *sconn, struct modb_t *modb) return (uint64_t)-1; } strbld_str(sb, "CREATE TABLE `", 0); - strbld_str(sb, modb->name, modb->name_len); - strbld_str(sb, META_TABLE, STR_LEN(META_TABLE)); - strbld_str(sb, "` ", 2); - strbld_str(sb, "(" + modbTableName_sb(sb, modb, META_TABLE, STR_LEN(META_TABLE)); + strbld_str(sb, "` (" "`mdo_id` INT UNSIGNED NOT NULL AUTO_INCREMENT, " "`title` VARCHAR(255) NOT NULL, " "`owner` INT UNSIGNED NOT NULL, " @@ -90,10 +87,8 @@ uint64_t createObjectsTable(struct stored_conn_t *sconn, struct modb_t *modb) return (uint64_t)-1; } strbld_str(sb, "CREATE TABLE `", 0); - strbld_str(sb, modb->name, modb->name_len); - strbld_str(sb, OBJECTS_TABLE, STR_LEN(OBJECTS_TABLE)); - strbld_str(sb, "` ", 2); - strbld_str(sb, "(" + modbTableName_sb(sb, modb, OBJECTS_TABLE, STR_LEN(OBJECTS_TABLE)); + strbld_str(sb, "` (" "`mdo_id` INT UNSIGNED NOT NULL, " "`object` MEDIUMBLOB NOT NULL, " "PRIMARY KEY (`mdo_id`)" @@ -118,10 +113,8 @@ uint64_t createMDOGroupsTable(struct stored_conn_t *sconn, struct modb_t *modb) return (uint64_t)-1; } strbld_str(sb, "CREATE TABLE `", 0); - strbld_str(sb, modb->name, modb->name_len); - strbld_str(sb, MDO_GROUPS_TABLE, STR_LEN(MDO_GROUPS_TABLE)); - strbld_str(sb, "` ", 2); - strbld_str(sb, "(" + modbTableName_sb(sb, modb, MDO_GROUPS_TABLE, STR_LEN(MDO_GROUPS_TABLE)); + strbld_str(sb, "` (" "`mdo_id` INT UNSIGNED NOT NULL, " "`group_id` INT UNSIGNED NOT NULL, " "INDEX(`mdo_id`), " @@ -148,10 +141,8 @@ uint64_t createUsersTable(struct stored_conn_t *sconn, struct modb_t *modb) return (uint64_t)-1; } strbld_str(sb, "CREATE TABLE `", 0); - strbld_str(sb, modb->name, modb->name_len); - strbld_str(sb, USERS_TABLE, STR_LEN(USERS_TABLE)); - strbld_str(sb, "` ", 2); - strbld_str(sb, "(" + modbTableName_sb(sb, modb, USERS_TABLE, STR_LEN(USERS_TABLE)); + strbld_str(sb, "` (" "`id` INT UNSIGNED NOT NULL, " "`username` VARCHAR(255) NOT NULL, " "`email` VARCHAR(255) NOT NULL, " @@ -180,10 +171,8 @@ uint64_t createGroupsTable(struct stored_conn_t *sconn, struct modb_t *modb) return (uint64_t)-1; } strbld_str(sb, "CREATE TABLE `", 0); - strbld_str(sb, modb->name, modb->name_len); - strbld_str(sb, GROUPS_TABLE, STR_LEN(GROUPS_TABLE)); - strbld_str(sb, "` ", 2); - strbld_str(sb, "(" + modbTableName_sb(sb, modb, GROUPS_TABLE, STR_LEN(GROUPS_TABLE)); + strbld_str(sb, "` (" "`id` INT UNSIGNED NOT NULL, " "`name` VARCHAR(255) NOT NULL, " "`created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, " @@ -211,10 +200,8 @@ uint64_t createUserGroupsTable(struct stored_conn_t *sconn, struct modb_t *modb) return (uint64_t)-1; } strbld_str(sb, "CREATE TABLE `", 0); - strbld_str(sb, modb->name, modb->name_len); - strbld_str(sb, USER_GROUPS_TABLE, STR_LEN(USER_GROUPS_TABLE)); - strbld_str(sb, "` ", 2); - strbld_str(sb, "(" + modbTableName_sb(sb, modb, USER_GROUPS_TABLE, STR_LEN(USER_GROUPS_TABLE)); + strbld_str(sb, "` (" "`user_id` INT UNSIGNED NOT NULL, " "`group_id` INT UNSIGNED NOT NULL, " "INDEX(`user_id`), " @@ -312,11 +299,9 @@ uint64_t createMetaExtTable(struct stored_conn_t *sconn, struct modb_t *modb, return (uint64_t)-1; } strbld_str(sb, "CREATE TABLE `", 0); - strbld_str(sb, modb->name, modb->name_len); - strbld_str(sb, META_EXT_TABLE, STR_LEN(META_EXT_TABLE)); - strbld_str(sb, "` ", 2); - strbld_str(sb, "(", 1); - strbld_str(sb, "`mdo_id` INT UNSIGNED NOT NULL", 0); + modbTableName_sb(sb, modb, META_EXT_TABLE, STR_LEN(META_EXT_TABLE)); + strbld_str(sb, "` (" + "`mdo_id` INT UNSIGNED NOT NULL", 0); for (size_t c = 0; c < cols; c++) { struct column_data_t *col = *(col_data + c); if ((colstr = createColString(col)) == 0) { @@ -349,10 +334,9 @@ int tableExists(struct stored_conn_t *sconn, struct modb_t *modb, if ((sb = strbld_create()) == 0) { return -errno; } - retval += strbld_str(sb, "SHOW TABLES LIKE '", 0); - retval += strbld_str(sb, modb->name, modb->name_len); - retval += strbld_str(sb, suffix, suffix_len); - retval += strbld_char(sb, '\''); + strbld_str(sb, "SHOW TABLES LIKE '", 0); + modbTableName_sb(sb, modb, suffix, suffix_len); + strbld_char(sb, '\''); if (strbld_finalize_or_destroy(&sb, &qry, &qry_len) != 0) { return -errno; } @@ -395,9 +379,8 @@ uint64_t destroyTable(struct stored_conn_t *sconn, struct modb_t *modb, return (uint64_t)-1; } strbld_str(sb, "DROP TABLE `", 0); - strbld_str(sb, modb->name, modb->name_len); - strbld_str(sb, suffix, suffix_len); - strbld_str(sb, "` ", 2); + modbTableName_sb(sb, modb, suffix, suffix_len); + strbld_char(sb, '`'); if (strbld_finalize_or_destroy(&sb, &qry, &qry_len) != 0) { return (uint64_t)-1; } diff --git a/src/modb_p.h b/src/modb_manage_p.h similarity index 80% rename from src/modb_p.h rename to src/modb_manage_p.h index ca125eb..71cda3f 100644 --- a/src/modb_p.h +++ b/src/modb_manage_p.h @@ -1,5 +1,5 @@ -#ifndef H__MODB_P__ -#define H__MODB_P__ +#ifndef H__MODB_MANAGE_P__ +#define H__MODB_MANAGE_P__ #include #include @@ -8,18 +8,6 @@ #include "modb_types.h" -#define SYS_TABLE "_sys" -#define META_TABLE "_meta" -#define OBJECTS_TABLE "_objects" -#define MDO_GROUPS_TABLE "_mdo_groups" - -#define USERS_TABLE "_users" -#define GROUPS_TABLE "_groups" -#define USER_GROUPS_TABLE "_user_groups" - -#define META_EXT_TABLE "_meta_ext" - - uint64_t createSysTable(struct stored_conn_t *sconn, struct modb_t *modb); uint64_t createMetaTable(struct stored_conn_t *sconn, struct modb_t *modb); uint64_t createObjectsTable(struct stored_conn_t *sconn, struct modb_t *modb);