@aceitadev/adatabase 0.1.2 → 0.1.5

package/dist/ActiveRecord.js

@@ -58,8 +58,10 @@ class ActiveRecord {
                 if (idValue == null || idValue === 0) {
                     const cols = colEntries.map(c => `\`${c.colName}\``).join(", ");
                     const placeholders = colEntries.map(() => "?").join(", ");
-                    const params = colEntries.map(c => c.value);
-                    const sql = `INSERT INTO \`${table}\` (${cols}) VALUES (${placeholders});`;
+                    const params = colEntries.map(c => c.value === undefined ? null : c.value);
+                    const sql = `INSERT INTO 
+${table}
+ (${cols}) VALUES (${placeholders});`;
                     const res = yield (0, Database_1.execute)(sql, params, conn);
                     if (res.insertId) {
                         this[idField] = res.insertId;
@@ -67,9 +69,13 @@ class ActiveRecord {
                 }
                 else {
                     const setClause = colEntries.map(c => `\`${c.colName}\` = ?`).join(", ");
-                    const params = [...colEntries.map(c => c.value), idValue];
+                    const params = [...colEntries.map(c => c.value === undefined ? null : c.value), idValue];
                     const idColName = camelToSnake(idField);
-                    const sql = `UPDATE \`${table}\` SET ${setClause} WHERE \`${idColName}\` = ?;`;
+                    const sql = `UPDATE 
+${table}
+ SET ${setClause} WHERE 
+${idColName}
+ = ?;`;
                     yield (0, Database_1.execute)(sql, params, conn);
                 }
             }

package/dist/QueryBuilder.d.ts

@@ -3,6 +3,8 @@ export declare class QueryBuilder<T extends ActiveRecord> {
     private model;
     private whereClauses;
     private _limit?;
+    private _offset?;
+    private _orderBy?;
     private _includes;
     private primaryKey;
     constructor(model: {
@@ -10,6 +12,9 @@ export declare class QueryBuilder<T extends ActiveRecord> {
     });
     where(field: keyof T | string, operator: string, value: any): this;
     include(...models: (new (...args: any[]) => any)[]): this;
+    orderBy(column: keyof T | string, direction?: 'asc' | 'desc'): this;
+    limit(count: number): this;
+    offset(count: number): this;
     first(): Promise<T | null>;
     get(): Promise<T[]>;
     private getColumnName;

package/dist/QueryBuilder.js

@@ -18,7 +18,7 @@ const BelongsTo_1 = require("./decorators/BelongsTo");
 const HasMany_1 = require("./decorators/HasMany");
 const HasOne_1 = require("./decorators/HasOne");
 function camelToSnake(s) {
-    return s.replace(/([a-z0-g])([A-Z])/g, "$1_$2").toLowerCase();
+    return s.replace(/([a-z0-9])([A-Z])/g, "$1_$2").toLowerCase();
 }
 class QueryBuilder {
     constructor(model) {
@@ -44,6 +44,18 @@ class QueryBuilder {
         this._includes.push(...models);
         return this;
     }
+    orderBy(column, direction = 'asc') {
+        this._orderBy = { column: column, direction };
+        return this;
+    }
+    limit(count) {
+        this._limit = count;
+        return this;
+    }
+    offset(count) {
+        this._offset = count;
+        return this;
+    }
     first() {
         return __awaiter(this, void 0, void 0, function* () {
             this._limit = 1;
@@ -117,8 +129,16 @@ class QueryBuilder {
                     params.push(c.value);
                 });
             }
-            if (this._limit)
+            if (this._orderBy) {
+                const colName = this.getColumnName(this._orderBy.column, columnsMeta);
+                sql += ` ORDER BY ${baseAlias}.\`${colName}\` ${this._orderBy.direction.toUpperCase()}`;
+            }
+            if (this._limit) {
                 sql += ` LIMIT ${this._limit}`;
+            }
+            if (this._offset) {
+                sql += ` OFFSET ${this._offset}`;
+            }
             sql += ";";
             const rows = yield (0, Database_1.query)(sql, params);
             return this.mapRowsToEntities(rows);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@aceitadev/adatabase",
-    "version": "0.1.2",
+    "version": "0.1.5",
     "description": "Uma biblioteca para facilitar a interação com bancos de dados MySQL e PostgreSQL em projetos TypeScript/Node.js.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",