Skip to content

Commit 0993873

Browse files
committed
Apostrophe hotfix
1 parent c0d21a4 commit 0993873

File tree

5 files changed

+1070
-8
lines changed

5 files changed

+1070
-8
lines changed

package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ionic-cache",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"description": "Ionic cache service - cache request, data, promises etc.",
55
"main": "ionic-cache.js",
66
"scripts": {
@@ -23,11 +23,12 @@
2323
},
2424
"homepage": "https://github.com/Nodonisko/ionic-cache#readme",
2525
"dependencies": {
26+
"@angular/common": "^2.4.2",
2627
"@angular/core": "^2.0.2",
2728
"@angular/http": "^2.0.2",
2829
"@angular/platform-browser": "^2.0.2",
29-
"rxjs": "^5.0.0-beta.12",
30-
"zone.js": "^0.6.21"
30+
"rxjs": "^5.0.0-beta.12",
31+
"zone.js": "^0.7.4"
3132
},
3233
"devDependencies": {
3334
"tslint": "^3.15.1",

src/cache.service.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ export class CacheService {
125125
const valuesMap = { key, value, expire, type, groupKey };
126126
const values = Object.keys(valuesMap).map(key => `'${valuesMap[key]}'`);
127127

128-
let query = `INSERT OR REPLACE INTO ${this.tableName} (${Object.keys(valuesMap).join(', ')}) VALUES (${values.join(', ')})`;
128+
let query = `INSERT OR REPLACE INTO ${this.tableName} (${Object.keys(valuesMap).join(', ')}) VALUES (${values.map(()=>'?').join(', ')})`;
129129

130-
return this.storage.query(query).then(() => data);
130+
return this.storage.query(query, values).then(() => data);
131131
}
132132

133133
/**

src/storage.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ export class SqlStorage {
99
* @description Call database query
1010
* @return {Promise<any>}
1111
*/
12-
public query(query: String): Promise<any> {
12+
public query(query: String, values: any[] = []): Promise<any> {
1313
return new Promise((resolve, reject) => {
1414
this.database.transaction((tx) => {
15-
tx.executeSql(query, [], (tx, rs) => {
15+
tx.executeSql(query, values, (tx, rs) => {
1616
resolve(rs);
1717
}, (tx, err) => {
1818
reject(err);

tslint.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
{
2-
"extends": "tslint-ionic-rules"
32
}

0 commit comments

Comments
 (0)