@bunnykit/orm 0.1.22 → 0.1.23

package/dist/src/connection/Connection.d.ts

@@ -9,6 +9,7 @@ export declare class Connection {
     private schema?;
     private ownsDriver;
     private transactionDepth;
+    private savepointId;
     constructor(config: ConnectionConfig, options?: {
         driver?: SQL;
         schema?: string;

package/dist/src/connection/Connection.js

@@ -10,6 +10,7 @@ export class Connection {
     schema;
     ownsDriver;
     transactionDepth = 0;
+    savepointId = 0;
     constructor(config, options = {}) {
         this.config = config;
         this.schema = options.schema || ("schema" in config ? config.schema : undefined);
@@ -83,16 +84,36 @@ export class Connection {
         return await this.driver.unsafe(sqlString, bindings);
     }
     async beginTransaction() {
-        await this.driver.unsafe("BEGIN");
+        if (this.transactionDepth === 0) {
+            await this.driver.unsafe("BEGIN");
+        }
+        else {
+            await this.driver.unsafe(`SAVEPOINT bunny_trans_${++this.savepointId}`);
+        }
         this.transactionDepth++;
     }
     async commit() {
-        await this.driver.unsafe("COMMIT");
-        this.transactionDepth = Math.max(0, this.transactionDepth - 1);
+        if (this.transactionDepth <= 0)
+            return;
+        if (this.transactionDepth === 1) {
+            await this.driver.unsafe("COMMIT");
+        }
+        else {
+            await this.driver.unsafe(`RELEASE SAVEPOINT bunny_trans_${this.savepointId--}`);
+        }
+        this.transactionDepth--;
     }
     async rollback() {
-        await this.driver.unsafe("ROLLBACK");
-        this.transactionDepth = Math.max(0, this.transactionDepth - 1);
+        if (this.transactionDepth <= 0)
+            return;
+        if (this.transactionDepth === 1) {
+            await this.driver.unsafe("ROLLBACK");
+        }
+        else {
+            await this.driver.unsafe(`ROLLBACK TO SAVEPOINT bunny_trans_${this.savepointId}`);
+            await this.driver.unsafe(`RELEASE SAVEPOINT bunny_trans_${this.savepointId--}`);
+        }
+        this.transactionDepth--;
     }
     isInTransaction() {
         return this.transactionDepth > 0;

package/dist/src/migration/Migrator.js

@@ -195,30 +195,30 @@ export class Migrator {
             const statements = [];
             for (const row of tables) {
                 const table = row[key];
-                const createRows = await this.connection.query(`SHOW CREATE TABLE ${table}`);
+                const createRows = await this.connection.query(`SHOW CREATE TABLE ${this.connection.getGrammar().wrap(table)}`);
                 statements.push(`${createRows[0]["Create Table"]};`);
             }
             return statements.join("\n\n") + "\n";
         }
         const schema = this.connection.getSchema() || "public";
-        const tables = await this.connection.query(`SELECT table_name FROM information_schema.tables WHERE table_schema = '${schema}' AND table_type = 'BASE TABLE' ORDER BY table_name`);
+        const tables = await this.connection.query("SELECT table_name FROM information_schema.tables WHERE table_schema = $1 AND table_type = 'BASE TABLE' ORDER BY table_name", [schema]);
         const statements = [];
         for (const tableRow of tables) {
             const table = tableRow.table_name;
             const columns = await this.connection.query(`SELECT column_name, data_type, is_nullable, column_default, character_maximum_length, numeric_precision, numeric_scale
          FROM information_schema.columns
-         WHERE table_schema = '${schema}' AND table_name = '${table}'
-         ORDER BY ordinal_position`);
+         WHERE table_schema = $1 AND table_name = $2
+         ORDER BY ordinal_position`, [schema, table]);
             const primaryKeys = await this.connection.query(`SELECT kcu.column_name
          FROM information_schema.table_constraints tc
          JOIN information_schema.key_column_usage kcu
            ON tc.constraint_name = kcu.constraint_name
           AND tc.table_schema = kcu.table_schema
           AND tc.table_name = kcu.table_name
-         WHERE tc.table_schema = '${schema}'
-           AND tc.table_name = '${table}'
+         WHERE tc.table_schema = $1
+           AND tc.table_name = $2
            AND tc.constraint_type = 'PRIMARY KEY'
-         ORDER BY kcu.ordinal_position`);
+         ORDER BY kcu.ordinal_position`, [schema, table]);
             const pkColumns = primaryKeys.map((row) => row.column_name);
             const columnSql = columns.map((column) => {
                 let type = String(column.data_type).toUpperCase();
@@ -228,7 +228,7 @@ export class Migrator {
                 else if ((type === "NUMERIC" || type === "DECIMAL") && column.numeric_precision) {
                     type = `${type}(${column.numeric_precision}${column.numeric_scale ? `, ${column.numeric_scale}` : ""})`;
                 }
-                let sql = `  "${column.column_name}" ${type}`;
+                let sql = `  ${this.connection.getGrammar().wrap(column.column_name)} ${type}`;
                 if (column.is_nullable === "NO")
                     sql += " NOT NULL";
                 if (column.column_default !== null && column.column_default !== undefined)
@@ -236,9 +236,9 @@ export class Migrator {
                 return sql;
             });
             if (pkColumns.length > 0) {
-                columnSql.push(`  PRIMARY KEY (${pkColumns.map((column) => `"${column}"`).join(", ")})`);
+                columnSql.push(`  PRIMARY KEY (${pkColumns.map((column) => this.connection.getGrammar().wrap(column)).join(", ")})`);
             }
-            statements.push(`CREATE TABLE "${schema}"."${table}" (\n${columnSql.join(",\n")}\n);`);
+            statements.push(`CREATE TABLE ${this.connection.getGrammar().wrap(`${schema}.${table}`)} (\n${columnSql.join(",\n")}\n);`);
         }
         return statements.join("\n\n") + "\n";
     }

package/dist/src/model/Model.js

@@ -815,21 +815,22 @@ export class Model {
     async save() {
         const constructor = this.constructor;
         if (this.$exists) {
-            await ObserverRegistry.dispatch("updating", this);
             await ObserverRegistry.dispatch("saving", this);
-            if (constructor.timestamps) {
+            let dirty = this.getDirty();
+            if (Object.keys(dirty).length > 0 && constructor.timestamps) {
                 this.$attributes["updated_at"] = this.freshTimestamp();
+                dirty = this.getDirty();
             }
-            const dirty = this.getDirty();
             if (Object.keys(dirty).length > 0) {
+                await ObserverRegistry.dispatch("updating", this);
                 const pk = this.getAttribute(constructor.primaryKey);
                 const connection = this.getConnection();
                 await new Builder(connection, connection.qualifyTable(constructor.getTable()))
                     .where(constructor.primaryKey, pk)
                     .update(dirty);
+                await ObserverRegistry.dispatch("updated", this);
             }
             this.$original = { ...this.$attributes };
-            await ObserverRegistry.dispatch("updated", this);
             await ObserverRegistry.dispatch("saved", this);
         }
         else {
@@ -930,10 +931,10 @@ export class Model {
     }
     async delete() {
         const constructor = this.constructor;
-        await ObserverRegistry.dispatch("deleting", this);
         const pk = this.getAttribute(constructor.primaryKey);
         if (!pk)
             return false;
+        await ObserverRegistry.dispatch("deleting", this);
         if (constructor.softDeletes) {
             const deletedAt = this.freshTimestamp();
             const connection = this.getConnection();

package/dist/src/query/Builder.d.ts

@@ -168,6 +168,7 @@ export declare class Builder<T = Record<string, any>> {
     insertGetId(data: ModelAttributeInput<T>, idColumn?: ModelColumn<T>): Promise<any>;
     insertOrIgnore(data: ModelAttributeInput<T> | ModelAttributeInput<T>[]): Promise<any>;
     upsert(data: ModelAttributeInput<T> | ModelAttributeInput<T>[], uniqueBy: ModelColumn<T> | ModelColumn<T>[], updateColumns?: ModelColumn<T>[]): Promise<any>;
+    private getUniformColumns;
     update(data: ModelAttributeInput<T>): Promise<any>;
     delete(): Promise<any>;
     increment(column: ModelColumn<T>, amount?: number, extra?: ModelAttributeInput<T>): Promise<any>;

package/dist/src/query/Builder.js

@@ -717,10 +717,15 @@ export class Builder {
         return results.map((row) => row[column]);
     }
     async aggregate(sql, alias) {
-        const model = this.model;
-        this.model = undefined;
-        const result = await this.select(`${sql} as ${alias}`).first();
-        this.model = model;
+        const query = this.clone();
+        query.model = undefined;
+        query.columns = [`${sql} as ${alias}`];
+        query.orders = [];
+        query.limitValue = undefined;
+        query.offsetValue = undefined;
+        query.eagerLoads = [];
+        query.lockMode = undefined;
+        const result = await query.first();
         return result ? result[alias] : null;
     }
     async count(column = "*") {
@@ -739,7 +744,11 @@ export class Builder {
         return await this.aggregate(`MAX(${column})`, "max");
     }
     async paginate(perPage = 15, page = 1) {
-        const total = await this.clone().count();
+        const countQuery = this.clone();
+        countQuery.limitValue = undefined;
+        countQuery.offsetValue = undefined;
+        countQuery.orders = [];
+        const total = await countQuery.count();
         const data = await this.clone().forPage(page, perPage).get();
         return {
             data,
@@ -867,7 +876,7 @@ export class Builder {
         const records = Array.isArray(data) ? data : [data];
         if (records.length === 0)
             return;
-        const columns = Object.keys(records[0]);
+        const columns = this.getUniformColumns(records);
         const bindings = [];
         const values = records.map((record) => {
             return `(${columns.map((col) => {
@@ -886,7 +895,7 @@ export class Builder {
         const records = Array.isArray(data) ? data : [data];
         if (records.length === 0)
             return;
-        const columns = Object.keys(records[0]);
+        const columns = this.getUniformColumns(records);
         const bindings = [];
         const values = records.map((record) => {
             return `(${columns.map((col) => {
@@ -901,7 +910,7 @@ export class Builder {
         const records = Array.isArray(data) ? data : [data];
         if (records.length === 0)
             return;
-        const columns = Object.keys(records[0]);
+        const columns = this.getUniformColumns(records);
         const bindings = [];
         const values = records.map((record) => {
             return `(${columns.map((col) => {
@@ -914,6 +923,17 @@ export class Builder {
         const sql = this.grammar.compileUpsert(this.grammar.wrap(this.tableName), columns, values, uniqueCols, updateCols);
         return await this.connection.run(sql, bindings);
     }
+    getUniformColumns(records) {
+        const columns = Object.keys(records[0]);
+        const signature = [...columns].sort().join("\0");
+        for (let i = 1; i < records.length; i++) {
+            const recordSignature = Object.keys(records[i]).sort().join("\0");
+            if (recordSignature !== signature) {
+                throw new Error("Bulk insert records must have the same columns.");
+            }
+        }
+        return columns;
+    }
     async update(data) {
         this.bindings = [];
         this.parameterize = true;

package/dist/src/query/grammars/MySqlGrammar.js

@@ -10,7 +10,7 @@ export class MySqlGrammar extends Grammar {
         }
         if (value === "*")
             return value;
-        return `\`${value}\``;
+        return `\`${value.replaceAll("`", "``")}\``;
     }
     placeholder(_index) {
         return "?";

package/dist/src/query/grammars/PostgresGrammar.js

@@ -10,7 +10,7 @@ export class PostgresGrammar extends Grammar {
         }
         if (value === "*")
             return value;
-        return `"${value}"`;
+        return `"${value.replaceAll('"', '""')}"`;
     }
     placeholder(index) {
         return `$${index}`;

package/dist/src/query/grammars/SQLiteGrammar.js

@@ -10,7 +10,7 @@ export class SQLiteGrammar extends Grammar {
         }
         if (value === "*")
             return value;
-        return `"${value}"`;
+        return `"${value.replaceAll('"', '""')}"`;
     }
     placeholder(_index) {
         return "?";

package/package.json

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