v0.7.1

Author: taronsarkisyan

Makefile

@@ -8,17 +8,16 @@ ENGINE_FLAGS = -std=c++2b
 
 # PATH
 PATH_BIN = $(CURDIR)/build/index.so
-PATH_SRC = $(CURDIR)/src/cpp/ffi.cpp
-PATH_TESTS_BIN = $(CURDIR)/src/tests/bin/index
+PATH_SRC = $(CURDIR)/src/ffi.cpp
+PATH_TESTS_BIN = $(CURDIR)/src/tests/build/index
 PATH_TESTS_SRC = $(CURDIR)/src/tests/index.cpp
 
 # INC
 INC_SRC = -I $(CURDIR)/src
-INC_CPP = -I $(CURDIR)/src/cpp
 INC_INCLUDE = -L /usr/include
 INC_JSONCPP = -I /usr/include/jsoncpp/json
 
-INC = ${INC_SRC} ${INC_CPP} ${INC_INCLUDE} ${INC_JSONCPP}
+INC = ${INC_SRC} ${INC_INCLUDE} ${INC_JSONCPP}
 
 # LINK
 LINK_JSONCPP = -ljsoncpp
@@ -31,7 +30,7 @@ build:
 	${ENGINE_BUILD} ${ENGINE_FLAGS} ${INC} ${LINK} -fPIC -shared ${PATH_SRC} -o ${PATH_BIN}
 
 test:
-	clear && mkdir -p src/tests/bin && rm -rf src/tests/bin/*
+	clear && mkdir -p src/tests/build && rm -rf src/tests/build/*
 	${ENGINE_WATCH} $(ENGINE_FLAGS) $(PATH_TESTS_SRC) ${INC} ${LINK} -o $(PATH_TESTS_BIN) && $(PATH_TESTS_BIN)
 
 .PHONY: build test

README.md

@@ -1,6 +1,6 @@
 <img src="https://static.wikia.nocookie.net/arnelify/images/c/c8/Arnelify-logo-2024.png/revision/latest?cb=20240701012515" style="width:336px;" alt="Arnelify Logo" />
 
-![Arnelify ORM for C++](https://img.shields.io/badge/Arnelify%20ORM%20for%20C++-0.6.3-yellow) ![C++](https://img.shields.io/badge/C++-2b-red) ![G++](https://img.shields.io/badge/G++-14.2.0-blue) ![C-Lang](https://img.shields.io/badge/CLang-14.0.6-blue)
+![Arnelify ORM for C++](https://img.shields.io/badge/Arnelify%20ORM%20for%20C++-0.7.1-yellow) ![C++](https://img.shields.io/badge/C++-2b-red) ![G++](https://img.shields.io/badge/G++-14.2.0-blue) ![C-Lang](https://img.shields.io/badge/CLang-14.0.6-blue)
 
 ## 🚀 About
 **Arnelify® ORM for C++** - is a minimalistic dynamic library which is an ORM written in C and C++.
@@ -53,15 +53,17 @@ This software is licensed under the <a href="https://github.com/arnelify/arnelif
 Join us to help improve this software, fix bugs or implement new functionality. Active participation will help keep the software up-to-date, reliable, and aligned with the needs of its users.
 
 ## ⭐ Release Notes
-Version 0.6.3 - Minimalistic dynamic library
+Version 0.7.1 - Minimalistic dynamic library
 
 We are excited to introduce the Arnelify ORM for C++ dynamic library! Please note that this version is raw and still in active development.
 
 Change log:
 
 * Minimalistic dynamic library
 * NodeJS (Bun) addon
+* Multi-Threading
 * FFI Support
+* Significant refactoring and optimizations
 
 Please use this version with caution, as it may contain bugs and unfinished features. We are actively working on improving and expanding the ORM's capabilities, and we welcome your feedback and suggestions.
 

src/cpp/addon.cpp src/addon.cppsrc/cpp/addon.cpp renamed to src/addon.cpp

@@ -8,11 +8,27 @@
 #include "json.h"
 #include "napi.h"
 
-#include "index.cpp"
+#include "index.h"
 
-ArnelifyORM* orm = nullptr;
+MySQL* mysql = nullptr;
 
-Napi::Value orm_create(const Napi::CallbackInfo& args) {
+Napi::Value orm_mysql_connect(const Napi::CallbackInfo& args) {
+  Napi::Env env = args.Env();
+
+  mysql->connect();
+
+  return env.Undefined();
+}
+
+Napi::Value orm_mysql_close(const Napi::CallbackInfo& args) {
+  Napi::Env env = args.Env();
+  
+  mysql->close();
+
+  return env.Undefined();
+}
+
+Napi::Value orm_mysql_create(const Napi::CallbackInfo& args) {
   Napi::Env env = args.Env();
   if (args.Length() < 1 || !args[0].IsString()) {
     Napi::TypeError::New(env,
@@ -34,10 +50,10 @@ Napi::Value orm_create(const Napi::CallbackInfo& args) {
     exit(1);
   }
 
-  const bool hasDriver =
-      json.isMember("ORM_DRIVER") && json["ORM_DRIVER"].isString();
-  if (!hasDriver) {
-    std::cout << "[Arnelify ORM]: C++ error: 'ORM_DRIVER' is missing."
+  const bool hasMaxConnections = json.isMember("ORM_MAX_CONNECTIONS") &&
+                                 json["ORM_MAX_CONNECTIONS"].isInt();
+  if (!hasMaxConnections) {
+    std::cout << "[Arnelify ORM]: C++ error: 'ORM_MAX_CONNECTIONS' is missing."
               << std::endl;
     exit(1);
   }
@@ -77,25 +93,25 @@ Napi::Value orm_create(const Napi::CallbackInfo& args) {
     exit(1);
   }
 
-  ArnelifyORMOpts opts(json["ORM_DRIVER"].asString(),
-                       json["ORM_HOST"].asString(), json["ORM_NAME"].asString(),
-                       json["ORM_USER"].asString(), json["ORM_PASS"].asString(),
-                       json["ORM_PORT"].asInt());
+  MySQLOpts opts(json["ORM_MAX_CONNECTIONS"].asInt(),
+                 json["ORM_HOST"].asString(), json["ORM_NAME"].asString(),
+                 json["ORM_USER"].asString(), json["ORM_PASS"].asString(),
+                 json["ORM_PORT"].asInt());
 
-  orm = new ArnelifyORM(opts);
+  mysql = new MySQL(opts);
 
   return env.Undefined();
 }
 
-Napi::Value orm_destroy(const Napi::CallbackInfo& args) {
+Napi::Value orm_mysql_destroy(const Napi::CallbackInfo& args) {
   Napi::Env env = args.Env();
 
-  delete orm;
-  orm = nullptr;
+  delete mysql;
+  mysql = nullptr;
   return env.Undefined();
 }
 
-Napi::Value orm_exec(const Napi::CallbackInfo& info) {
+Napi::Value orm_mysql_exec(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
   if (!info.Length() || !info[0].IsString()) {
     Napi::TypeError::New(env, "[Arnelify ORM]: C++ error: query is missing.")
@@ -129,8 +145,8 @@ Napi::Value orm_exec(const Napi::CallbackInfo& info) {
     bindings.emplace_back(value.asString());
   }
 
-  ArnelifyORMRes res = orm->exec(query, bindings);
-  Json::Value json = orm->toJson(res);
+  MySQLRes res = mysql->exec(query, bindings);
+  Json::Value json = mysql->toJson(res);
 
   Json::StreamWriterBuilder writer;
   writer["indentation"] = "";
@@ -140,16 +156,19 @@ Napi::Value orm_exec(const Napi::CallbackInfo& info) {
   return Napi::String::New(env, out);
 }
 
-Napi::Value orm_get_uuid(const Napi::CallbackInfo& info) {
+Napi::Value orm_mysql_get_uuid(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
-  return Napi::String::New(env, orm->getUuId());
+  return Napi::String::New(env, mysql->getUuId());
 }
 
 Napi::Object Init(Napi::Env env, Napi::Object exports) {
-  exports.Set("orm_create", Napi::Function::New(env, orm_create));
-  exports.Set("orm_destroy", Napi::Function::New(env, orm_destroy));
-  exports.Set("orm_exec", Napi::Function::New(env, orm_exec));
-  exports.Set("orm_get_uuid", Napi::Function::New(env, orm_get_uuid));
+  exports.Set("orm_mysql_close", Napi::Function::New(env, orm_mysql_close));
+  exports.Set("orm_mysql_connect", Napi::Function::New(env, orm_mysql_connect));
+  exports.Set("orm_mysql_create", Napi::Function::New(env, orm_mysql_create));
+  exports.Set("orm_mysql_destroy", Napi::Function::New(env, orm_mysql_destroy));
+  exports.Set("orm_mysql_exec", Napi::Function::New(env, orm_mysql_exec));
+  exports.Set("orm_mysql_get_uuid",
+              Napi::Function::New(env, orm_mysql_get_uuid));
   return exports;
 }