v.0.2.0-ionic.4-beta.2

Author: fernandocode

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ionic-database-builder",
-  "version": "0.2.0-ionic.4-beta.1",
+  "version": "0.2.0-ionic.4-beta.2",
   "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": "^6.1.0",
-    "database-builder": ">=0.1.0-beta.6"
+    "database-builder": ">=0.1.0-beta.11"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.7.0",

src/database.module.ts

@@ -1,5 +1,5 @@
 import { DatabaseMigration } from "./providers/database-migration";
-import { DATABASE_CREATOR, IS_AVAILABLE_DATABASE } from "./dependency-injection-definition";
+import { DATABASE_CREATOR, IS_AVAILABLE_DATABASE, IS_ENABLE_LOG } from "./dependency-injection-definition";
 import { ModuleWithProviders, NgModule, Provider, Type } from "@angular/core";
 import { DatabaseHelperService } from "./providers/database-helper-service";
 import { DatabaseMigrationContract } from "./providers/database-migration-contract";
@@ -28,12 +28,14 @@ export class DatabaseModule {
         settingsProvider: ProviderTyped<DatabaseSettingsFactoryContract>,
         isAvailableProvider: ProviderTyped<boolean>,
         databaseCreatorProvider: ProviderTyped<DatabaseCreatorContract>,
+        isEnableLogProvider: ProviderTyped<boolean>,
         databaseMigrationContract?: Type<DatabaseMigrationContract>
     ): ModuleWithProviders {
         const providers: Provider[] = [
             this.createProvider(DatabaseSettingsFactoryContract, settingsProvider),
             this.createProvider(IS_AVAILABLE_DATABASE, isAvailableProvider),
-            this.createProvider(DATABASE_CREATOR, databaseCreatorProvider)
+            this.createProvider(DATABASE_CREATOR, databaseCreatorProvider),
+            this.createProvider(IS_ENABLE_LOG, isEnableLogProvider),
         ];
         return this.forBase(providers, databaseMigrationContract);
     }

src/dependency-injection-definition.ts

@@ -2,4 +2,5 @@ import { InjectionToken } from "@angular/core";
 import { DatabaseCreatorContract } from "./model/database-creator-contract";
 
 export const IS_AVAILABLE_DATABASE = new InjectionToken<boolean>("is_available");
+export const IS_ENABLE_LOG = new InjectionToken<boolean>("is_enable_log");
 export const DATABASE_CREATOR = new InjectionToken<DatabaseCreatorContract>("database_creator");

src/providers/database-migration.ts

@@ -45,8 +45,6 @@ export class DatabaseMigration extends DatabaseMigrationBase implements Database
         return new Promise<boolean>((resolve, reject) => {
 
             let observablesNested: Array<Observable<any>> = [];
-            console.log("this._databaseMigrationContract:");
-            console.log(this._databaseMigrationContract);
             if (this._databaseMigrationContract) {
                 const toObservables = this._databaseMigrationContract.to(
                     version, 

src/providers/database.ts

@@ -1,3 +1,4 @@
+import { IS_ENABLE_LOG } from './../dependency-injection-definition';
 import { DatabaseMigration } from "./database-migration";
 import { Inject, Injectable, Injector } from "@angular/core";
 import { BuildableDatabaseManager } from "../utils/buildable-database-manager";
@@ -13,13 +14,15 @@ export class Database extends BuildableDatabaseManager {
 
     constructor(
         @Inject(IS_AVAILABLE_DATABASE) private _isAvailable: boolean,
+        @Inject(IS_ENABLE_LOG) isEnableLog: boolean,
         private _injector: Injector,
         databaseFactory: DatabaseFactoryContract,
         private _databaseMigration: DatabaseMigration
     ) {
         super(
             databaseFactory,
-            _injector.get(DatabaseSettingsFactoryContract).mapper(_injector)
+            _injector.get(DatabaseSettingsFactoryContract).mapper(_injector),
+            isEnableLog
         );
         this._settings = _injector.get(DatabaseSettingsFactoryContract);
     }

src/test/factory/database-creator-fake.ts

@@ -1,5 +1,5 @@
 import { DatabaseCreatorContract } from "../../model/database-creator-contract";
-import { DatabaseObject, DatabaseResult, DatabaseTransaction } from "database-builder";
+import { DatabaseBaseTransaction, DatabaseObject, DatabaseResult } from "database-builder";
 import { DatabaseConfig } from "../../model/database-config";
 
 export class DatabaseCreatorFake implements DatabaseCreatorContract {
@@ -14,14 +14,14 @@ export class DatabaseCreatorFake implements DatabaseCreatorContract {
                         resolve(this.resultFake());
                     });
                 },
-                transaction: (fn: (transaction: DatabaseTransaction) => void): Promise<any> => {
+                transaction: (fn: (transaction: DatabaseBaseTransaction) => void): Promise<any> => {
                     return new Promise<any>((resolve, reject) => {
-                        fn(<DatabaseTransaction>{
+                        fn(<DatabaseBaseTransaction>{
                             executeSql: (
                                 sql: string,
                                 values: any,
-                                success: (tx: DatabaseTransaction, result: DatabaseResult) => void,
-                                error: (tx: DatabaseTransaction, error: any) => void
+                                success: (tx: DatabaseBaseTransaction, result: DatabaseResult) => void,
+                                error: (tx: DatabaseBaseTransaction, error: any) => void
                             ): void => {
                                 this.executeFake(sql, values);
                                 success(void 0, this.resultFake());
@@ -35,7 +35,7 @@ export class DatabaseCreatorFake implements DatabaseCreatorContract {
     }
 
     private executeFake(sql: string, params: any) {
-        console.log(`sql: ${sql}, params: ${JSON.stringify(params)}`);
+        console.log(`Fake - sql: ${sql}, params: ${JSON.stringify(params)}`);
     }
 
     private resultFake(): DatabaseResult {

src/test/mapper.spec.ts

@@ -1,3 +1,4 @@
+import { async, TestBed } from '@angular/core/testing';
 import { Classificacao } from './models/classificacao';
 import { SubRegiao } from './models/sub-regiao';
 import { Cidade } from './models/cidade';
@@ -6,7 +7,6 @@ import { Database, DatabaseModule } from '..';
 import { TestClazz } from './models/test-clazz';
 import { Uf } from './models/uf';
 import { Regiao } from './models/regiao';
-import { async, TestBed } from '@angular/core/testing';
 import { DatabaseMigrationService } from './provider/database-migration-service';
 import { DatabaseSettingsFactory } from './factory/database-settings-factory';
 import { TableMapper } from './mapper/table-mapper';
@@ -26,7 +26,6 @@ describe('Mapper', () => {
                     },
                     {
                         useFactory: (mapper: TableMapper) => {
-                            console.log(mapper.get(TestClazz));
                             return mapper.get(TestClazz) ? true : false;
                         },
                         deps: [TableMapper]
@@ -36,6 +35,9 @@ describe('Mapper', () => {
                         useClass: DatabaseCreatorFake
                         // useClass: SQLite
                     },
+                    {
+                        useValue: false
+                    },
                     DatabaseMigrationService
                 )
                 // DatabaseModule.forRootValue(

src/utils/buildable-database-manager.ts

@@ -1,6 +1,6 @@
-import { DatabaseResult } from "database-builder";
+import { DatabaseBaseTransaction, DatabaseResult } from "database-builder";
 import { DatabaseManager } from "./database-manager";
-import { Crud, DatabaseObject, DatabaseTransaction, Ddl, ExecutableBuilder, GetMapper, Query, QueryCompiled } from "database-builder";
+import { Crud, DatabaseObject, Ddl, ExecutableBuilder, GetMapper, Query, QueryCompiled } from "database-builder";
 import { DatabaseFactoryContract } from "./database-factory-contract";
 
 export abstract class BuildableDatabaseManager extends DatabaseManager {
@@ -25,10 +25,10 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
         return database;
     }
 
-    public newTransaction(successTransaction: () => void): Promise<DatabaseTransaction> {
+    public newTransaction(successTransaction: () => void): Promise<DatabaseBaseTransaction> {
         return new Promise((resolve, reject) => {
             this.databaseInstance().then(database => {
-                database.transaction((result: DatabaseTransaction) => {
+                database.transaction((result: DatabaseBaseTransaction) => {
                     resolve(result);
                 })
                     .then(x => {

src/utils/database-migration-base.ts

@@ -1,6 +1,6 @@
 import * as momentNs from "moment";
 const moment = momentNs;
-import { DatabaseObject, DatabaseTransaction } from "database-builder";
+import { DatabaseBaseTransaction, DatabaseObject } from "database-builder";
 import { Observable, Observer } from "rxjs";
 
 export abstract class DatabaseMigrationBase {
@@ -27,7 +27,7 @@ export abstract class DatabaseMigrationBase {
     }
 
     protected abstract migrationExecute(
-        transation: DatabaseTransaction, control: { oldVersion: number, newVersion: number }): Promise<boolean>;
+        transation: DatabaseBaseTransaction, control: { oldVersion: number, newVersion: number }): Promise<boolean>;
 
     private checkTableVersion(database: DatabaseObject): Promise<any> {
         return new Promise<any>((resolve, reject) => {
@@ -87,7 +87,7 @@ export abstract class DatabaseMigrationBase {
 
     private migration(database: DatabaseObject, control: { oldVersion: number, newVersion: number }): Promise<boolean> {
         return new Promise<boolean>((resolve, reject) => {
-            database.transaction((transation: DatabaseTransaction) => {
+            database.transaction((transation: DatabaseBaseTransaction) => {
                 this.migrationExecute(transation, control)
                     .then(r => resolve(r))
                     .catch(er => reject(er));