Skip to content

Commit 9d268b8

Browse files
author
Fernando Leal
committed
versão 0.6.0-alpha.1
1 parent 585b42c commit 9d268b8

21 files changed

+30184
-8250
lines changed

package-lock.json

Lines changed: 29959 additions & 8046 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,43 +14,43 @@
1414
},
1515
"private": true,
1616
"dependencies": {
17-
"@angular/animations": "~7.2.0",
18-
"@angular/common": "~7.2.0",
19-
"@angular/compiler": "~7.2.0",
20-
"@angular/core": "~7.2.0",
21-
"@angular/forms": "~7.2.0",
22-
"@angular/platform-browser": "~7.2.0",
23-
"@angular/platform-browser-dynamic": "~7.2.0",
24-
"@angular/router": "~7.2.0",
25-
"core-js": "^2.5.4",
26-
"database-builder": "0.5.0",
27-
"moment": "^2.22.0",
17+
"@angular/animations": "~10.0.0",
18+
"@angular/common": "~10.0.0",
19+
"@angular/compiler": "~10.0.0",
20+
"@angular/core": "~10.0.0",
21+
"@angular/forms": "~10.0.0",
22+
"@angular/platform-browser": "~10.0.0",
23+
"@angular/platform-browser-dynamic": "~10.0.0",
24+
"@angular/router": "~10.0.0",
25+
"core-js": "^3.21.1",
26+
"database-builder": "~0.6.0-alpha.4",
27+
"moment": "^2.29.2",
2828
"rxjs": "^6.5.3",
29-
"tslib": "^1.10.0",
30-
"zone.js": "~0.8.26"
29+
"tslib": "^2.3.1",
30+
"zone.js": "~0.10.3"
3131
},
3232
"devDependencies": {
33-
"@angular-devkit/build-angular": "~0.13.0",
34-
"@angular-devkit/build-ng-packagr": "~0.13.0",
35-
"@angular/cli": "~7.3.5",
36-
"@angular/compiler-cli": "~7.2.0",
37-
"@angular/language-service": "~7.2.0",
38-
"@types/jasmine": "~2.8.8",
39-
"@types/jasminewd2": "~2.0.3",
40-
"@types/node": "~8.9.4",
41-
"codelyzer": "~4.5.0",
42-
"jasmine-core": "~2.99.1",
43-
"jasmine-spec-reporter": "~4.2.1",
44-
"karma": "~4.0.0",
45-
"karma-chrome-launcher": "~2.2.0",
46-
"karma-coverage-istanbul-reporter": "~2.0.1",
47-
"karma-jasmine": "~1.1.2",
48-
"karma-jasmine-html-reporter": "^0.2.2",
49-
"ng-packagr": "^4.2.0",
50-
"protractor": "~5.4.0",
51-
"ts-node": "~7.0.0",
33+
"@angular-devkit/build-angular": "~0.1000.0",
34+
"@angular-devkit/build-ng-packagr": "~0.1002.0",
35+
"@angular/cli": "~10.0.0",
36+
"@angular/compiler-cli": "~10.0.0",
37+
"@angular/language-service": "~10.0.0",
38+
"@types/jasmine": "~4.0.2",
39+
"@types/jasminewd2": "~2.0.10",
40+
"@types/node": "~17.0.23",
41+
"codelyzer": "~6.0.2",
42+
"jasmine-core": "~4.0.1",
43+
"jasmine-spec-reporter": "~7.0.0",
44+
"karma": "~6.3.17",
45+
"karma-chrome-launcher": "~3.1.1",
46+
"karma-coverage-istanbul-reporter": "~3.0.3",
47+
"karma-jasmine": "~4.0.2",
48+
"karma-jasmine-html-reporter": "^1.7.0",
49+
"ng-packagr": "^10.0.0",
50+
"protractor": "~7.0.0",
51+
"ts-node": "~10.7.0",
5252
"tsickle": ">=0.34.0",
53-
"tslint": "~5.11.0",
54-
"typescript": "~3.2.2"
53+
"tslint": "~6.1.3",
54+
"typescript": "^3.9.0"
5555
}
5656
}

projects/ionic-database-builder/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ionic-database-builder",
3-
"version": "0.4.0",
3+
"version": "0.6.0-alpha.1",
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
"repository": {
66
"type": "git",
@@ -34,8 +34,8 @@
3434
"homepage": "https://github.com/fernandocode/ionic-database-builder#readme",
3535
"dependencies": {},
3636
"peerDependencies": {
37-
"@angular/common": "^7.2.0",
38-
"@angular/core": "^7.2.0",
39-
"database-builder": "0.5.0"
37+
"@angular/common": "^10.0.0",
38+
"@angular/core": "^10.0.0",
39+
"database-builder": ">=0.6.0-alpha.4"
4040
}
4141
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { GetMapper } from 'database-builder';
2-
import { Injector, Injectable } from '@angular/core';
2+
import { Injector } from '@angular/core';
33
import { DatabaseSettingsModel } from '../model/database-settings-model';
44
import { DatabaseSettingsFactoryContract } from '../utils';
5+
import { ConfigDatabase } from 'database-builder/src/crud/config-database';
56

67
export class DatabaseSettingsFactoryDefault extends DatabaseSettingsFactoryContract {
78

@@ -35,4 +36,10 @@ export class DatabaseSettingsFactoryDefault extends DatabaseSettingsFactoryContr
3536
public mapper(): GetMapper {
3637
return this._model.mapper;
3738
}
39+
40+
public config(injector: Injector): ConfigDatabase {
41+
return {
42+
sqliteLimitVariables: 999
43+
}
44+
}
3845
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DatabaseCreatorContract } from 'database-builder';
2-
import { Type, ModuleWithProviders, NgModule, SkipSelf, Optional } from '@angular/core';
2+
import { Type, NgModule, SkipSelf, Optional } from '@angular/core';
33
import { DatabaseMigrationContract } from './services/database-migration-contract';
44
import { DatabaseSettingsFactoryContract } from './utils/database-settings-factory-contract';
55
import {
@@ -37,11 +37,12 @@ export class IonicDatabaseBuilderModule {
3737
}
3838
}
3939

40+
/** @deprecated use forRoot */
4041
public static forSimple(
4142
isEnableLogProvider: boolean = false,
4243
isAvailableProvider: boolean = true,
4344
platformLoad: Type<PlatformLoad> = PlatformLoadDefault
44-
): ModuleWithProviders {
45+
) {
4546
return {
4647
ngModule: IonicDatabaseBuilderModule,
4748
providers: [
@@ -59,7 +60,7 @@ export class IonicDatabaseBuilderModule {
5960
platformLoad: Type<PlatformLoad> = PlatformLoadDefault,
6061
isEnableLogProvider: boolean = false,
6162
isAvailableProvider: boolean = true,
62-
): ModuleWithProviders {
63+
) {
6364
return {
6465
ngModule: IonicDatabaseBuilderModule,
6566
providers: [

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,29 @@ import { PlatformLoad } from '../utils/platform-load';
1111
@Injectable()
1212
export class Database extends BuildableDatabaseManager {
1313

14-
private _settings: DatabaseSettingsFactoryContract;
14+
// private _settings: DatabaseSettingsFactoryContract;
1515

1616
constructor(
1717
@Inject(IS_AVAILABLE_DATABASE) private _isAvailable: boolean,
1818
@Inject(IS_ENABLE_LOG) isEnableLog: boolean,
19-
private _injector: Injector,
19+
databaseSettings: DatabaseSettingsFactoryContract,
20+
injector: Injector,
2021
databaseFactory: DatabaseFactoryContract,
2122
private _databaseMigration: DatabaseMigration,
2223
@Inject(PLATFORM_LOAD) platformLoad: PlatformLoad
2324
) {
2425
super(
2526
databaseFactory,
27+
databaseSettings,
28+
injector,
29+
databaseSettings.mapper(injector),
2630
// tslint:disable-next-line: deprecation
27-
_injector.get(DatabaseSettingsFactoryContract).mapper(_injector),
31+
// _injector.get(DatabaseSettingsFactoryContract).mapper(_injector),
2832
platformLoad,
2933
isEnableLog
3034
);
3135
// tslint:disable-next-line: deprecation
32-
this._settings = _injector.get(DatabaseSettingsFactoryContract);
36+
// this._settings = _injector.get(DatabaseSettingsFactoryContract);
3337
}
3438

3539
protected migrationVersion(database: DatabaseObject, version: number): Observable<boolean> {
@@ -43,11 +47,11 @@ export class Database extends BuildableDatabaseManager {
4347
}
4448

4549
protected databaseName(): string {
46-
return this._settings.databaseName(this._injector);
50+
return this._databaseSettings.databaseName(this._injector);
4751
}
4852

4953
public version(): number {
50-
return this._settings.version(this._injector);
54+
return this._databaseSettings.version(this._injector);
5155
}
5256

5357
public databaseNameFile(databaseName: string = this.databaseName()): string {

0 commit comments

Comments
 (0)