@aceitadev/adatabase 0.2.0 → 0.3.0

package/dist/ActiveRecord.d.ts

@@ -4,6 +4,7 @@ type Constructor<T> = {
     new (...args: any[]): T;
 };
 export declare abstract class ActiveRecord {
+    private static idFieldCache;
     private static getIdField;
     save<T extends ActiveRecord>(this: T, tx?: GenericConnection): Promise<T>;
     static find<T extends ActiveRecord>(this: Constructor<T>): QueryBuilder<T>;

package/dist/ActiveRecord.js

@@ -21,11 +21,15 @@ function camelToSnake(s) {
 class ActiveRecord {
     static getIdField(ctor) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.idFieldCache.has(ctor)) {
+                return this.idFieldCache.get(ctor);
+            }
             const columns = (0, Column_1.getColumnMeta)(ctor);
             if (!columns)
                 throw new PersistenceException_1.PersistenceException("Model has no @Column decorators", null);
             for (const [prop, opts] of columns.entries()) {
                 if (opts === null || opts === void 0 ? void 0 : opts.id) {
+                    this.idFieldCache.set(ctor, prop);
                     return prop;
                 }
             }
@@ -119,3 +123,4 @@ ${idColName}
     }
 }
 exports.ActiveRecord = ActiveRecord;
+ActiveRecord.idFieldCache = new Map();

package/dist/SchemaManager.js

@@ -46,15 +46,9 @@ class SchemaManager {
             const colsSql = Object.entries(columns).map(([k, v]) => `\`${k}\` ${v}`).join(", ");
             let indexSql = "";
             if (adapter.type === 'mysql' && indexes.length > 0) {
-                indexSql = ", " + indexes.map(col => `INDEX 
-${col}
- (
-${col}
-)`).join(", ");
+                indexSql = ", " + indexes.map(col => `INDEX \`${col}\` (\`${col}\`)`).join(", ");
             }
-            const sql = `CREATE TABLE 
-${table}
- (${colsSql}${indexSql});`;
+            const sql = `CREATE TABLE \`${table}\` (${colsSql}${indexSql});`;
             const conn = yield (0, Database_1.getConnection)();
             try {
                 yield (0, Database_1.execute)(sql, [], conn);
@@ -66,13 +60,7 @@ ${table}
             if (adapter.type === 'postgres' && indexes.length > 0) {
                 for (const col of indexes) {
                     const indexName = `idx_${table}_${col}`;
-                    const indexCreationSql = `CREATE INDEX 
-${indexName}
- ON 
-${table}
- (
-${col}
-);`;
+                    const indexCreationSql = `CREATE INDEX \`${indexName}\` ON \`${table}\` (\`${col}\`);`;
                     const indexConn = yield (0, Database_1.getConnection)();
                     try {
                         yield (0, Database_1.execute)(indexCreationSql, [], indexConn);
@@ -88,11 +76,7 @@ ${col}
         return __awaiter(this, void 0, void 0, function* () {
             for (const [col, type] of Object.entries(desired)) {
                 if (!existing.hasOwnProperty(col)) {
-                    const sql = `ALTER TABLE 
-${table}
- ADD COLUMN 
-${col}
- ${type};`;
+                    const sql = `ALTER TABLE \`${table}\` ADD COLUMN \`${col}\` ${type};`;
                     const conn = yield (0, Database_1.getConnection)();
                     try {
                         yield (0, Database_1.execute)(sql, [], conn);
@@ -136,6 +120,14 @@ ${col}
                 continue;
             }
             let sqlType = this.getSqlTypeForClass(type);
+            if (type === Number && opts.decimal) {
+                if (Array.isArray(opts.decimal) && opts.decimal.length === 2) {
+                    sqlType = `DECIMAL(${opts.decimal[0]}, ${opts.decimal[1]})`;
+                }
+                else {
+                    sqlType = 'DECIMAL(10, 2)';
+                }
+            }
             if (type === String && opts && opts.limit) {
                 sqlType = `VARCHAR(${opts.limit})`;
             }

package/dist/adapters/PostgresAdapter.js

@@ -59,6 +59,10 @@ class PostgresAdapter {
             const conn = connection !== null && connection !== void 0 ? connection : this.getPool();
             let pgSql = this.quoteIdentifiers(this.formatSql(sql));
             if (pgSql.trim().toUpperCase().startsWith('INSERT')) {
+                pgSql = pgSql.trim();
+                if (pgSql.endsWith(';')) {
+                    pgSql = pgSql.slice(0, -1);
+                }
                 pgSql += ' RETURNING id';
             }
             const result = yield conn.query(pgSql, params);

package/dist/decorators/Column.d.ts

@@ -7,6 +7,7 @@ export type ColumnOptions = {
     limit?: number;
     type?: any;
     index?: boolean;
+    decimal?: boolean | [number, number];
 };
 export declare function Column(options: ColumnOptions): (target: any, propertyKey: string) => void;
 export declare function getColumnMeta(ctor: Function): Map<string, any> | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@aceitadev/adatabase",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "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",