v0.6.2

Author: taronsarkisyan

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 NodeJS](https://img.shields.io/badge/Arnelify%20ORM%20for%20NodeJS-0.6.1-yellow) ![C++](https://img.shields.io/badge/C++-2b-red) ![G++](https://img.shields.io/badge/G++-14.2.0-blue) ![NodeJS](https://img.shields.io/badge/NodeJS-22.13.1-green) ![Bun](https://img.shields.io/badge/Bun-1.2.0-green)
+![Arnelify ORM for NodeJS](https://img.shields.io/badge/Arnelify%20ORM%20for%20NodeJS-0.6.2-yellow) ![C++](https://img.shields.io/badge/C++-2b-red) ![G++](https://img.shields.io/badge/G++-14.2.0-blue) ![NodeJS](https://img.shields.io/badge/NodeJS-22.13.1-green) ![Bun](https://img.shields.io/badge/Bun-1.2.0-green)
 
 ## 🚀 About
 **Arnelify® ORM for NodeJS** - is a minimalistic NodeJS (Bun) addon which is an ORM written in C and C++.
@@ -53,7 +53,7 @@ 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.1 - NodeJS (Bun) Addon
+Version 0.6.2 - NodeJS (Bun) Addon
 
 We are excited to introduce the Arnelify ORM for NodeJS (Bun) addon! Please note that this version is raw and still in active development.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "arnelify-orm",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Minimalistic NodeJS (Bun) addon which is an ORM written in C and C++.",
   "keywords": [
     "arnelify",

src/cpp/addon.cpp

@@ -140,10 +140,16 @@ Napi::Value orm_exec(const Napi::CallbackInfo& info) {
   return Napi::String::New(env, out);
 }
 
+Napi::Value orm_get_uuid(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  return Napi::String::New(env, orm->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));
   return exports;
 }
 

src/cpp/ffi.cpp

@@ -107,6 +107,13 @@ const char* orm_exec(const char* cQuery, const char* cSerialized) {
 void orm_free(const char* cPtr) {
   if (cPtr) delete[] cPtr;
 }
+
+const char* orm_get_uuid() {
+  const std::string uuid = orm->getUuId();
+  char* cUuId = new char[uuid.length() + 1];
+  std::strcpy(cUuId, uuid.c_str());
+  return cUuId;
+}
 }
 
 #endif

src/cpp/index.cpp

@@ -1,9 +1,12 @@
 #include <functional>
+#include <future>
 #include <iostream>
 #include <map>
 #include <vector>
 
 #include <iostream>
+#include <iomanip>
+#include <random>
 #include <sstream>
 #include <string>
 #include <optional>
@@ -161,14 +164,16 @@ class ArnelifyORM {
     } else if (std::holds_alternative<bool>(default_)) {
       const bool value = std::get<bool>(default_);
       query += " " + std::string(value ? "DEFAULT NULL" : "NOT NULL");
+    } else if (std::holds_alternative<double>(default_)) {
+      query += " NOT NULL DEFAULT " + std::to_string(std::get<double>(default_));
     } else if (std::holds_alternative<int>(default_)) {
-      query += std::to_string(std::get<int>(default_));
+      query += " NOT NULL DEFAULT " + std::to_string(std::get<int>(default_));
     } else if (std::holds_alternative<std::string>(default_)) {
       const std::string value = std::get<std::string>(default_);
       if (value == "CURRENT_TIMESTAMP") {
-        query += " DEFAULT CURRENT_TIMESTAMP";
+        query += " NOT NULL DEFAULT CURRENT_TIMESTAMP";
       } else {
-        query += "'" + std::get<std::string>(default_) + "'";
+        query += " NOT NULL DEFAULT '" + value + "'";
       }
     }
 
@@ -278,6 +283,37 @@ class ArnelifyORM {
     return res;
   }
 
+  const std::string getUuId() {
+    std::random_device rd;
+    std::mt19937 gen(rd());
+    std::uniform_int_distribution<> dis(10000, 19999);
+    int random = dis(gen);
+    const auto now = std::chrono::system_clock::now();
+    const auto milliseconds =
+        std::chrono::duration_cast<std::chrono::milliseconds>(
+            now.time_since_epoch())
+            .count();
+
+    const std::string code =
+        std::to_string(milliseconds) + std::to_string(random);
+    std::hash<std::string> hasher;
+    size_t v1 = hasher(code);
+    size_t v2 = hasher(std::to_string(v1));
+    unsigned char hash[16];
+    for (int i = 0; i < 8; ++i) {
+      hash[i] = (v1 >> (i * 8)) & 0xFF;
+      hash[i + 8] = (v2 >> (i * 8)) & 0xFF;
+    }
+
+    std::stringstream ss;
+    for (int i = 0; i < 16; ++i) {
+      ss << std::hex << std::setw(2) << std::setfill('0')
+         << static_cast<int>(hash[i]);
+    }
+
+    return ss.str();
+  }
+
   ArnelifyORM* groupBy(const std::vector<std::string>& args) {
     this->query += " GROUP BY ";
     for (size_t i = 0; args.size() > i; i++) {
@@ -554,14 +590,15 @@ class ArnelifyORM {
   void reference(const std::string& column, const std::string& tableName,
                  const std::string& foreign,
                  const std::vector<std::string> args) {
-    std::string query = "CONSTRAINT fk_" + tableName + " FOREIGN KEY (" +
-                        column + ") REFERENCES " + tableName + "(" + foreign +
-                        ")";
+    std::string query = "CONSTRAINT fk_" + tableName + "_" + this->getUuId() +
+                        " FOREIGN KEY (" + column + ") REFERENCES " +
+                        tableName + "(" + foreign + ")";
 
     const bool isAlter = this->query.starts_with("ALTER");
     if (isAlter) {
-      query = "ADD CONSTRAINT fk_" + tableName + " FOREIGN KEY (" + column +
-              ") REFERENCES " + tableName + "(" + foreign + ")";
+      query = "ADD CONSTRAINT fk_" + tableName + "_" + this->getUuId() +
+              " FOREIGN KEY (" + column + ") REFERENCES " + tableName + "(" +
+              foreign + ")";
     }
 
     for (size_t i = 0; args.size() > i; i++) {

src/index.ts

@@ -136,12 +136,12 @@ class ArnelifyORM {
     } else if (typeof default_ === 'boolean') {
       query += ` ${default_ ? 'DEFAULT NULL' : 'NOT NULL'}`;
     } else if (typeof default_ === 'number') {
-      query += `${default_}`;
+      query += ` NOT NULL DEFAULT ${default_}`;
     } else if (typeof default_ === 'string') {
       if (default_ === 'CURRENT_TIMESTAMP') {
-        query += ' DEFAULT CURRENT_TIMESTAMP';
+        query += ' NOT NULL DEFAULT CURRENT_TIMESTAMP';
       } else {
-        query += `'${default_}'`;
+        query += ` NOT NULL DEFAULT '${default_}'`;
       }
     }
 
@@ -290,6 +290,14 @@ class ArnelifyORM {
     return res;
   }
 
+  /**
+   * getUuid
+   * @returns
+   */
+  getUuid(): string {
+    return this.#lib.orm_get_uuid();
+  }
+
   /**
    * Group By
    * @param {string} args 
@@ -631,12 +639,12 @@ class ArnelifyORM {
    * @param {Array} args
    */
   reference(column: string, tableName: string, foreign: string, args: string[] = []): void {
-    let query: string = `CONSTRAINT fk_${tableName} FOREIGN KEY (${column}) `
+    let query: string = `CONSTRAINT fk_${tableName}_${this.getUuid()} FOREIGN KEY (${column}) `
       + `REFERENCES ${tableName}(${foreign})`;
 
     const isAlter: boolean = this.#query.startsWith('ALTER');
     if (isAlter) {
-      query = `ADD CONSTRAINT fk_${tableName} FOREIGN KEY (${column}) `
+      query = `ADD CONSTRAINT fk_${tableName}_${this.getUuid()} FOREIGN KEY (${column}) `
         + `REFERENCES ${tableName}(${foreign})`;
     }
 
@@ -775,4 +783,5 @@ class ArnelifyORM {
     }
 }
 
-export default ArnelifyORM;
+export type { ArnelifyORMRes };
+export { ArnelifyORM };

src/tests/index.ts

@@ -1,7 +1,6 @@
 #!/usr/bin/env bun
 
-import ArnelifyORMRes from "contracts/res";
-import ArnelifyORM from "../index";
+import { ArnelifyORM, ArnelifyORMRes } from "../index";
 
 (function main(): number {
 
@@ -13,7 +12,7 @@ import ArnelifyORM from "../index";
     "ORM_PASS": "pass",
     "ORM_PORT": 3306
   });
-  
+
   let res: ArnelifyORMRes = {};
 
   db.dropTable("users");