new transaction manager

Author: fernandocode

package-lock.json

@@ -6,10 +6,11 @@
  "start": "ng serve --aot",
  "build": "ng build ionic-database-builder --prod",
  "postbuild": "node scripts/copy-artifacts.js",
- "test": "ng test --prod",
+ "test": "ng test",
  "lint": "ng lint",
  "e2e": "ng e2e",
- "publish": "npm run build && npm publish dist/ionic-database-builder"
+ "publish-npm": "npm run build && npm publish dist/ionic-database-builder",
+ "publish-npm-alpha": "npm run build && npm publish dist/ionic-database-builder --tag alpha"
  },
  "private": true,
  "dependencies": {
@@ -22,8 +23,9 @@
  "@angular/platform-browser-dynamic": "~7.2.0",
  "@angular/router": "~7.2.0",
  "core-js": "^2.5.4",
- "database-builder": "^0.3.10",
- "rxjs": "~6.3.3",
+ "database-builder": "^0.4.8",
+ "moment": "^2.22.0",
+ "rxjs": "6.4.0",
  "tslib": "^1.9.0",
  "zone.js": "~0.8.26"
  },

package.json

@@ -1,6 +1,6 @@
 {
  "name": "ionic-database-builder",
- "version": "0.3.5",
+ "version": "0.3.6-alpha.0",
  "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",

projects/ionic-database-builder/package.json

@@ -15,7 +15,7 @@ export class DatabaseFactoryDefault extends DatabaseFactoryContract {
  }
 
  public database(databaseName: string): Observable<DatabaseObject> {
- return Observable.create((observer: Observer<DatabaseObject>) => {
+ return new Observable((observer: Observer<DatabaseObject>) => {
  if (this._isAvailable) {
  this._databaseCreator.create({
  name: databaseName,

projects/ionic-database-builder/src/lib/defaults/database-factory-default.ts

@@ -44,7 +44,7 @@ export class DatabaseMigration extends DatabaseMigrationBase implements Database
  }
 
  protected migrationExecute(database: DatabaseObject, version: Version): Observable<boolean> {
- return Observable.create((observer: Observer<boolean>) => {
+ return new Observable((observer: Observer<boolean>) => {
 
  let observablesNested: Array<Observable<any>> = [];
  if (this._databaseMigrationContract) {
@@ -75,7 +75,7 @@ export class DatabaseMigration extends DatabaseMigrationBase implements Database
  }
 
  private callNested(observablesNested: Array<Observable<any>>, nextIndex: number): Observable<boolean> {
- return Observable.create((observer: Observer<boolean>) => {
+ return new Observable((observer: Observer<boolean>) => {
  if (observablesNested.length > nextIndex) {
  observablesNested[nextIndex].subscribe((result: any) => {
  this.callNested(observablesNested, ++nextIndex).subscribe((_: any) => {

projects/ionic-database-builder/src/lib/services/database-migration.ts

@@ -36,7 +36,7 @@ export class Database extends BuildableDatabaseManager {
  if (this._isAvailable) {
  return this._databaseMigration.version(database, version);
  }
- return Observable.create((observer: Observer<boolean>) => {
+ return new Observable((observer: Observer<boolean>) => {
  observer.next(true);
  observer.complete();
  });

projects/ionic-database-builder/src/lib/services/database.ts

@@ -29,7 +29,7 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
  }
 
  public newTransaction(successTransaction: () => void): Observable<DatabaseBaseTransaction> {
- return Observable.create((observer: Observer<DatabaseBaseTransaction>) => {
+ return new Observable((observer: Observer<DatabaseBaseTransaction>) => {
  this.databaseInstance()
  .then(database => {
  database.transaction((result: DatabaseBaseTransaction) => {
@@ -52,7 +52,7 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
  }
 
  public transaction(successTransaction: () => void): Observable<Crud> {
- return Observable.create((observer: Observer<Crud>) => {
+ return new Observable((observer: Observer<Crud>) => {
  this.newTransaction(successTransaction)
  .subscribe((transaction) => {
  observer.next(new Crud(transaction, this._mapper, this.enableLog));
@@ -65,7 +65,7 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
  }
 
  public beginTransaction(): Observable<Crud> {
- return Observable.create((observer: Observer<Crud>) => {
+ return new Observable((observer: Observer<Crud>) => {
  this.sql('BEGIN TRANSACTION')
  .subscribe(r => {
  this.crud()
@@ -84,7 +84,7 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
  }
 
  public commitTransaction(): Observable<boolean> {
- return Observable.create((observer: Observer<boolean>) => {
+ return new Observable((observer: Observer<boolean>) => {
  this.sql('COMMIT')
  .subscribe(r => {
  observer.next(true);
@@ -97,7 +97,7 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
  }
 
  public rollbackTransaction(): Observable<boolean> {
- return Observable.create((observer: Observer<boolean>) => {
+ return new Observable((observer: Observer<boolean>) => {
  this.sql('ROLLBACK')
  .subscribe(r => {
  observer.next(true);
@@ -110,7 +110,7 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
  }
 
  public crud(): Observable<Crud> {
- return Observable.create((observer: Observer<Crud>) => {
+ return new Observable((observer: Observer<Crud>) => {
  this.databaseInstance()
  .then(database => {
  observer.next(new Crud(database, this._mapper, this.enableLog));
@@ -120,8 +120,30 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
  });
  }
 
+ public batch(compiled: QueryCompiled[]): Observable<DatabaseResult[]> {
+ return new Observable((observer: Observer<DatabaseResult[]>) => {
+ this.databaseInstance()
+ .then(database => {
+ const executable = new ExecutableBuilder(this.enableLog);
+ console.log('batch ::: ', database);
+ executable.executeBatch(compiled, database)
+ .subscribe((cursor: DatabaseResult[]) => {
+ observer.next(cursor);
+ observer.complete();
+ }, err => {
+ observer.error(err);
+ observer.complete();
+ });
+ })
+ .catch(err => {
+ observer.error(err);
+ observer.complete();
+ });
+ });
+ }
+
  public sql(sql: string, params: any[] = []): Observable<DatabaseResult> {
- return Observable.create((observer: Observer<DatabaseResult>) => {
+ return new Observable((observer: Observer<DatabaseResult>) => {
  this.databaseInstance()
  .then(database => {
  const executable = new ExecutableBuilder(this.enableLog);
@@ -145,7 +167,7 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
  }
 
  public query<T>(typeT: new () => T, alias: string = void 0): Observable<Query<T>> {
- return Observable.create((observer: Observer<Query<T>>) => {
+ return new Observable((observer: Observer<Query<T>>) => {
  this.databaseInstance()
  .then(database => {
  const that = this;
@@ -163,7 +185,7 @@ export abstract class BuildableDatabaseManager extends DatabaseManager {
  }
 
  public ddl(): Observable<Ddl> {
- return Observable.create((observer: Observer<Ddl>) => {
+ return new Observable((observer: Observer<Ddl>) => {
  this.databaseInstance()
  .then(database => {
  observer.next(new Ddl(database, this._mapper, this.enableLog));