From 3ea3ef7c1160afe3be3fdbd94914655ff99dd060 Mon Sep 17 00:00:00 2001 From: Nikola Petrov Date: Fri, 31 Jan 2025 00:18:58 +0100 Subject: [PATCH] seperete create_tables --- server/src/server.cpp | 1 + shared/inc/sql.hpp | 1 + shared/src/sql.cpp | 107 ++++++++++++++++++++++-------------------- 3 files changed, 58 insertions(+), 51 deletions(-) diff --git a/server/src/server.cpp b/server/src/server.cpp index 40b2536..3665f8b 100644 --- a/server/src/server.cpp +++ b/server/src/server.cpp @@ -117,6 +117,7 @@ void call(int sock, sockaddr_in newSocketInfo) int main() { sql::init(); + sql::create_tables(); std::thread t(checker); // Bind the server to a port. int err = TcpSocket::listent("0.0.0.0", serverPort, call); diff --git a/shared/inc/sql.hpp b/shared/inc/sql.hpp index 3638510..17d10a7 100644 --- a/shared/inc/sql.hpp +++ b/shared/inc/sql.hpp @@ -32,6 +32,7 @@ struct sqlite3_stmt; namespace sql { + void create_tables(); void init(); void shutdown(); int open(const char *filename, sqlite3 **ppDb); diff --git a/shared/src/sql.cpp b/shared/src/sql.cpp index f4c5f19..3b97c7a 100644 --- a/shared/src/sql.cpp +++ b/shared/src/sql.cpp @@ -5,59 +5,64 @@ #include -void sql::init() -{ - sqlite3_initialize(); - sqlite3 *db; - char *zErrMsg = 0; - int rc; - - /* Open database */ - rc = sqlite3_open(DB_NAME, &db); - - if (rc) - { - fprintf(stderr, "Can't open database: %s\n", sqlite3_errmsg(db)); - return; - } - else - { - fprintf(stdout, "Opened database successfully\n"); - } - - /* Execute SQL statement */ - rc = sqlite3_exec(db, create_like_table, nullptr, 0, &zErrMsg); - if (rc != SQLITE_OK) - { - fprintf(stderr, "SQL error: %s\n", zErrMsg); - sqlite3_free(zErrMsg); - } - else - { - fprintf(stdout, "like_table created successfully\n"); - } - - rc = sqlite3_exec(db, create_user_table, nullptr, 0, &zErrMsg); - if (rc != SQLITE_OK) - { - fprintf(stderr, "SQL error: %s\n", zErrMsg); - sqlite3_free(zErrMsg); - } - else - { - fprintf(stdout, "user_table created successfully\n"); - } - - sqlite3_close(db); -} - -void sql::shutdown() -{ - sqlite3_shutdown(); -} - namespace sql { + + void create_tables() + { + sqlite3 *db; + char *zErrMsg = 0; + int rc; + + /* Open database */ + rc = sqlite3_open(DB_NAME, &db); + + if (rc) + { + fprintf(stderr, "Can't open database: %s\n", sqlite3_errmsg(db)); + return; + } + else + { + fprintf(stdout, "Opened database successfully\n"); + } + + /* Execute SQL statement */ + rc = sqlite3_exec(db, create_like_table, nullptr, 0, &zErrMsg); + if (rc != SQLITE_OK) + { + fprintf(stderr, "SQL error: %s\n", zErrMsg); + sqlite3_free(zErrMsg); + } + else + { + fprintf(stdout, "like_table created successfully\n"); + } + + rc = sqlite3_exec(db, create_user_table, nullptr, 0, &zErrMsg); + if (rc != SQLITE_OK) + { + fprintf(stderr, "SQL error: %s\n", zErrMsg); + sqlite3_free(zErrMsg); + } + else + { + fprintf(stdout, "user_table created successfully\n"); + } + + sqlite3_close(db); + } + + void init() + { + sqlite3_initialize(); + } + + void shutdown() + { + sqlite3_shutdown(); + } + int open(const char *filename, sqlite3 **ppDb) { return sqlite3_open(filename, ppDb);