Skip to content

Commit 9fab9c3

Browse files
author
Fernando Leal
committed
update ionic.4
1 parent 79acb63 commit 9fab9c3

File tree

5 files changed

+20
-21
lines changed

5 files changed

+20
-21
lines changed

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ionic-database-builder",
3-
"version": "0.1.0-beta.2",
3+
"version": "0.1.0-beta.3",
44
"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'.",
55
"main": "index.js",
66
"scripts": {
@@ -44,18 +44,18 @@
4444
},
4545
"homepage": "https://github.com/fernandocode/ionic-database-builder#readme",
4646
"dependencies": {
47-
"@angular/core": "^5.0.0",
48-
"database-builder": ">=0.1.0-beta.1"
47+
"@angular/core": "~6.1.1",
48+
"database-builder": ">=0.1.0-beta.3"
4949
},
5050
"devDependencies": {
51-
"@angular/cli": "^1.7.4",
52-
"@angular/core": "^5.0.0",
53-
"@angular/common": "^5.0.0",
54-
"@angular/compiler": "^5.0.0",
55-
"@angular/compiler-cli": "^5.0.0",
56-
"@angular/language-service": "^5.0.0",
57-
"@angular/platform-browser": "^5.0.0",
58-
"@angular/platform-browser-dynamic": "^5.0.0",
51+
"@angular/cli": "~6.1.1",
52+
"@angular/core": "~6.1.1",
53+
"@angular/common": "~6.1.1",
54+
"@angular/compiler": "~6.1.1",
55+
"@angular/compiler-cli": "~6.1.1",
56+
"@angular/language-service": "~6.1.1",
57+
"@angular/platform-browser": "~6.1.1",
58+
"@angular/platform-browser-dynamic": "~6.1.1",
5959
"@types/jasmine": "~2.8.3",
6060
"@types/jasminewd2": "~2.0.2",
6161
"@types/node": "~6.0.60",
@@ -69,11 +69,11 @@
6969
"karma-jasmine-html-reporter": "^0.2.2",
7070
"ng-packagr": "2.4.2",
7171
"protractor": "~5.1.2",
72-
"rxjs": "^5.5.9",
7372
"ts-node": "~4.1.0",
7473
"tsickle": "0.27.5",
7574
"tslint": "~5.9.1",
76-
"typescript": "~2.5.3",
75+
"typescript": "~2.9.2",
76+
"rxjs": "6.2.2",
7777
"zone.js": "^0.8.26"
7878
},
7979
"tsconfig": "./tsconfig.json"

src/providers/database-migration-contract.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Injectable } from "@angular/core";
22
import { Version } from "./../model/version-model";
3-
import { Observable } from "rxjs/Observable";
43
import { DatabaseTransaction, GetMapper } from "database-builder";
54
import { DatabaseResettableContract } from "./database-resettable-contract";
5+
import { Observable } from "rxjs";
66

77
@Injectable()
88
export abstract class DatabaseMigrationContract {

src/providers/database-migration.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { DatabaseSettingsFactoryContract } from "..";
22
import { Version } from "./../model/version-model";
3-
import { Observable, Observer } from "rxjs";
3+
import { forkJoin, from, Observable, Observer } from "rxjs";
44
import { Injectable, Injector, Optional } from "@angular/core";
55
import { DatabaseTransaction, Ddl } from "database-builder";
66
import { DatabaseMigrationContract } from "./database-migration-contract";
@@ -33,12 +33,12 @@ export class DatabaseMigration extends DatabaseMigrationBase implements Database
3333
const ddl = new Ddl(transation, mappers, true);
3434
mappers.forEachMapper((value, key) => {
3535
if (!value.readOnly) {
36-
observablesWait.push(Observable.fromPromise(ddl.drop(value.newable).execute()));
37-
observablesWait.push(Observable.fromPromise(ddl.create(value.newable).execute()));
36+
observablesWait.push(from(ddl.drop(value.newable).execute()));
37+
observablesWait.push(from(ddl.create(value.newable).execute()));
3838
}
3939
});
4040

41-
return Observable.forkJoin(observablesWait);
41+
return forkJoin(observablesWait);
4242
}
4343

4444
protected migrationExecute(transation: DatabaseTransaction, version: Version): Promise<boolean> {

src/providers/database-resettable-contract.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DatabaseTransaction } from "database-builder";
2-
import { Observable } from "rxjs/Observable";
2+
import { Observable } from "rxjs";
33

44
export interface DatabaseResettableContract{
55
reset(transation: DatabaseTransaction): Observable<any>;

src/utils/database-migration-base.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { Observer } from "rxjs/Observer";
2-
import { Observable } from "rxjs/Observable";
31
import * as momentNs from "moment";
42
const moment = momentNs;
53
import { DatabaseObject, DatabaseTransaction } from "database-builder";
4+
import { Observable, Observer } from "rxjs";
65

76
export abstract class DatabaseMigrationBase {
87

0 commit comments

Comments
 (0)