merge

Author: fernandocode

README.md

@@ -2,7 +2,7 @@
 [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/fernandocode/ionic-database-builder/issues)
 
 # ionic-database-builder
-Extended library from [database-builder](https://github.com/fernandocode/database-builder) to assist in creating and maintaining SQL commands. Allowing integrate execute commands with [SQLite ('@ionic-native/sqlite')](https://ionicframework.com/docs/native/sqlite/), [Web Sql](https://www.w3.org/TR/webdatabase/), etc. Through the interface injection 'DatabaseCreatorContract' returning an implementation of 'DatabaseObject'.
+Ionic module for [database-builder](https://github.com/fernandocode/database-builder) library. Allowing integrate execute commands with [SQLite ('@ionic-native/sqlite')](https://ionicframework.com/docs/native/sqlite/), [Web Sql](https://www.w3.org/TR/webdatabase/), etc. Through the interface injection 'DatabaseCreatorContract' returning an implementation of 'DatabaseObject'.
 
 # Getting Started
 
@@ -65,6 +65,10 @@ import { DatabaseHelper } from 'database-builder';
                 // Declare the implementation of 'DatabaseCreatorContract' that you want to use, you can include a proxy, use libraries with different signatures, or create mocks for tests, etc.
                 useClass: SQLite
             },
+            {
+                // Enable log SQL execute
+                useValue: false
+            },
             // implementation of "DatabaseMigrationContract" to estrategy migration upgrade versions database
             DatabaseMigrationService
             ),
@@ -141,6 +145,10 @@ import { DatabaseModule } from 'ionic-database-builder';
                 // Declare the implementation of 'DatabaseCreatorContract' that you want to use, you can include a proxy, use libraries with different signatures, or create mocks for tests, etc.
                 useClass: SQLite
             },
+            {
+                // Enable log SQL execute
+                useValue: false
+            },
             // implementation of "DatabaseMigrationContract" to estrategy migration upgrade versions database
             DatabaseMigrationService
             ),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ionic-database-builder",
-  "version": "0.2.0-ionic.4-beta.2",
+  "version": "0.2.0-ionic4-beta.3",
   "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": {
@@ -11,7 +11,8 @@
     "lint": "ng lint",
     "e2e": "ng e2e",
     "packagr": "ng-packagr -p ng-package.json",
-    "publish-npm": "npm run packagr && npm publish dist"
+    "publish-npm": "npm run packagr && npm publish dist",
+    "publish-npm-beta": "npm run packagr && npm publish dist --tag ionic4-beta"
   },
   "repository": {
     "type": "git",

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/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);
         });