Skip to content

Commit 95b2de9

Browse files
author
fernandocode
committed
v.0.3.2
1 parent 5aa41ce commit 95b2de9

16 files changed

+172
-155
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@angular/platform-browser-dynamic": "~7.2.0",
2323
"@angular/router": "~7.2.0",
2424
"core-js": "^2.5.4",
25-
"database-builder": "^0.3.0-beta.2",
25+
"database-builder": "^0.3.9",
2626
"rxjs": "~6.3.3",
2727
"tslib": "^1.9.0",
2828
"zone.js": "~0.8.26"

‎projects/ionic-database-builder/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ionic-database-builder",
3-
"version": "0.3.0-beta.2",
3+
"version": "0.3.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
"repository": {
66
"type": "git",

‎projects/ionic-database-builder/src/lib/services/database-abstract-sqlite.service.ts‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
1-
import { DatabaseCreatorContract, DatabaseConfig, DatabaseObject, DatabaseResult, DatabaseBaseTransaction } from 'database-builder';
1+
// import { DatabaseCreatorContract, DatabaseConfig, DatabaseObject, DatabaseResult, DatabaseBaseTransaction } from 'database-builder';
22

3-
export abstract class DatabaseAbstractSQLiteService implements DatabaseCreatorContract {
3+
// export abstract class DatabaseAbstractSQLiteService implements DatabaseCreatorContract {
44

5-
protected abstract sqliteCreate(config: DatabaseConfig): Promise<DatabaseSQLiteObject>;
5+
// protected abstract sqliteCreate(config: DatabaseConfig): Promise<DatabaseSQLiteObject>;
66

7-
create(config: DatabaseConfig): Promise<DatabaseObject> {
8-
return new Promise<DatabaseObject>((resolve, reject) => {
9-
return this.sqliteCreate(config)
10-
.then(database => {
11-
resolve(<DatabaseObject>{
12-
executeSql: (statement: string, params: any): Promise<DatabaseResult> => {
13-
return database.executeSql(statement, params);
14-
},
15-
transaction: (fn: (transaction: DatabaseBaseTransaction) => void): Promise<any> => {
16-
return database.transaction(transiction => {
17-
fn({
18-
executeSql: (sql: string, values: any): Promise<DatabaseResult> => {
19-
return new Promise<DatabaseResult>((resolve, reject) => {
20-
transiction.executeSql(sql, Array.isArray(values) ? values : [],
21-
(s, r) => {
22-
resolve(r)
23-
},
24-
(e, err) => {
25-
reject(err)
26-
});
27-
});
28-
}
29-
});
30-
});
31-
}
32-
});
33-
})
34-
.catch(err => reject(err));
35-
});
36-
}
37-
}
7+
// create(config: DatabaseConfig): Promise<DatabaseObject> {
8+
// return new Promise<DatabaseObject>((resolve, reject) => {
9+
// return this.sqliteCreate(config)
10+
// .then(database => {
11+
// resolve({
12+
// executeSql: (statement: string, params: any): Promise<DatabaseResult> => {
13+
// return database.executeSql(statement, params);
14+
// },
15+
// transaction: (fn: (transaction: DatabaseBaseTransaction) => void): Promise<any> => {
16+
// return database.transaction(transiction => {
17+
// fn({
18+
// executeSql: (sql: string, values: any): Promise<DatabaseResult> => {
19+
// return new Promise<DatabaseResult>((executeSqlResolve, executeSqlReject) => {
20+
// transiction.executeSql(sql, Array.isArray(values) ? values : [],
21+
// (_: any, r: DatabaseResult | PromiseLike<DatabaseResult>) => {
22+
// executeSqlResolve(r);
23+
// },
24+
// (_: any, err: any) => {
25+
// executeSqlReject(err);
26+
// });
27+
// });
28+
// }
29+
// });
30+
// });
31+
// }
32+
// } as DatabaseObject);
33+
// })
34+
// .catch(err => reject(err));
35+
// });
36+
// }
37+
// }
3838

39-
/**
40-
* @hidden
41-
*/
42-
export interface DatabaseSQLiteObject {
43-
transaction(fn: (transaction: DatabaseSQLiteTransaction) => void): Promise<any>;
44-
executeSql(statement: string, params: any): Promise<DatabaseResult>;
45-
}
39+
// /**
40+
// * @hidden
41+
// */
42+
// export interface DatabaseSQLiteObject {
43+
// transaction(fn: (transaction: DatabaseSQLiteTransaction) => void): Promise<any>;
44+
// executeSql(statement: string, params: any): Promise<DatabaseResult>;
45+
// }
4646

47-
/**
48-
* @hidden
49-
*/
50-
export interface DatabaseSQLiteTransaction {
51-
executeSql: (sql: any, values?: any[], success?: Function, error?: Function) => void;
52-
}
47+
// /**
48+
// * @hidden
49+
// */
50+
// export interface DatabaseSQLiteTransaction {
51+
// executeSql: (sql: any, values?: any[], success?: Function, error?: Function) => void;
52+
// }

‎projects/ionic-database-builder/src/lib/services/database-browser.service.ts‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎projects/ionic-database-builder/src/lib/services/database-helper.service.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Injectable } from "@angular/core";
2-
import { DatabaseHelper } from "database-builder";
1+
import { Injectable } from '@angular/core';
2+
import { DatabaseHelper } from 'database-builder';
33

44
@Injectable()
55
export class DatabaseHelperService extends DatabaseHelper {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { GetMapper, DatabaseObject } from "database-builder";
2-
import { DatabaseResettableContract } from "./database-resettable-contract";
3-
import { Observable } from "rxjs";
4-
import { Version } from "../model/version-model";
1+
import { GetMapper, DatabaseObject } from 'database-builder';
2+
import { DatabaseResettableContract } from './database-resettable-contract';
3+
import { Observable } from 'rxjs';
4+
import { Version } from '../model/version-model';
55

66
export abstract class DatabaseMigrationContract {
77

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { Version } from "./../model/version-model";
2-
import { Injectable, Injector, Optional, Inject } from "@angular/core";
3-
import { Ddl, DatabaseObject, forkJoinSafe } from "database-builder";
4-
import { DatabaseMigrationContract } from "./database-migration-contract";
5-
import { DatabaseMigrationBase } from "../utils/database-migration-base";
6-
import { DatabaseResettableContract } from "./database-resettable-contract";
7-
import { DatabaseSettingsFactoryContract } from "../utils/database-settings-factory-contract";
1+
import { Version } from './../model/version-model';
2+
import { Injectable, Injector, Optional, Inject } from '@angular/core';
3+
import { Ddl, DatabaseObject, forkJoinSafe } from 'database-builder';
4+
import { DatabaseMigrationContract } from './database-migration-contract';
5+
import { DatabaseMigrationBase } from '../utils/database-migration-base';
6+
import { DatabaseResettableContract } from './database-resettable-contract';
7+
import { DatabaseSettingsFactoryContract } from '../utils/database-settings-factory-contract';
88
import { Observable, Observer } from 'rxjs';
99
import { DATABASE_MIGRATION } from '../utils/dependency-injection-definition';
1010

@@ -24,7 +24,7 @@ export class DatabaseMigration extends DatabaseMigrationBase implements Database
2424
public reset(database: DatabaseObject): Observable<any> {
2525

2626
// tslint:disable-next-line:no-console
27-
console.info("database reset");
27+
console.info('database reset');
2828

2929
const observablesWait: Array<Observable<any>> = [];
3030

‎projects/ionic-database-builder/src/lib/services/database-mock.service.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ import { DatabaseCreatorContract, DatabaseConfig, DatabaseObject, DatabaseResult
55
export class DatabaseMockService implements DatabaseCreatorContract {
66

77
create(config: DatabaseConfig): Promise<DatabaseObject> {
8-
console.log("Database Fake! \\o/");
8+
console.log('Database Fake! \\o/');
99
return new Promise<DatabaseObject>((resolve, reject) => {
10-
resolve(<DatabaseObject>{
10+
resolve({
1111
executeSql: (statement: string, params: any): Promise<DatabaseResult> => {
1212
this.executeFake(statement, params);
13-
return new Promise<DatabaseResult>((resolve, reject) => {
14-
resolve(this.resultFake());
13+
return new Promise<DatabaseResult>((executeSqlResolve, executeSqlReject) => {
14+
executeSqlResolve(this.resultFake());
1515
});
1616
},
1717
transaction: (fn: (transaction: DatabaseBaseTransaction) => void): Promise<any> => {
18-
return new Promise<any>((resolve, reject) => {
19-
fn(<DatabaseBaseTransaction>{
18+
return new Promise<any>((executeSqlResolve, executeSqlReject) => {
19+
fn({
2020
executeSql: (
2121
sql: string,
2222
values: any,
@@ -26,11 +26,11 @@ export class DatabaseMockService implements DatabaseCreatorContract {
2626
this.executeFake(sql, values);
2727
success(void 0, this.resultFake());
2828
},
29-
})
30-
resolve(void 0);
29+
} as DatabaseBaseTransaction);
30+
executeSqlResolve(void 0);
3131
});
3232
}
33-
});
33+
} as DatabaseObject);
3434
});
3535
}
3636

@@ -39,16 +39,16 @@ export class DatabaseMockService implements DatabaseCreatorContract {
3939
}
4040

4141
private resultFake(): DatabaseResult {
42-
return <DatabaseResult>{
42+
return {
4343
rows: {
4444
length: 20,
4545
item: (index: number) => {
4646
return {
47-
index: index
48-
}
47+
index
48+
};
4949
}
5050
}
51-
}
51+
} as DatabaseResult;
5252
}
5353

54-
}
54+
}

‎projects/ionic-database-builder/src/lib/services/websql-database.service.ts‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
import { Injectable } from '@angular/core';
2+
import { WebSqlDatabaseAdapter } from 'database-builder';
3+
4+
// /**
5+
// * @deprecated use WebSqlDatabaseService
6+
// */
7+
// @Injectable()
8+
// export class DatabaseBrowserService extends WebSqlDatabaseAdapter {
9+
// constructor() {
10+
// super((window as any));
11+
// }
12+
// }
13+
14+
@Injectable()
15+
export class WebSqlDatabaseService extends WebSqlDatabaseAdapter {
16+
constructor() {
17+
super((window as any));
18+
}
19+
}
20+
21+
// export class DatabaseBrowserService implements DatabaseCreatorContract {
22+
23+
// create(config: DatabaseConfig): Promise<DatabaseObject> {
24+
// console.warn("Use WebSQL only for testing, some browsers no longer support WebSQL! \\o/");
25+
// return new Promise<DatabaseObject>((resolve, reject) => {
26+
// // o método OpenDatabase precisa de 4 parametros; o nome do banco de dados, a versão, a descrição e o tamanho estimado (em bytes)
27+
// const db = (window as any).openDatabase(config.name, "1.0", config.name, 200000);
28+
29+
// // de qualquer forma, sempre teste que o objeto foi instanciado direito antes de usá-lo
30+
// if (!db) {
31+
// reject("Não foi possivel iniciar o banco de dados no Browser!");
32+
// }
33+
// resolve(<DatabaseObject>{
34+
// executeSql: (statement: string, params: any): Promise<DatabaseResult> => {
35+
// return new Promise<DatabaseResult>((resolve, reject) => {
36+
// if (
37+
// statement.toUpperCase().indexOf("TRANSACTION") > -1
38+
// ||
39+
// statement.toUpperCase().indexOf("COMMIT") > -1
40+
// ) {
41+
// console.warn(`command sql ignored: '${statement}'`);
42+
// resolve({} as DatabaseResult);
43+
// return;
44+
// }
45+
// db.transaction((transaction: any) => {
46+
// transaction.executeSql(statement, Array.isArray(params) ? params : [],
47+
// (s: any, r: any) => resolve(r),
48+
// (e: any, err: any) => {
49+
// reject(err)
50+
// });
51+
// });
52+
// });
53+
// },
54+
// transaction:
55+
// (fn: (transaction: DatabaseBaseTransaction) => void): Promise<any> => {
56+
// return db.transaction((transiction: any) => {
57+
// fn({
58+
// executeSql: (sql: string, values: any): Promise<DatabaseResult> => {
59+
// return new Promise<DatabaseResult>((resolve, reject) => {
60+
// transiction.executeSql(sql, Array.isArray(values) ? values : [],
61+
// (s: any, r: any) => {
62+
// resolve(r)
63+
// },
64+
// (e: any, err: any) => {
65+
// reject(err)
66+
// });
67+
// });
68+
// }
69+
// });
70+
// });
71+
// }
72+
// });
73+
// });
74+
// }
75+
// }

0 commit comments

Comments
 (0)