@bunnykit/orm 0.1.28 → 0.1.29

package/dist/src/model/Model.js

@@ -434,9 +434,27 @@ export class Model {
         return !numericTypes.has(type);
     }
     static async prepareBulkRecords(records) {
+        const generatePk = await this.shouldAutoGeneratePrimaryKey();
+        const now = this.timestamps ? new Date().toISOString() : null;
         const prepared = [];
         for (const record of records) {
-            prepared.push(await this.prepareBulkRecord(record));
+            const instance = new this();
+            instance.fill(record);
+            const attributes = { ...instance.$attributes };
+            if (now) {
+                if (attributes.created_at === undefined)
+                    attributes.created_at = now;
+                if (attributes.updated_at === undefined)
+                    attributes.updated_at = now;
+            }
+            if (generatePk) {
+                const pk = this.primaryKey;
+                const pkValue = attributes[pk];
+                if (pkValue === null || pkValue === undefined || pkValue === "") {
+                    attributes[pk] = crypto.randomUUID();
+                }
+            }
+            prepared.push(attributes);
         }
         return prepared;
     }
@@ -501,8 +519,8 @@ export class Model {
         return result;
     }
     static async updateOrInsert(attributes, values = {}) {
-        const existing = await this.where(attributes).first();
-        if (existing) {
+        const exists = await this.where(attributes).exists();
+        if (exists) {
             const update = await this.prepareBulkRecord(values, { touchUpdatedAt: true, touchCreatedAt: false, generatePrimaryKey: false });
             await this.where(attributes).update(update);
             return true;

package/dist/src/query/Builder.js

@@ -718,8 +718,7 @@ export class Builder {
         return rows;
     }
     async first() {
-        const results = await this.limit(1).get();
-        return results[0] || null;
+        return (await this.limit(1).get())[0] || null;
     }
     async find(id, column = "id") {
         return this.where(column, id).first();
@@ -773,8 +772,15 @@ export class Builder {
         return instance;
     }
     async pluck(column) {
-        const results = await this.select(column).get();
-        return results.map((row) => row[column]);
+        const model = this.model;
+        this.model = undefined;
+        this.bindings = [];
+        this.parameterize = true;
+        const sql = this.select(column).toSql();
+        this.parameterize = false;
+        const rows = await this.connection.query(sql, this.bindings);
+        this.model = model;
+        return Array.from(rows).map((row) => row[column]);
     }
     async aggregate(sql, alias) {
         const query = this.clone();
@@ -790,19 +796,55 @@ export class Builder {
         return result ? result[alias] : null;
     }
     async count(column = "*") {
-        return Number(await this.aggregate(`COUNT(${column})`, "count") ?? 0);
+        const countSql = column === "*" ? "COUNT(*)" : `COUNT(${this.grammar.wrap(column)})`;
+        this.bindings = [];
+        this.parameterize = true;
+        const from = this.fromRaw || this.grammar.wrap(this.tableName);
+        const whereSql = this.compileWheres();
+        this.parameterize = false;
+        const sql = `SELECT ${countSql} as cnt FROM ${from}${whereSql ? " " + whereSql : ""}`;
+        const rows = await this.connection.query(sql, this.bindings);
+        return rows.length > 0 ? Number(rows[0].cnt) : 0;
     }
     async sum(column) {
-        return Number(await this.aggregate(`SUM(${column})`, "sum") ?? 0);
+        const sql = `SELECT SUM(${this.grammar.wrap(column)}) as sum_val FROM ${this.fromRaw || this.grammar.wrap(this.tableName)}`;
+        this.bindings = [];
+        this.parameterize = true;
+        const whereSql = this.compileWheres();
+        this.parameterize = false;
+        const fullSql = whereSql ? `${sql}${whereSql}` : sql;
+        const rows = await this.connection.query(fullSql, this.bindings);
+        return rows.length > 0 ? Number(rows[0].sum_val || 0) : 0;
     }
     async avg(column) {
-        return Number(await this.aggregate(`AVG(${column})`, "avg") ?? 0);
+        const sql = `SELECT AVG(${this.grammar.wrap(column)}) as avg_val FROM ${this.fromRaw || this.grammar.wrap(this.tableName)}`;
+        this.bindings = [];
+        this.parameterize = true;
+        const whereSql = this.compileWheres();
+        this.parameterize = false;
+        const fullSql = whereSql ? `${sql}${whereSql}` : sql;
+        const rows = await this.connection.query(fullSql, this.bindings);
+        return rows.length > 0 ? Number(rows[0].avg_val || 0) : 0;
     }
     async min(column) {
-        return await this.aggregate(`MIN(${column})`, "min");
+        const sql = `SELECT MIN(${this.grammar.wrap(column)}) as min_val FROM ${this.fromRaw || this.grammar.wrap(this.tableName)}`;
+        this.bindings = [];
+        this.parameterize = true;
+        const whereSql = this.compileWheres();
+        this.parameterize = false;
+        const fullSql = whereSql ? `${sql}${whereSql}` : sql;
+        const rows = await this.connection.query(fullSql, this.bindings);
+        return rows.length > 0 ? rows[0].min_val : null;
     }
     async max(column) {
-        return await this.aggregate(`MAX(${column})`, "max");
+        const sql = `SELECT MAX(${this.grammar.wrap(column)}) as max_val FROM ${this.fromRaw || this.grammar.wrap(this.tableName)}`;
+        this.bindings = [];
+        this.parameterize = true;
+        const whereSql = this.compileWheres();
+        this.parameterize = false;
+        const fullSql = whereSql ? `${sql}${whereSql}` : sql;
+        const rows = await this.connection.query(fullSql, this.bindings);
+        return rows.length > 0 ? rows[0].max_val : null;
     }
     async paginate(perPage = 15, page = 1) {
         const countQuery = this.clone();
@@ -1040,8 +1082,14 @@ export class Builder {
         return this.withTrashed().update({ [model.deletedAtColumn]: null });
     }
     async exists() {
-        const result = await this.select("1 as exists_check").limit(1).get();
-        return result.length > 0;
+        this.bindings = [];
+        this.parameterize = true;
+        const from = this.fromRaw || this.grammar.wrap(this.tableName);
+        const whereSql = this.compileWheres();
+        this.parameterize = false;
+        const sql = `SELECT 1 FROM ${from}${whereSql ? whereSql : ""} LIMIT 1`;
+        const rows = await this.connection.query(sql, this.bindings);
+        return rows.length > 0;
     }
     async doesntExist() {
         return !(await this.exists());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunnykit/orm",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "description": "An Eloquent-inspired ORM for Bun's native SQL client supporting SQLite, MySQL, and PostgreSQL.",
   "license": "MIT",
   "packageManager": "bun@1.3.12",