Skip to content

Commit 61b29fa

Browse files
fernandocodefernandocode
committed
removed dependences to ionic-angular and @ionic/sqlite.
Removed comments extras.
1 parent 5711bfa commit 61b29fa

11 files changed

+34
-92
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,5 @@ UserInterfaceState.xcuserstate
3434

3535
dist.tgz
3636
dist/
37+
38+
!protractor.conf.js

‎package.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"scripts": {
77
"ng": "ng",
88
"start": "ng serve",
9-
"build": "ng build",
9+
"build": "ng build --prod",
1010
"test": "ng test",
1111
"lint": "ng lint",
1212
"e2e": "ng e2e",
@@ -44,10 +44,7 @@
4444
"homepage": "https://github.com/fernandocode/ionic-database-builder#readme",
4545
"dependencies": {
4646
"@angular/core": "5.0.0",
47-
"@ionic-native/core": "4.7.0",
48-
"@ionic-native/sqlite": "4.7.0",
4947
"database-builder": "0.0.22",
50-
"ionic-angular": "3.9.2",
5148
"zone.js": "0.8.26"
5249
},
5350
"devDependencies": {

‎protractor.conf.js‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Protractor configuration file, see link for more information
2+
// https://github.com/angular/protractor/blob/master/lib/config.ts
3+
4+
const { SpecReporter } = require('jasmine-spec-reporter');
5+
6+
exports.config = {
7+
allScriptsTimeout: 11000,
8+
specs: [
9+
'./e2e/**/*.e2e-spec.ts'
10+
],
11+
capabilities: {
12+
'browserName': 'chrome'
13+
},
14+
directConnect: true,
15+
baseUrl: 'http://localhost:4200/',
16+
framework: 'jasmine',
17+
jasmineNodeOpts: {
18+
showColors: true,
19+
defaultTimeoutInterval: 30000,
20+
print: function() {}
21+
},
22+
onPrepare() {
23+
require('ts-node').register({
24+
project: 'e2e/tsconfig.e2e.json'
25+
});
26+
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
27+
}
28+
};

‎src/database.module.ts‎

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -29,49 +29,15 @@ export class DatabaseModule {
2929
settingsProvider: ProviderTyped<DatabaseSettingsFactoryContract>,
3030
isAvailableProvider: ProviderTyped<boolean>,
3131
databaseCreatorProvider: ProviderTyped<DatabaseCreatorContract>,
32-
databaseMigrationContract?: Type<DatabaseMigrationContract>,
33-
// providers: Provider[] = []
32+
databaseMigrationContract?: Type<DatabaseMigrationContract>
3433
): ModuleWithProviders {
35-
// providers = providers.concat([
3634
const providers: Provider[] = [
3735
this.createProvider(DatabaseSettingsFactoryContract, settingsProvider),
3836
this.createProvider(IS_AVAILABLE_DATABASE, isAvailableProvider),
39-
this.createProvider(DATABASE_CREATOR, databaseCreatorProvider),
40-
// {
41-
// provide: DatabaseSettingsFactoryContract,
42-
// useClass: settingsProvider
43-
// }
37+
this.createProvider(DATABASE_CREATOR, databaseCreatorProvider)
4438
];
45-
// );
4639
return this.forBase(providers);
4740
}
48-
// public static forRoot(
49-
// settings: Type<DatabaseSettingsFactoryContract>,
50-
// databaseMigrationContract?: Type<DatabaseMigrationContract>,
51-
// // providers: Provider[] = []
52-
// ): ModuleWithProviders {
53-
// // providers = providers.concat([
54-
// const providers: Provider[] = [
55-
// {
56-
// provide: DatabaseSettingsFactoryContract,
57-
// useClass: settings
58-
// }
59-
// ];
60-
// return this.forBase(providers);
61-
// }
62-
63-
// public static forRootValue(
64-
// settings: DatabaseSettingsFactoryContract,
65-
// databaseMigrationContract?: Type<DatabaseMigrationContract>
66-
// ): ModuleWithProviders {
67-
// const providers: Provider[] = [
68-
// {
69-
// provide: DatabaseSettingsFactoryContract,
70-
// useValue: settings
71-
// }
72-
// ];
73-
// return this.forBase(providers);
74-
// }
7541

7642
private static createProvider(provide: any, provider: ProviderTyped<any>): Provider {
7743
return Object.assign({

‎src/defaults/database-factory-default.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import { Inject } from "@angular/core";
2-
import { MappersTableBase } from "..";
3-
import { DatabaseSettingsModel } from "../model/database-settings-model";
42
import { DatabaseFactoryContract } from "../utils/database-factory-contract";
53
import { DATABASE_CREATOR, IS_AVAILABLE_DATABASE } from "../dependency-injection-definition";
64
import { DatabaseCreatorContract } from "../model/database-creator-contract";

‎src/providers/database-migration.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,9 @@ export class DatabaseMigration extends DatabaseMigrationBase {
1414

1515
constructor(
1616
private _injector: Injector,
17-
// private _settings: DatabaseSettingsFactoryContract,
18-
// app: App,
19-
// config: Config,
2017
@Optional() private _databaseMigrationContract: DatabaseMigrationContract
2118
) {
22-
super(
23-
// app, config
24-
);
19+
super();
2520
this._settings = _injector.get(DatabaseSettingsFactoryContract);
2621
}
2722

@@ -32,7 +27,6 @@ export class DatabaseMigration extends DatabaseMigrationBase {
3227

3328
const observablesWait: Array<Observable<any>> = [];
3429

35-
// const mappers = this._mappersTable;
3630
const mappers = this._settings.mapper(this._injector);
3731

3832
// remove dados offline da versão anterior, pois o formato dos dados foi alterado de uma versão para a outra

‎src/utils/buildable-database-manager.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { DatabaseResult } from "database-builder";
22
import { DatabaseManager } from "./database-manager";
3-
import { Platform } from "ionic-angular";
43
import { Crud, DatabaseObject, DatabaseTransaction, Ddl, ExecutableBuilder, Query, QueryCompiled } from "database-builder";
54
import { MappersTableBase } from "../utils/mappers-table-base";
65
import { DatabaseFactoryContract } from "./database-factory-contract";

‎src/utils/database-factory-contract.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { Injector } from "@angular/core";
2-
import { MappersTableBase } from "..";
31
import { DatabaseObject } from "database-builder";
42

53
export abstract class DatabaseFactoryContract {

‎src/utils/database-migration-base.ts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ const moment = momentNs;
66

77
export abstract class DatabaseMigrationBase {
88

9-
constructor(
10-
// protected _app: App, protected _config: Config
11-
) {
12-
13-
}
14-
159
public version(database: DatabaseObject, version: number): Promise<boolean> {
1610
return new Promise<boolean>((resolve, reject) => {
1711
this.checkTableVersion(database).then(_ => {
@@ -31,12 +25,6 @@ export abstract class DatabaseMigrationBase {
3125
console.error(error);
3226
observer.error(error);
3327
observer.complete();
34-
// const alert = new Alert(this._app, {
35-
// title: 'Erro ao salvar dados off-line!',
36-
// message: error,
37-
// buttons: ['OK']
38-
// }, this._config);
39-
// alert.present();
4028
}
4129

4230
protected abstract migrationExecute(

‎src/utils/database-settings-factory-contract.ts‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,4 @@ export abstract class DatabaseSettingsFactoryContract {
66
public abstract databaseName(injector: Injector): string;
77
public abstract version(injector: Injector): number;
88
public abstract mapper(injector: Injector): MappersTableBase;
9-
10-
// public factoryDatabase(injector: Injector): Promise<DatabaseObject> {
11-
// return new Promise<DatabaseObject>((resolve, reject) => {
12-
// const platform = injector.get(Platform);
13-
// if (platform.is('cordova')) {
14-
// const sqlite = injector.get(SQLite);
15-
// const db = sqlite.create({
16-
// name: name,
17-
// location: 'default'
18-
// });
19-
// db.then((database: DatabaseObject) => {
20-
// this.migrationVersion(database, version)
21-
// .then(_ => resolve(db))
22-
// .catch(er => reject(er));
23-
// }).catch(error => {
24-
// this.catchException(error);
25-
// reject(error);
26-
// });
27-
// } else {
28-
// resolve(void 0);
29-
// }
30-
// });
31-
// }
32-
339
}

0 commit comments

Comments
 (0)