Initial TableBuilder implementation, and simple migrations.

core/application.cpp

@@ -119,6 +119,10 @@ void Application::send_file(const std::string &path, Request *request) {
 	request->send();
 }
 
+void Application::migrate() {
+	
+}
+
 Application::Application() {
 	_instance = this;
 }

core/application.h

@@ -28,6 +28,8 @@ public:
 
 	static void default_routing_middleware(Object *instance, Request *request);
 
+	virtual void migrate();
+
 	Application();
 	virtual ~Application();
 

core/database.cpp

@@ -6,10 +6,14 @@ void Database::connect(const std::string &connection_str) {
 void Database::query(const std::string &query) {
 }
 
-QueryBuilder *Database::get_builder() {
+QueryBuilder *Database::get_query_builder() {
 	return new QueryBuilder();
 }
 
+TableBuilder *Database::get_table_builder() {
+	return new TableBuilder();
+}
+
 Database::Database() {
 }
 

core/database.h

@@ -5,6 +5,7 @@
 #include <memory>
 
 #include "query_builder.h"
+#include "table_builder.h"
 
 enum QueryErrorCode {
 	OK,
@@ -37,7 +38,8 @@ public:
 	virtual void connect(const std::string &connection_str);
 	virtual void query(const std::string &query);
 
-	virtual QueryBuilder *get_builder();
+	virtual QueryBuilder *get_query_builder();
+	virtual TableBuilder *get_table_builder();
 
 	Database();
 	~Database();

core/object.cpp

@@ -2,6 +2,10 @@
 
 #include "database.h"
 
+void Object::migrate() {
+
+}
+
 Object::Object() {
     db = nullptr;
 }

core/object.h

@@ -71,6 +71,8 @@ public:
 	//setting object?
 	//FileCache? -> set it to the global singleton by default?
 
+	virtual void migrate();
+
 	Object();
 	virtual ~Object();
 };

core/table_builder.cpp

@@ -0,0 +1,50 @@
+#include "table_builder.h"
+
+TableBuilder *TableBuilder::create_table(const std::string &name) {
+	return this;
+}
+
+TableBuilder *TableBuilder::integer(const std::string &name) {
+	return this;
+}
+
+TableBuilder *TableBuilder::date(const std::string &name) {
+	return this;
+}
+
+TableBuilder *TableBuilder::varchar(const std::string &name, const int length) {
+	return this;
+}
+
+TableBuilder *TableBuilder::not_null() {
+	return this;
+}
+
+TableBuilder *TableBuilder::null() {
+	return this;
+}
+
+TableBuilder *TableBuilder::auto_increment() {
+	return this;
+}
+
+TableBuilder *TableBuilder::primary_key(const std::string &name) {
+	return this;
+}
+
+TableBuilder *TableBuilder::primary_key() {
+	return this;
+}
+
+TableBuilder *TableBuilder::next_row() {
+	return this;
+}
+
+void TableBuilder::finalize() {
+}
+
+TableBuilder::TableBuilder() {
+}
+
+TableBuilder::~TableBuilder() {
+}

core/table_builder.h

@@ -0,0 +1,27 @@
+#ifndef TABLE_BUILDER_H
+#define TABLE_BUILDER_H
+
+#include <string>
+
+class TableBuilder {
+public:
+	virtual TableBuilder *create_table(const std::string &name);
+	virtual TableBuilder *integer(const std::string &name);
+	virtual TableBuilder *date(const std::string &name);
+	virtual TableBuilder *varchar(const std::string &name, const int length);
+	virtual TableBuilder *not_null();
+	virtual TableBuilder *null();
+	virtual TableBuilder *auto_increment();
+	virtual TableBuilder *primary_key(const std::string &name);
+	virtual TableBuilder *primary_key();
+	virtual TableBuilder *next_row();
+
+	virtual void finalize();
+
+	TableBuilder();
+	virtual ~TableBuilder();
+
+	std::string result;
+};
+
+#endif

database/mysql/mysql_database.cpp

@@ -5,6 +5,7 @@
 #include "core/database_manager.h"
 
 #include "mysql_query_builder.h"
+#include "mysql_table_builder.h"
 
 void MysqlDatabase::connect(const std::string &connection_str) {
 	mysql = mysql_init(mysql);
@@ -54,10 +55,14 @@ void MysqlDatabase::query(const std::string &query) {
 }
 
 
-QueryBuilder *MysqlDatabase::get_builder() {
+QueryBuilder *MysqlDatabase::get_query_builder() {
 	return new MysqlQueryBuilder();
 }
 
+TableBuilder *MysqlDatabase::get_table_builder() {
+	return new MysqlTableBuilder();
+}
+
 MysqlDatabase::MysqlDatabase() :
 		Database() {
 

database/mysql/mysql_database.h

@@ -18,7 +18,8 @@ public:
 	void connect(const std::string &connection_str);
 	void query(const std::string &query);
 
-	QueryBuilder *get_builder();
+	QueryBuilder *get_query_builder();
+	TableBuilder *get_table_builder();
 
 	static Database *_creation_func();
 	static void _register();

database/mysql/mysql_table_builder.cpp

@@ -0,0 +1,72 @@
+#include "mysql_table_builder.h"
+
+TableBuilder *MysqlTableBuilder::create_table(const std::string &name) {
+	result += "CREATE TABLE " + name + " ( ";
+
+	return this;
+}
+
+TableBuilder *MysqlTableBuilder::integer(const std::string &name) {
+	result += name + " INTEGER ";
+
+	return this;
+}
+
+TableBuilder *MysqlTableBuilder::date(const std::string &name) {
+	result += name + " DATE ";
+
+	return this;
+}
+
+TableBuilder *MysqlTableBuilder::varchar(const std::string &name, const int length) {
+	result += name + " VARCHAR(" + std::to_string(length) + ")";
+
+	return this;
+}
+
+TableBuilder *MysqlTableBuilder::not_null() {
+	result += "NOT NULL ";
+
+	return this;
+}
+
+TableBuilder *MysqlTableBuilder::null() {
+	result += "NULL ";
+
+	return this;
+}
+
+TableBuilder *MysqlTableBuilder::auto_increment() {
+	result += "AUTO_INCREMENT ";
+
+	return this;
+}
+
+TableBuilder *MysqlTableBuilder::primary_key(const std::string &name) {
+	result += "PRIMARY KEY (" + name + ") ";
+
+	return this;
+}
+
+TableBuilder *MysqlTableBuilder::primary_key() {
+	result += "PRIMARY KEY ";
+
+	return this;
+}
+
+TableBuilder *MysqlTableBuilder::next_row() {
+	result += ", ";
+
+	return this;
+}
+
+void MysqlTableBuilder::finalize() {
+	result += ");";
+}
+
+
+MysqlTableBuilder::MysqlTableBuilder() {
+}
+
+MysqlTableBuilder::~MysqlTableBuilder() {
+}

database/mysql/mysql_table_builder.h

@@ -0,0 +1,27 @@
+#ifndef MYSQL_TABLE_BUILDER_H
+#define MYSQL_TABLE_BUILDER_H
+
+#include <string>
+
+#include "core/table_builder.h"
+
+class MysqlTableBuilder : public TableBuilder {
+public:
+	TableBuilder *create_table(const std::string &name);
+	TableBuilder *integer(const std::string &name);
+	TableBuilder *date(const std::string &name);
+	TableBuilder *varchar(const std::string &name, const int length);
+	TableBuilder *not_null();
+	TableBuilder *null();
+	TableBuilder *auto_increment();
+	TableBuilder *primary_key(const std::string &name);
+	TableBuilder *primary_key();
+	TableBuilder *next_row();
+
+	void finalize();
+
+	MysqlTableBuilder();
+	virtual ~MysqlTableBuilder();
+};
+
+#endif

main.cpp

@@ -1,5 +1,6 @@
 #include <iostream>
 #include <string>
+#include <string.h>
 
 #include "core/application.h"
 #include "core/file_cache.h"
@@ -14,6 +15,16 @@
 #define MAIN_CLASS RDNApplication
 
 int main(int argc, char **argv) {
+	bool migrate = false;
+
+	for (int i = 1; i < argc; ++i) {
+		const char *a = argv[i];
+
+		if (a[0] == 'm') {
+			migrate = true;
+		}
+	}
+
 	initialize_database_backends();
 
 	FileCache *file_cache = new FileCache(true);
@@ -36,7 +47,12 @@ int main(int argc, char **argv) {
 
 	server->port = 8080;
 	server->initialize();
-	server->main_loop();
+
+	if (!migrate) {
+		server->main_loop();
+	} else {
+		app->migrate();
+	}
 
 	delete server;
 	delete app;

modules/message_page/message_page.cpp

@@ -5,13 +5,13 @@
 #include "core/query_builder.h"
 
 void MessagePage::index(Request *request) {
-    QueryBuilder *b = db->get_builder();
+	QueryBuilder *b = db->get_query_builder();
 
-    b->select("*")->from("tutorials_tbl")->finalize();
+	b->select("*")->from("tutorials_tbl")->finalize();
 
-    db->query(b->query_result);
+	db->query(b->query_result);
 
-    delete b;
+	delete b;
 
 /*
     db->query("show databases;");
@@ -19,23 +19,33 @@ void MessagePage::index(Request *request) {
     db->query("SELECT * FROM tutorials_tbl;");
 */
 
-    std::string r = "<html><body>";
+	std::string r = "<html><body>";
 
-    for (uint32_t i = 0; i < messages.size(); ++i) {
+	for (uint32_t i = 0; i < messages.size(); ++i) {
-        r += "<p>" + messages[i] + "</p><br>";
+		r += "<p>" + messages[i] + "</p><br>";
-    }
+	}
 
-    r += "</html></body>";
+	r += "</html></body>";
 
 	request->response->setBody(r);
 	request->send();
 }
 
-MessagePage::MessagePage() : Object() {
+void MessagePage::migrate() {
-    messages.push_back("T message 1");
+	TableBuilder *t = db->get_table_builder();
-    messages.push_back("T message 2");
+
+	t->create_table("message_page")->integer("id")->auto_increment()->primary_key()->next_row()->varchar("dd", 30)->finalize();
+
+	db->query(t->result);
+
+	delete t;
+}
+
+MessagePage::MessagePage() :
+		Object() {
+	messages.push_back("T message 1");
+	messages.push_back("T message 2");
 }
 
 MessagePage::~MessagePage() {
-
 }

modules/message_page/message_page.h

@@ -15,6 +15,8 @@ class MessagePage : public Object {
 public:
     void index(Request *request);
 
+    void migrate();
+
     MessagePage();
     ~MessagePage();
 

rdn_application.cpp

@@ -55,6 +55,10 @@ void RDNApplication::setup_middleware() {
 	//middlewares.push_back(RDNApplication::session_middleware_func);
 }
 
+void RDNApplication::migrate() {
+	message_page->migrate();
+}
+
 RDNApplication::RDNApplication() :
 		Application() {
 

rdn_application.h

@@ -18,6 +18,8 @@ public:
     virtual void setup_routes();
     virtual void setup_middleware();
 
+    virtual void migrate();
+
     RDNApplication();
     ~RDNApplication();