v.0.3.4

fernandocode · fernandocode · commit 1ff88740f77e · 2019-10-08T08:27:29.000-03:00
alteração para permitir incorporar platform ready na inialização da base de dados, evitando que uma conexão tente ser criada antes da platform está preparada.
Adicionado especialmente para o Ionic que só tem o plugin  SQLite disponivel após a inicialização da platform.
diff --git a/projects/ionic-database-builder/package.json b/projects/ionic-database-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic-database-builder",
-  "version": "0.3.3",
+  "version": "0.3.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'.",
   "repository": {
     "type": "git",
diff --git a/projects/ionic-database-builder/src/lib/defaults/database-factory-default.ts b/projects/ionic-database-builder/src/lib/defaults/database-factory-default.ts
@@ -1,7 +1,7 @@
-import { Inject, Injectable } from "@angular/core";
-import { DatabaseFactoryContract } from "../utils/database-factory-contract";
-import { DatabaseObject, DatabaseCreatorContract } from "database-builder";
-import { Observable, Observer } from "rxjs";
+import { Inject, Injectable } from '@angular/core';
+import { DatabaseFactoryContract } from '../utils/database-factory-contract';
+import { DatabaseObject, DatabaseCreatorContract } from 'database-builder';
+import { Observable, Observer } from 'rxjs';
 import { DATABASE_CREATOR, IS_AVAILABLE_DATABASE } from '../utils/dependency-injection-definition';
 
 @Injectable()
@@ -19,7 +19,7 @@ export class DatabaseFactoryDefault extends DatabaseFactoryContract {
             if (this._isAvailable) {
                 this._databaseCreator.create({
                     name: databaseName,
-                    location: "default"
+                    location: 'default'
                 })
                     .then(database => {
                         observer.next(database);
diff --git a/projects/ionic-database-builder/src/lib/ionic-database-builder.module.ts b/projects/ionic-database-builder/src/lib/ionic-database-builder.module.ts
@@ -2,12 +2,15 @@ import { DatabaseCreatorContract } from 'database-builder';
 import { Type, ModuleWithProviders, NgModule, SkipSelf, Optional } from '@angular/core';
 import { DatabaseMigrationContract } from './services/database-migration-contract';
 import { DatabaseSettingsFactoryContract } from './utils/database-settings-factory-contract';
-import { IS_AVAILABLE_DATABASE, DATABASE_CREATOR, IS_ENABLE_LOG, DATABASE_MIGRATION } from './utils/dependency-injection-definition';
+import {
+  IS_AVAILABLE_DATABASE, DATABASE_CREATOR, IS_ENABLE_LOG, DATABASE_MIGRATION, PLATFORM_LOAD
+} from './utils/dependency-injection-definition';
 import { Database } from './services/database';
 import { DatabaseMigration } from './services/database-migration';
 import { DatabaseHelperService } from './services/database-helper.service';
 import { DatabaseFactoryDefault } from './defaults/database-factory-default';
 import { DatabaseFactoryContract } from './utils/database-factory-contract';
+import { PlatformLoad } from './utils/platform-load';
 
 @NgModule({
   providers: [
@@ -31,13 +34,15 @@ export class IonicDatabaseBuilderModule {
 
   public static forSimple(
     isEnableLogProvider: boolean = false,
-    isAvailableProvider: boolean = true
+    isAvailableProvider: boolean = true,
+    platformLoad: PlatformLoad = { ready: () => Promise.resolve() },
   ): ModuleWithProviders {
     return {
       ngModule: IonicDatabaseBuilderModule,
       providers: [
         { provide: IS_ENABLE_LOG, useValue: isEnableLogProvider },
         { provide: IS_AVAILABLE_DATABASE, useValue: isAvailableProvider },
+        { provide: PLATFORM_LOAD, useValue: platformLoad },
       ]
     };
   }
@@ -46,6 +51,7 @@ export class IonicDatabaseBuilderModule {
     settingsProvider: Type<DatabaseSettingsFactoryContract>,
     databaseCreatorProvider: Type<DatabaseCreatorContract>,
     databaseMigrationContract: Type<DatabaseMigrationContract>,
+    platformLoad: PlatformLoad = { ready: () => Promise.resolve() },
     isEnableLogProvider: boolean = false,
     isAvailableProvider: boolean = true,
   ): ModuleWithProviders {
@@ -56,6 +62,7 @@ export class IonicDatabaseBuilderModule {
         { provide: DATABASE_CREATOR, useClass: databaseCreatorProvider },
         { provide: DATABASE_MIGRATION, useClass: databaseMigrationContract },
         { provide: IS_ENABLE_LOG, useValue: isEnableLogProvider },
+        { provide: PLATFORM_LOAD, useValue: platformLoad },
         { provide: IS_AVAILABLE_DATABASE, useValue: isAvailableProvider },
       ]
     };
diff --git a/projects/ionic-database-builder/src/lib/services/database-abstract-sqlite.service.ts b/projects/ionic-database-builder/src/lib/services/database-abstract-sqlite.service.ts
diff --git a/projects/ionic-database-builder/src/lib/services/database.ts b/projects/ionic-database-builder/src/lib/services/database.ts
@@ -1,11 +1,12 @@
-import { DatabaseMigration } from "./database-migration";
-import { Inject, Injectable, Injector } from "@angular/core";
-import { BuildableDatabaseManager } from "../utils/buildable-database-manager";
-import { DatabaseFactoryContract } from "../utils/database-factory-contract";
-import { DatabaseObject } from "database-builder";
+import { DatabaseMigration } from './database-migration';
+import { Inject, Injectable, Injector } from '@angular/core';
+import { BuildableDatabaseManager } from '../utils/buildable-database-manager';
+import { DatabaseFactoryContract } from '../utils/database-factory-contract';
+import { DatabaseObject } from 'database-builder';
 import { Observable, Observer } from 'rxjs';
-import { IS_AVAILABLE_DATABASE, IS_ENABLE_LOG } from '../utils/dependency-injection-definition';
+import { IS_AVAILABLE_DATABASE, IS_ENABLE_LOG, PLATFORM_LOAD } from '../utils/dependency-injection-definition';
 import { DatabaseSettingsFactoryContract } from '../utils/database-settings-factory-contract';
+import { PlatformLoad } from '../utils/platform-load';
 
 @Injectable()
 export class Database extends BuildableDatabaseManager {
@@ -17,11 +18,13 @@ export class Database extends BuildableDatabaseManager {
         @Inject(IS_ENABLE_LOG) isEnableLog: boolean,
         private _injector: Injector,
         databaseFactory: DatabaseFactoryContract,
-        private _databaseMigration: DatabaseMigration
+        private _databaseMigration: DatabaseMigration,
+        @Inject(PLATFORM_LOAD) platformLoad: PlatformLoad
     ) {
         super(
             databaseFactory,
             _injector.get(DatabaseSettingsFactoryContract).mapper(_injector),
+            platformLoad,
             isEnableLog
         );
         this._settings = _injector.get(DatabaseSettingsFactoryContract);
diff --git a/projects/ionic-database-builder/src/lib/utils/buildable-database-manager.ts b/projects/ionic-database-builder/src/lib/utils/buildable-database-manager.ts
@@ -1,17 +1,19 @@
-import { DatabaseBaseTransaction, DatabaseResult } from "database-builder";
-import { DatabaseManager } from "./database-manager";
-import { Crud, DatabaseObject, Ddl, ExecutableBuilder, GetMapper, Query, QueryCompiled } from "database-builder";
-import { DatabaseFactoryContract } from "./database-factory-contract";
-import { Observable, Observer } from "rxjs";
+import { DatabaseBaseTransaction, DatabaseResult } from 'database-builder';
+import { DatabaseManager } from './database-manager';
+import { Crud, DatabaseObject, Ddl, ExecutableBuilder, GetMapper, Query, QueryCompiled } from 'database-builder';
+import { DatabaseFactoryContract } from './database-factory-contract';
+import { Observable, Observer } from 'rxjs';
+import { PlatformLoad } from './platform-load';
 
 export abstract class BuildableDatabaseManager extends DatabaseManager {
 
     constructor(
         databaseFactory: DatabaseFactoryContract,
         private _mapper: GetMapper,
+        platformLoad: PlatformLoad,
         public enableLog: boolean = true
     ) {
-        super(databaseFactory);
+        super(databaseFactory, platformLoad);
     }
 
     public get mapper(): GetMapper {
@@ -21,7 +23,7 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
     public databaseInstance(): Promise<DatabaseObject> {
         const database = super.databaseInstance(this.databaseName(), this.version());
         if (!database) {
-            throw new Error("SQLite not avaliable!");
+            throw new Error('SQLite not avaliable!');
         }
         return database;
     }
@@ -64,7 +66,7 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
 
     public beginTransaction(): Observable<Crud> {
         return Observable.create((observer: Observer<Crud>) => {
-            this.sql("BEGIN TRANSACTION")
+            this.sql('BEGIN TRANSACTION')
                 .subscribe(r => {
                     this.crud()
                         .subscribe(crud => {
@@ -83,7 +85,7 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
 
     public commitTransaction(): Observable<boolean> {
         return Observable.create((observer: Observer<boolean>) => {
-            this.sql("COMMIT")
+            this.sql('COMMIT')
                 .subscribe(r => {
                     observer.next(true);
                     observer.complete();
@@ -96,7 +98,7 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
 
     public rollbackTransaction(): Observable<boolean> {
         return Observable.create((observer: Observer<boolean>) => {
-            this.sql("ROLLBACK")
+            this.sql('ROLLBACK')
                 .subscribe(r => {
                     observer.next(true);
                     observer.complete();
@@ -125,7 +127,7 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
                     const executable = new ExecutableBuilder(this.enableLog);
                     executable.execute([{
                         query: sql,
-                        params: params
+                        params
                     } as QueryCompiled], database)
                         .subscribe((cursor: DatabaseResult[]) => {
                             observer.next(cursor[0]);
diff --git a/projects/ionic-database-builder/src/lib/utils/database-factory-contract.ts b/projects/ionic-database-builder/src/lib/utils/database-factory-contract.ts
@@ -1,5 +1,5 @@
-import { DatabaseObject } from "database-builder";
-import { Observable } from "rxjs";
+import { DatabaseObject } from 'database-builder';
+import { Observable } from 'rxjs';
 
 export abstract class DatabaseFactoryContract {
 
diff --git a/projects/ionic-database-builder/src/lib/utils/database-manager.ts b/projects/ionic-database-builder/src/lib/utils/database-manager.ts
@@ -1,19 +1,21 @@
-import { DatabaseFactoryContract } from "./database-factory-contract";
-import { DatabaseObject } from "database-builder";
-import { Observable } from "rxjs";
+import { DatabaseFactoryContract } from './database-factory-contract';
+import { DatabaseObject, DatabaseBuilderError } from 'database-builder';
+import { Observable } from 'rxjs';
+import { PlatformLoad } from './platform-load';
 
 export abstract class DatabaseManager {
 
     private _databases: Map<string, Promise<DatabaseObject>> = new Map<string, Promise<DatabaseObject>>();
 
     constructor(
-        protected databaseFactory: DatabaseFactoryContract
+        protected databaseFactory: DatabaseFactoryContract,
+        protected _platformLoad: PlatformLoad
     ) {
 
     }
 
     public cleanDatabaseName(name: string) {
-        return name.replace(/([^a-z0-9]+)/gi, "-");
+        return name.replace(/([^a-z0-9]+)/gi, '-');
     }
 
     protected addDatabaseNameExtension(databaseName: string): string {
@@ -24,9 +26,8 @@ export abstract class DatabaseManager {
         const keyDatabaseName: string = name + version;
         return this._databases.has(keyDatabaseName)
             ? this._databases.get(keyDatabaseName)
-            : this._databases.set(keyDatabaseName,
-                this.createDatabase(this.databaseNameFile(name), version))
-                .get(keyDatabaseName);
+            : this.setDatabase(keyDatabaseName,
+                this.createDatabase(this.databaseNameFile(name), version));
     }
 
     public invalidateInstance() {
@@ -37,21 +38,36 @@ export abstract class DatabaseManager {
 
     protected abstract migrationVersion(database: DatabaseObject, version: number): Observable<boolean>;
 
+    private setDatabase(keyDatabaseName: string, promiseDatabase: Promise<DatabaseObject>): Promise<DatabaseObject> {
+        if (promiseDatabase) {
+            return this._databases
+                .set(keyDatabaseName, promiseDatabase)
+                .get(keyDatabaseName);
+        }
+        throw new DatabaseBuilderError(`Connection with provider of database cannot be created!`);
+    }
+
     private createDatabase(name: string, version: number): Promise<DatabaseObject> {
         return new Promise<DatabaseObject>((resolve, reject) => {
-            this.databaseFactory.database(name)
-                .subscribe((database: DatabaseObject) => {
-                    this.migrationVersion(database, version)
-                        .subscribe(_ => {
-                            resolve(database);
+            this._platformLoad.ready()
+                .then(() => {
+                    this.databaseFactory.database(name)
+                        .subscribe((database: DatabaseObject) => {
+                            this.migrationVersion(database, version)
+                                .subscribe(_ => {
+                                    resolve(database);
+                                }, err => {
+                                    reject(err);
+                                });
                         }, err => {
+                            this.catchException(err);
                             reject(err);
                         });
-                }, err => {
+                })
+                .catch(err => {
                     this.catchException(err);
                     reject(err);
                 });
-
         });
     }
 
diff --git a/projects/ionic-database-builder/src/lib/utils/database-migration-base.ts b/projects/ionic-database-builder/src/lib/utils/database-migration-base.ts
@@ -1,8 +1,8 @@
 
-import * as momentNs from "moment";
+import * as momentNs from 'moment';
 const moment = momentNs;
-import { DatabaseObject } from "database-builder";
-import { Observable, Observer } from "rxjs";
+import { DatabaseObject } from 'database-builder';
+import { Observable, Observer } from 'rxjs';
 
 export abstract class DatabaseMigrationBase {
 
@@ -69,8 +69,8 @@ export abstract class DatabaseMigrationBase {
                         .catch(err => this.error(err, observer));
                 }
                 observer.next({
-                    oldVersion: oldVersion,
-                    newVersion: newVersion
+                    oldVersion,
+                    newVersion
                 });
                 observer.complete();
             });
diff --git a/projects/ionic-database-builder/src/lib/utils/database-settings-factory-contract.ts b/projects/ionic-database-builder/src/lib/utils/database-settings-factory-contract.ts
@@ -1,5 +1,5 @@
-import { Injector } from "@angular/core";
-import { GetMapper } from "database-builder";
+import { Injector } from '@angular/core';
+import { GetMapper } from 'database-builder';
 
 export abstract class DatabaseSettingsFactoryContract {
 
diff --git a/projects/ionic-database-builder/src/lib/utils/dependency-injection-definition.ts b/projects/ionic-database-builder/src/lib/utils/dependency-injection-definition.ts
@@ -1,8 +1,10 @@
-import { InjectionToken } from "@angular/core";
-import { DatabaseCreatorContract } from "database-builder";
+import { InjectionToken } from '@angular/core';
+import { DatabaseCreatorContract } from 'database-builder';
 import { DatabaseMigrationContract } from '../services/database-migration-contract';
+import { PlatformLoad } from './platform-load';
 
-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");
-export const DATABASE_MIGRATION = new InjectionToken<DatabaseMigrationContract>("database_migration");
+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');
+export const DATABASE_MIGRATION = new InjectionToken<DatabaseMigrationContract>('database_migration');
+export const PLATFORM_LOAD = new InjectionToken<PlatformLoad>('platform_load');
diff --git a/projects/ionic-database-builder/src/lib/utils/platform-load.ts b/projects/ionic-database-builder/src/lib/utils/platform-load.ts
@@ -0,0 +1,3 @@
+export abstract class PlatformLoad {
+    public abstract ready(): Promise<void>;
+}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -5,7 +5,7 @@ import { NgModule } from '@angular/core';
 
 import { AppComponent } from './app.component';
 import { DatabaseSettingsFactory } from './database/factory/database-settings-factory';
-import { IonicDatabaseBuilderModule, DatabaseBrowserService } from 'ionic-database-builder';
+import { IonicDatabaseBuilderModule, WebSqlDatabaseService } from 'ionic-database-builder';
 
 @NgModule({
   declarations: [
@@ -15,7 +15,7 @@ import { IonicDatabaseBuilderModule, DatabaseBrowserService } from 'ionic-databa
     BrowserModule,
     IonicDatabaseBuilderModule.forRoot(
       DatabaseSettingsFactory,
-      DatabaseBrowserService,
+      WebSqlDatabaseService,
       DatabaseMigrationService
     )
   ],
diff --git a/src/app/database/mapper/table-mapper.ts b/src/app/database/mapper/table-mapper.ts
diff --git a/src/app/simple.spec.ts b/src/app/simple.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ionic-database-builder",`
`3`		`- "version": "0.3.3",`
	`3`	`+ "version": "0.3.4",`
`4`	`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'.",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`