Skip to content

Commit 79acb63

Browse files
fernandocodefernandocode
committed
0.1.0-beta.2
1 parent fef802d commit 79acb63

24 files changed

+146
-146
lines changed

‎package.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ionic-database-builder",
3-
"version": "0.0.11",
3+
"version": "0.1.0-beta.2",
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,17 +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.0.24"
47+
"@angular/core": "^5.0.0",
48+
"database-builder": ">=0.1.0-beta.1"
4949
},
5050
"devDependencies": {
5151
"@angular/cli": "^1.7.4",
52-
"@angular/common": "5.0.0",
53-
"@angular/compiler": "5.0.0",
54-
"@angular/compiler-cli": "5.0.0",
55-
"@angular/language-service": "5.0.0",
56-
"@angular/platform-browser": "5.0.0",
57-
"@angular/platform-browser-dynamic": "5.0.0",
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",
5859
"@types/jasmine": "~2.8.3",
5960
"@types/jasminewd2": "~2.0.2",
6061
"@types/node": "~6.0.60",

‎src/database.module.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { DatabaseMigration } from "./providers/database-migration";
22
import { DATABASE_CREATOR, IS_AVAILABLE_DATABASE } from "./dependency-injection-definition";
3-
import { Observable } from "rxjs";
43
import { ModuleWithProviders, NgModule, Provider, Type } from "@angular/core";
54
import { DatabaseHelperService } from "./providers/database-helper-service";
65
import { DatabaseMigrationContract } from "./providers/database-migration-contract";

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import { GetMapper } from 'database-builder';
12
import { Injector } from "@angular/core";
2-
import { DatabaseSettingsFactoryContract, MappersTableBase } from "..";
3+
import { DatabaseSettingsFactoryContract } from "..";
34
import { DatabaseSettingsModel } from "../model/database-settings-model";
45

56
export class DatabaseSettingsFactoryDefault extends DatabaseSettingsFactoryContract {
@@ -9,7 +10,7 @@ export class DatabaseSettingsFactoryDefault extends DatabaseSettingsFactoryContr
910
constructor(
1011
versionOrModel: number | DatabaseSettingsModel,
1112
databaseName: string,
12-
mapper: MappersTableBase
13+
mapper: GetMapper
1314
) {
1415
super();
1516
if (Number.isInteger(versionOrModel as number)) {
@@ -31,7 +32,7 @@ export class DatabaseSettingsFactoryDefault extends DatabaseSettingsFactoryContr
3132
return this._model.version;
3233
}
3334

34-
public mapper(): MappersTableBase {
35+
public mapper(): GetMapper {
3536
return this._model.mapper;
3637
}
3738
}

‎src/defaults/mappers-table-simple.ts‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
1-
import { DatabaseHelper, MetadataTable } from "database-builder";
2-
import { MappersTableBase } from "..";
3-
import { MapperSettingsModel } from "../model/mapper-settings-model";
4-
5-
export class MappersTableSimple extends MappersTableBase {
6-
7-
private _mappers: Map<string, MetadataTable<any>> = new Map<string, MetadataTable<any>>();
8-
9-
constructor(
10-
private _databaseHelper: DatabaseHelper,
11-
protected _defaultSettings: MapperSettingsModel
12-
) {
13-
super();
14-
}
15-
16-
public mapper(
17-
readOnly?: boolean,
18-
keyColumn?: string,
19-
settings: MapperSettingsModel = this._defaultSettings,
20-
...defaultsMapper: Array<new () => any>
21-
): MappersTableSimple {
22-
defaultsMapper.forEach(mapper => {
23-
this.add(mapper, readOnly, keyColumn, settings);
24-
});
25-
return this;
26-
}
27-
28-
public add<T>(
29-
newable: new () => T,
30-
readOnly?: boolean,
31-
keyColumn?: string,
32-
settings: MapperSettingsModel = this._defaultSettings,
33-
advancedMapper: (metadata: MetadataTable<T>) => void = void 0
34-
): MappersTableSimple {
35-
const metadata = new MetadataTable(newable, this._databaseHelper, readOnly, keyColumn)
36-
.autoMapper(
37-
settings.references,
38-
settings.referencesId,
39-
settings.referencesIdRecursive,
40-
settings.referencesIdColumn
41-
);
42-
if (advancedMapper) {
43-
advancedMapper(metadata);
44-
}
45-
this.push(metadata);
46-
return this;
47-
}
48-
49-
public getMapper<T>(tKey: new () => T): MetadataTable<T> {
50-
return this._mappers.get(tKey.name);
51-
}
52-
53-
public forEachMapper(
54-
callbackfn: (value: MetadataTable<any>, key: string, map: Map<string, MetadataTable<any>>) => void,
55-
thisArg?: any
56-
): void {
57-
this._mappers.forEach(callbackfn);
58-
}
59-
60-
private push(metadataTable: MetadataTable<any>): void {
61-
this._mappers.set(metadataTable.instance.constructor.name, metadataTable);
62-
}
63-
}
1+
// import { DatabaseHelper, MetadataTable } from "database-builder";
2+
// import { MappersTableBase } from "..";
3+
// import { MapperSettingsModel } from "../model/mapper-settings-model";
4+
5+
// export class MappersTableSimple extends MappersTableBase {
6+
7+
// private _mappers: Map<string, MetadataTable<any>> = new Map<string, MetadataTable<any>>();
8+
9+
// constructor(
10+
// private _databaseHelper: DatabaseHelper,
11+
// protected _defaultSettings: MapperSettingsModel
12+
// ) {
13+
// super();
14+
// }
15+
16+
// public mapper(
17+
// readOnly?: boolean,
18+
// keyColumn?: string,
19+
// settings: MapperSettingsModel = this._defaultSettings,
20+
// ...defaultsMapper: Array<new () => any>
21+
// ): MappersTableSimple {
22+
// defaultsMapper.forEach(mapper => {
23+
// this.add(mapper, readOnly, keyColumn, settings);
24+
// });
25+
// return this;
26+
// }
27+
28+
// public add<T>(
29+
// newable: new () => T,
30+
// readOnly?: boolean,
31+
// keyColumn?: string,
32+
// settings: MapperSettingsModel = this._defaultSettings,
33+
// advancedMapper: (metadata: MetadataTable<T>) => void = void 0
34+
// ): MappersTableSimple {
35+
// const metadata = new MetadataTable(newable, this._databaseHelper, readOnly, keyColumn)
36+
// .autoMapper(
37+
// settings.references,
38+
// settings.referencesId,
39+
// settings.referencesIdRecursive,
40+
// settings.referencesIdColumn
41+
// );
42+
// if (advancedMapper) {
43+
// advancedMapper(metadata);
44+
// }
45+
// this.push(metadata);
46+
// return this;
47+
// }
48+
49+
// public getMapper<T>(tKey: new () => T): MetadataTable<T> {
50+
// return this._mappers.get(tKey.name);
51+
// }
52+
53+
// public forEachMapper(
54+
// callbackfn: (value: MetadataTable<any>, key: string, map: Map<string, MetadataTable<any>>) => void,
55+
// thisArg?: any
56+
// ): void {
57+
// this._mappers.forEach(callbackfn);
58+
// }
59+
60+
// private push(metadataTable: MetadataTable<any>): void {
61+
// this._mappers.set(metadataTable.instance.constructor.name, metadataTable);
62+
// }
63+
// }

‎src/index.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11

22
export * from "./database.module";
33
export * from "./providers/database";
4-
export * from "./utils/mappers-table-base";
54
export * from "./utils/database-settings-factory-contract";
65
export * from "./defaults/database-settings-factory-default";
76
export * from "./providers/database-migration-contract";
87
export * from "./providers/database-migration";
98
export * from "./providers/database-helper-service";
10-
export * from "./defaults/mappers-table-simple";
119
export * from "./model/version-model";
1210
export * from "./model/database-creator-contract";
1311
export * from "./model/database-config";

‎src/model/database-settings-model.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { MappersTableBase } from "..";
1+
import { GetMapper } from 'database-builder';
22

33
export interface DatabaseSettingsModel {
44
version: number;
55
databaseName: string;
6-
mapper: MappersTableBase;
6+
mapper: GetMapper;
77
}

‎src/providers/database-migration-contract.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { MappersTableBase } from "..";
21
import { Injectable } from "@angular/core";
32
import { Version } from "./../model/version-model";
43
import { Observable } from "rxjs/Observable";
5-
import { DatabaseTransaction } from "database-builder";
4+
import { DatabaseTransaction, GetMapper } from "database-builder";
65
import { DatabaseResettableContract } from "./database-resettable-contract";
76

87
@Injectable()
@@ -11,7 +10,7 @@ export abstract class DatabaseMigrationContract {
1110
public abstract to(
1211
version: Version,
1312
transation: DatabaseTransaction,
14-
mappers: MappersTableBase,
13+
mappers: GetMapper,
1514
resettable: DatabaseResettableContract
1615
): Array<Observable<any>>;
1716
}

‎src/providers/database-migration.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { DatabaseSettingsFactoryContract } from "..";
22
import { Version } from "./../model/version-model";
3-
import { Observer } from "rxjs/Observer";
4-
import { Observable } from "rxjs/Observable";
3+
import { Observable, Observer } from "rxjs";
54
import { Injectable, Injector, Optional } from "@angular/core";
65
import { DatabaseTransaction, Ddl } from "database-builder";
76
import { DatabaseMigrationContract } from "./database-migration-contract";

‎src/test/factory/database-settings-factory.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import { GetMapper } from 'database-builder';
12
import { TableMapper } from './../mapper/table-mapper';
23

34
import { Injector } from '@angular/core';
4-
import { DatabaseSettingsFactoryContract, MappersTableBase } from '../..';
5+
import { DatabaseSettingsFactoryContract } from '../..';
56

67
export class DatabaseSettingsFactory extends DatabaseSettingsFactoryContract {
78

@@ -13,7 +14,7 @@ export class DatabaseSettingsFactory extends DatabaseSettingsFactoryContract {
1314
return 2.0;
1415
}
1516

16-
mapper(injector: Injector): MappersTableBase {
17+
mapper(injector: Injector): GetMapper {
1718
return injector.get(TableMapper);
1819
}
1920

‎src/test/mapper.spec.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ describe('Mapper', () => {
2626
},
2727
{
2828
useFactory: (mapper: TableMapper) => {
29-
console.log(mapper.getMapper(TestClazz));
30-
return mapper.getMapper(TestClazz) ? true : false;
29+
console.log(mapper.get(TestClazz));
30+
return mapper.get(TestClazz) ? true : false;
3131
},
3232
deps: [TableMapper]
3333
// useValue: true
@@ -74,27 +74,27 @@ describe('Mapper', () => {
7474
}));
7575

7676
const clienteToSave = {
77-
id: 1,
77+
codeImport: 1,
7878
razaoSocial: 'Razão',
7979
apelido: 'Apelido',
8080
cidade: {
81-
id: 2,
81+
codeImport: 2,
8282
nome: 'Cidade',
8383
uf: {
84-
id: 'SC',
84+
codeImport: 'SC',
8585
nome: 'Santa Catarina'
8686
} as Uf,
8787
subRegiao: {
88-
id: 4,
88+
codeImport: 4,
8989
nome: 'Sub Região',
9090
regiao: {
91-
id: 5,
91+
codeImport: 5,
9292
nome: 'Região'
9393
} as Regiao
9494
} as SubRegiao,
9595
} as Cidade,
9696
classificacao: {
97-
id: 3,
97+
codeImport: 3,
9898
descricao: 'Top'
9999
} as Classificacao,
100100
desativo: false
@@ -105,10 +105,10 @@ describe('Mapper', () => {
105105
database.crud().then(crud => {
106106
const result = crud.insert(Cliente, clienteToSave).compile();
107107
expect(result.params.toString()).toEqual([
108-
clienteToSave.id, clienteToSave.razaoSocial, clienteToSave.apelido,
109-
clienteToSave.desativo, clienteToSave.cidade.id, clienteToSave.classificacao.id
108+
clienteToSave.codeImport, clienteToSave.razaoSocial, clienteToSave.apelido,
109+
clienteToSave.desativo, clienteToSave.cidade.codeImport, clienteToSave.classificacao.codeImport
110110
].toString());
111-
expect(result.query).toEqual('INSERT INTO Cliente (id, razaoSocial, apelido, desativo, cidade_id, classificacao_id) VALUES (?, ?, ?, ?, ?, ?)');
111+
expect(result.query).toEqual('INSERT INTO Cliente (codeImport, razaoSocial, apelido, desativo, cidade_codeImport, classificacao_codeImport) VALUES (?, ?, ?, ?, ?, ?)');
112112
});
113113
}));
114114

@@ -121,10 +121,10 @@ describe('Mapper', () => {
121121
try {
122122
const result = crud.insert(Cliente, clienteToSave).compile();
123123
expect(result.params.toString()).toEqual([
124-
clienteToSave.id, clienteToSave.razaoSocial, clienteToSave.apelido,
125-
clienteToSave.desativo, clienteToSave.cidade.id, clienteToSave.classificacao.id
124+
clienteToSave.codeImport, clienteToSave.razaoSocial, clienteToSave.apelido,
125+
clienteToSave.desativo, clienteToSave.cidade.codeImport, clienteToSave.classificacao.codeImport
126126
].toString());
127-
expect(result.query).toEqual('INSERT INTO Cliente (id, razaoSocial, apelido, desativo, cidade_id, classificacao_id) VALUES (?, ?, ?, ?, ?, ?)');
127+
expect(result.query).toEqual('INSERT INTO Cliente (codeImport, razaoSocial, apelido, desativo, cidade_codeImport, classificacao_codeImport) VALUES (?, ?, ?, ?, ?, ?)');
128128
database.commitTransaction().then(x => {
129129
expect(x).toEqual(true);
130130
}).catch(rollback);

0 commit comments

Comments
 (0)