v.0.0.1

fernandocode · fernandocode · commit f63e219670bf · 2018-04-04T18:00:06.000-03:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,27 @@
+# Specifies intentionally untracked files to ignore when using Git
+# http://git-scm.com/docs/gitignore
+
+*~
+*.sw[mnpcod]
+*.log
+*.tmp
+*.tmp.*
+log.txt
+*.sublime-project
+*.sublime-workspace
+.vscode/
+npm-debug.log*
+
+.idea/
+.sass-cache/
+.tmp/
+.versions/
+
+node_modules/
+
+.DS_Store
+Thumbs.db
+UserInterfaceState.xcuserstate
+
+*.js
+*.d.ts
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,13 @@
+!lib
+node_modules
+.vscode
+*.log
+*.ignorenpm
+tsconfig.json
+showcase
+
+# ignore the .ts files
+*.ts
+
+# include the .d.ts files
+!*.d.ts
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,7 @@
+# Contributing
+
+Have you found a bug, or want to develop a new feature?
+
+1. [Look for Pull Requests](https://github.com/fernandocode/database-builder/pulls) if something is not already implemented;
+2. [Check if there is no Issue related to this](https://github.com/fernandocode/database-builder/issues)? (If there is not one, so that the use case can be checked);
+3. Make the necessary changes, add tests to what has been implemented, run the tests and submit a Pull Request with the changes (Comment what was done, and relate the Issue). As soon as possible it will be verified, and if approved it will be available in the next release of the library.
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Fernando Leal
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/package.json b/package.json
@@ -0,0 +1,48 @@
+{
+  "name": "ionic-database-builder",
+  "version": "0.0.1",
+  "description": "Extended library from database-builder to assist in creating and maintaining SQL commands with integrate execute commands in SQLite ('@ionic-native/sqlite').",
+  "main": "index.js",
+  "scripts": {
+    "test": "tsc & mocha src/**/*.spec.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/fernandocode/ionic-database-builder.git"
+  },
+  "keywords": [
+    "orm",
+    "database",
+    "builder",
+    "database-builder",
+    "sqlite",
+    "sql",
+    "sql-builder",
+    "crud",
+    "insert",
+    "update",
+    "delete",
+    "select",
+    "ddl",
+    "create-table",
+    "drop-table",
+    "alter-table",
+    "ionic"
+  ],
+  "author": "Fernando Leal",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/fernandocode/ionic-database-builder/issues"
+  },
+  "homepage": "https://github.com/fernandocode/ionic-database-builder#readme",
+  "dependencies": {
+    "@angular/core": "^5.2.7",
+    "@ionic-native/android-permissions": "^4.5.3",
+    "@ionic-native/core": "^4.5.3",
+    "@ionic-native/sqlite": "^4.5.3",
+    "database-builder": "0.0.18",
+    "ionic-angular": "^3.9.2",
+    "rxjs": "^5.5.6",
+    "zone.js": "^0.8.20"
+  }
+}
diff --git a/src/database.module.ts b/src/database.module.ts
@@ -0,0 +1,23 @@
+import { Observable } from "rxjs";
+import { ModuleWithProviders, NgModule } from "@angular/core";
+import { DatabaseHelperService } from "./utils/database-helper-service";
+
+@NgModule({
+    declarations: [
+        // declare all components that your module uses
+        // MyComponent
+    ],
+    exports: [
+        // export the component(s) that you want others to be able to use
+        // MyComponent
+    ]
+})
+export class DatabaseModule {
+    // https://stackblitz.com/edit/ionic-j3f3ym
+    public static forRoot(): ModuleWithProviders {
+        return {
+            ngModule: DatabaseModule,
+            providers: [DatabaseHelperService]
+        };
+    }
+}
diff --git a/src/dependency-injection-definition.ts b/src/dependency-injection-definition.ts
@@ -0,0 +1,5 @@
+
+import { InjectionToken } from "@angular/core";
+
+export const VERSION = new InjectionToken<number>("version");
+export const DATABASE_NAME = new InjectionToken<string>("database_name");
diff --git a/src/index.ts b/src/index.ts
@@ -0,0 +1,2 @@
+
+export * from "./database.module";
diff --git a/src/model/version-model.ts b/src/model/version-model.ts
@@ -0,0 +1,4 @@
+export interface Version {
+    oldVersion: number;
+    newVersion: number;
+}
diff --git a/src/providers/database-migration-contract.ts b/src/providers/database-migration-contract.ts
@@ -0,0 +1,7 @@
+import { Version } from "./../model/version-model";
+import { Observable } from "rxjs/Observable";
+
+export interface DatabaseMigrationContract {
+
+    to(version: Version): Array<Observable<any>>;
+}
diff --git a/src/providers/database-migration.ts b/src/providers/database-migration.ts
@@ -0,0 +1,84 @@
+import { Version } from "./../model/version-model";
+import { Observer } from "rxjs/Observer";
+import { Observable } from "rxjs/Observable";
+import { Alert, App, Config } from "ionic-angular";
+import { Injectable, Optional } from "@angular/core";
+import { SQLiteTransaction } from "@ionic-native/sqlite";
+import { Ddl, GetMapper } from "database-builder";
+import { MigrationDatabaseBase } from "../utils/migration-database-base";
+import { DatabaseMigrationContract } from "./database-migration-contract";
+
+@Injectable()
+export class DatabaseMigration extends MigrationDatabaseBase {
+
+    constructor(
+        private _mappersTable: GetMapper,
+        app: App,
+        config: Config,
+        @Optional() private _databaseMigrationContract: DatabaseMigrationContract
+    ) {
+        super(
+            app, config
+        );
+    }
+
+    public databaseReset(transation: SQLiteTransaction, version: Version): Observable<any> {
+
+        // tslint:disable-next-line:no-console
+        console.info("database reset");
+
+        const observablesWait: Array<Observable<any>> = [];
+
+        // remove dados offline da versão anterior, pois o formato dos dados foi alterado de uma versão para a outra
+        const ddl = new Ddl(transation, this._mappersTable, true);
+        this._mappersTable.forEachMapper((value, key) => {
+            if (!value.readOnly) {
+                observablesWait.push(Observable.fromPromise(ddl.drop(value.newable).execute()));
+                observablesWait.push(Observable.fromPromise(ddl.create(value.newable).execute()));
+            }
+        });
+
+        return Observable.forkJoin(observablesWait);
+    }
+
+    protected migrationExecute(transation: SQLiteTransaction, version: Version): Promise<boolean> {
+        return new Promise<boolean>((resolve, reject) => {
+
+            let observablesNested: Array<Observable<any>> = [];
+            if (this._databaseMigrationContract) {
+                const toObservables = this._databaseMigrationContract.to(version);
+                if (toObservables && toObservables.length > 0) {
+                    observablesNested = observablesNested.concat(toObservables);
+                }
+            }
+
+            if (observablesNested.length === 0 && version.oldVersion < 1) {
+                observablesNested.push(this.databaseReset(transation, version));
+            }
+
+            this.callNested(observablesNested, 0).subscribe(result => {
+                resolve(result);
+            }, error => reject(error));
+        });
+    }
+
+    private callNested(observablesNested: Array<Observable<any>>, nextIndex: number): Observable<boolean> {
+        return Observable.create((observer: Observer<boolean>) => {
+            if (observablesNested.length > nextIndex) {
+                observablesNested[nextIndex].subscribe(result => {
+                    this.callNested(observablesNested, ++nextIndex).subscribe(_ => {
+                        observer.next(true);
+                        observer.complete();
+                    }, error => {
+                        observer.error(error);
+                        observer.complete();
+                    });
+                });
+            } else {
+                observer.next(true);
+                observer.complete();
+            }
+        });
+    }
+
+}
diff --git a/src/providers/database.ts b/src/providers/database.ts
@@ -0,0 +1,35 @@
+import { DATABASE_NAME, VERSION } from "./../dependency-injection-definition";
+import { Inject, Injectable } from "@angular/core";
+import { SQLite, SQLiteObject } from "@ionic-native/sqlite";
+import { Platform } from "ionic-angular";
+import { BuildableDatabaseManager } from "../utils/buildable-database-manager";
+import { GetMapper } from "database-builder";
+
+@Injectable()
+export class Database extends BuildableDatabaseManager {
+    constructor(
+        @Inject(VERSION) private _version: number,
+        @Inject(DATABASE_NAME) private _databaseName: string,
+        platform: Platform,
+        sqlite: SQLite,
+        getMapper: GetMapper
+    ) {
+        super(platform, sqlite, getMapper);
+    }
+
+    // protected migrationVersion(database: SQLiteObject, version: number): Promise<boolean> {
+    //     return this._migrationDatabase.version(database, version);
+    // }
+
+    protected migrationVersion(database: SQLiteObject, version: number): Promise<boolean> {
+        throw new Error("Method not implemented.");
+    }
+
+    protected databaseName(): string {
+        return this._databaseName;
+    }
+
+    public version(): number {
+        return this._version;
+    }
+}
diff --git a/src/utils/buildable-database-manager.ts b/src/utils/buildable-database-manager.ts
@@ -0,0 +1,104 @@
+import { DatabaseManager } from "./database-manager";
+import { Platform } from "ionic-angular";
+import { SQLite, SQLiteObject, SQLiteTransaction } from "@ionic-native/sqlite";
+import { Crud, Ddl, ExecutableBuilder, GetMapper, Query, QueryCompiled, ResultExecuteSql } from "database-builder";
+import { ValueType } from "database-builder/src/core/utils";
+
+export abstract class BuildableDatabaseManager extends DatabaseManager {
+
+    constructor(
+        platform: Platform, sqlite: SQLite,
+        private _getMapper: GetMapper,
+        public enableLog: boolean = true
+    ) {
+        super(platform, sqlite);
+    }
+
+    public databaseInstance(): Promise<SQLiteObject> {
+        const database = super.databaseInstance(this.databaseName(), this.version());
+        if (!database) {
+            throw new Error("SQLite not avaliable!");
+        }
+        return database;
+    }
+
+    public newTransaction(successTransaction: () => void): Promise<SQLiteTransaction> {
+        return new Promise((resolve, reject) => {
+            this.databaseInstance().then(database => {
+                database.transaction((result: SQLiteTransaction) => {
+                    resolve(result);
+                })
+                    .then(x => {
+                        successTransaction();
+                    })
+                    .catch(error => {
+                        reject(error);
+                    });
+            }, reject)
+                .catch(error => {
+                    reject(error);
+                });
+        });
+    }
+
+    public transaction(successTransaction: () => void): Promise<Crud> {
+        return new Promise((resolve, reject) => {
+            this.newTransaction(successTransaction)
+                .then((transaction) => {
+                    resolve(new Crud(transaction, this._getMapper, this.enableLog));
+                })
+                .catch(error => {
+                    reject(error);
+                });
+        });
+    }
+
+    public crud(): Promise<Crud> {
+        return new Promise((resolve, reject) => {
+            this.databaseInstance().then(database => {
+                resolve(new Crud(database, this._getMapper, this.enableLog));
+            })
+                .catch(reject);
+        });
+    }
+
+    public sql(sql: string, params: any[] = []): Promise<ResultExecuteSql> {
+        return new Promise((resolve, reject) => {
+            this.databaseInstance().then(database => {
+                const executable = new ExecutableBuilder(this.enableLog);
+                executable.execute({
+                    query: sql,
+                    // tslint:disable-next-line:object-literal-shorthand
+                    params: params
+                } as QueryCompiled, database)
+                    .then((cursor: ResultExecuteSql) => {
+                        resolve(cursor);
+                    });
+            })
+                .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._getMapper.getMapper(typeT), database, this.enableLog));
+                }, reject)
+                .catch(reject);
+        });
+    }
+
+    public ddl(): Promise<Ddl> {
+        return new Promise((resolve, reject) => {
+            this.databaseInstance().then(database => {
+                resolve(new Ddl(database, this._getMapper, this.enableLog));
+            })
+                .catch(reject);
+        });
+    }
+
+    protected abstract databaseName(): string;
+
+    public abstract version(): number;
+}
diff --git a/src/utils/database-helper-service.ts b/src/utils/database-helper-service.ts
diff --git a/src/utils/database-manager.ts b/src/utils/database-manager.ts
diff --git a/src/utils/migration-database-base.ts b/src/utils/migration-database-base.ts
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/tslint.json b/tslint.json

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+`
	`2`	`+export * from "./database.module";`