v.0.1.0-beta.4

- Compatibility with database-builder v.0.1.0-beta.17

Author: fernandocode

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ionic-database-builder",
-  "version": "0.1.0-beta.3",
+  "version": "0.1.0-beta.4",
   "description": "Extended library from database-builder to assist in creating and maintaining SQL commands. Allowing integrate execute commands with SQLite ('@ionic-native/sqlite'), Web Sql, etc. Through the interface injection 'DatabaseCreatorContract' returning an implementation of 'DatabaseObject'.",
   "main": "index.js",
   "scripts": {
@@ -45,7 +45,7 @@
   "homepage": "https://github.com/fernandocode/ionic-database-builder#readme",
   "dependencies": {
     "@angular/core": "^5.0.0",
-    "database-builder": ">=0.1.0-beta.1"
+    "database-builder": ">=0.1.0-beta.17"
   },
   "devDependencies": {
     "@angular/cli": "^1.7.4",

src/test/mapper.spec.ts

@@ -106,11 +106,11 @@ describe('Mapper', () => {
         const database: Database = TestBed.get(Database);
         database.crud().then(crud => {
             const result = crud.insert(Cliente, clienteToSave).compile();
-            expect(result.params.toString()).toEqual([
+            expect(result[0].params.toString()).toEqual([
                 clienteToSave.codeImport, clienteToSave.razaoSocial, clienteToSave.apelido,
                 clienteToSave.desativo, clienteToSave.cidade.codeImport, clienteToSave.classificacao.codeImport
             ].toString());
-            expect(result.query).toEqual('INSERT INTO Cliente (codeImport, razaoSocial, apelido, desativo, cidade_codeImport, classificacao_codeImport) VALUES (?, ?, ?, ?, ?, ?)');
+            expect(result[0].query).toEqual('INSERT INTO Cliente (codeImport, razaoSocial, apelido, desativo, cidade_codeImport, classificacao_codeImport) VALUES (?, ?, ?, ?, ?, ?)');
         });
     }));
 
@@ -122,11 +122,11 @@ describe('Mapper', () => {
         database.beginTransaction().then(crud => {
             try {
                 const result = crud.insert(Cliente, clienteToSave).compile();
-                expect(result.params.toString()).toEqual([
+                expect(result[0].params.toString()).toEqual([
                     clienteToSave.codeImport, clienteToSave.razaoSocial, clienteToSave.apelido,
                     clienteToSave.desativo, clienteToSave.cidade.codeImport, clienteToSave.classificacao.codeImport
                 ].toString());
-                expect(result.query).toEqual('INSERT INTO Cliente (codeImport, razaoSocial, apelido, desativo, cidade_codeImport, classificacao_codeImport) VALUES (?, ?, ?, ?, ?, ?)');
+                expect(result[0].query).toEqual('INSERT INTO Cliente (codeImport, razaoSocial, apelido, desativo, cidade_codeImport, classificacao_codeImport) VALUES (?, ?, ?, ?, ?, ?)');
                 database.commitTransaction().then(x => {
                     expect(x).toEqual(true);
                 }).catch(rollback);

src/test/mapper/table-mapper.ts

@@ -9,6 +9,7 @@ import { SubRegiao } from "../models/sub-regiao";
 import { Regiao } from "../models/regiao";
 import { Classificacao } from "../models/classificacao";
 import { MapperBase } from "database-builder";
+import { PrimaryKeyType } from "database-builder/src/core/enums/primary-key-type";
 
 @Injectable()
 export class TableMapper extends MapperBase {
@@ -23,13 +24,13 @@ export class TableMapper extends MapperBase {
             }
         );
 
-        this.add(TestClazzRef, x => x.id, true);
-        this.add(TestClazz, x => x.id, true);
-        this.add(Regiao, x => x.codeImport, true);
-        this.add(SubRegiao, x => x.codeImport, true);
-        this.add(Uf, x => x.codeImport, true);
-        this.add(Cidade, x => x.codeImport, true);
-        this.add(Classificacao, x => x.codeImport, true);
-        this.add(Cliente, x => x.internalKey, true);
+        this.autoMapper(TestClazzRef, x => x.id, PrimaryKeyType.AutoIncrement);
+        this.autoMapper(TestClazz, x => x.id, PrimaryKeyType.AutoIncrement);
+        this.autoMapper(Regiao, x => x.codeImport, PrimaryKeyType.AutoIncrement);
+        this.autoMapper(SubRegiao, x => x.codeImport, PrimaryKeyType.AutoIncrement);
+        this.autoMapper(Uf, x => x.codeImport, PrimaryKeyType.AutoIncrement);
+        this.autoMapper(Cidade, x => x.codeImport, PrimaryKeyType.AutoIncrement);
+        this.autoMapper(Classificacao, x => x.codeImport, PrimaryKeyType.AutoIncrement);
+        this.autoMapper(Cliente, x => x.internalKey, PrimaryKeyType.AutoIncrement);
     }
 }

src/utils/buildable-database-manager.ts

@@ -94,23 +94,27 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
         return new Promise((resolve, reject) => {
             this.databaseInstance().then(database => {
                 const executable = new ExecutableBuilder(this.enableLog);
-                executable.execute({
+                executable.execute([{
                     query: sql,
                     params: params
-                } as QueryCompiled, database)
-                    .then((cursor: DatabaseResult) => {
-                        resolve(cursor);
+                } as QueryCompiled], database)
+                    .then((cursor: DatabaseResult[]) => {
+                        resolve(cursor[0]);
                     });
             })
-            .catch(reject);
+                .catch(reject);
         });
     }
 
     public query<T>(typeT: new () => T, alias: string = void 0): Promise<Query<T>> {
         return new Promise((resolve, reject) => {
             this.databaseInstance()
                 .then(database => {
-                    resolve(new Query(typeT, alias, this._mapper.get(typeT), database, this.enableLog));
+                    const that = this;
+                    resolve(new Query(typeT, alias,
+                        (tKey: (new () => any) | string) => {
+                            return that._mapper.get(tKey);
+                        }, this._mapper.get(typeT).mapperTable, database, this.enableLog));
                 }, reject)
                 .catch(reject);
         });