@nativescript-community/sqlite 3.4.1 → 3.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +59 -7
- package/nanosql/index.js +3 -1
- package/nanosql/index.js.map +1 -1
- package/package.json +13 -6
- package/platforms/android/native-api-usage.json +4 -3
- package/scripts/before-prepare.js +30 -0
- package/scripts/before-prepare.js.map +1 -1
- package/sqlite.android.d.ts +3 -2
- package/sqlite.android.js +4 -5
- package/sqlite.android.js.map +1 -1
- package/sqlite.common.d.ts +8 -8
- package/sqlite.common.js +1 -0
- package/sqlite.common.js.map +1 -1
- package/sqlite.ios.d.ts +6 -6
- package/sqlite.ios.js +276 -28
- package/sqlite.ios.js.map +1 -1
- package/sqlitedatabase.android.d.ts +9 -39
- package/sqlitedatabase.android.js +25 -21
- package/sqlitedatabase.android.js.map +1 -1
- package/sqlitedatabase.d.ts +1 -0
- package/typeorm/NativescriptDriver.d.ts +37 -5
- package/typeorm/NativescriptDriver.js +29 -4
- package/typeorm/NativescriptDriver.js.map +1 -1
- package/typeorm/NativescriptQueryRunner.d.ts +16 -10
- package/typeorm/NativescriptQueryRunner.js +29 -7
- package/typeorm/NativescriptQueryRunner.js.map +1 -1
- package/typeorm/index.d.ts +17 -2
- package/typeorm/index.js +8 -1
- package/typeorm/index.js.map +1 -1
- package/typings/objc!FMDB.d.ts +487 -0
- package/worker.js +31 -2
- package/worker.js.map +1 -1
- package/CHANGELOG.md +0 -230
- package/before-prepare.js.map +0 -1
- package/postinstall.d.ts +0 -0
- package/postinstall.js +0 -2
- package/postinstall.js.map +0 -1
- package/preuninstall.d.ts +0 -0
- package/preuninstall.js +0 -2
- package/preuninstall.js.map +0 -1
|
@@ -130,7 +130,7 @@ export class SQLiteDatabaseBase {
|
|
|
130
130
|
this._isInTransaction = false;
|
|
131
131
|
this.threading = false;
|
|
132
132
|
this.threading = options && options.threading === true;
|
|
133
|
-
this.flags = options
|
|
133
|
+
this.flags = options?.flags;
|
|
134
134
|
this.transformBlobs = !options || options.transformBlobs !== false;
|
|
135
135
|
}
|
|
136
136
|
onWorkerMessage(event) {
|
|
@@ -145,6 +145,7 @@ export class SQLiteDatabaseBase {
|
|
|
145
145
|
else {
|
|
146
146
|
executor.resolve(data.result);
|
|
147
147
|
}
|
|
148
|
+
// }
|
|
148
149
|
});
|
|
149
150
|
delete messagePromises[id];
|
|
150
151
|
}
|
|
@@ -160,10 +161,12 @@ export class SQLiteDatabaseBase {
|
|
|
160
161
|
let timeoutTimer;
|
|
161
162
|
if (timeout > 0) {
|
|
162
163
|
timeoutTimer = setTimeout(() => {
|
|
164
|
+
// we need to try catch because the simple fact of creating a new Error actually throws.
|
|
165
|
+
// so we will get an uncaughtException
|
|
163
166
|
try {
|
|
164
167
|
reject(new Error('timeout'));
|
|
165
168
|
}
|
|
166
|
-
catch
|
|
169
|
+
catch { }
|
|
167
170
|
delete messagePromises[id];
|
|
168
171
|
}, timeout);
|
|
169
172
|
}
|
|
@@ -178,7 +181,7 @@ export class SQLiteDatabaseBase {
|
|
|
178
181
|
dbOptions: {
|
|
179
182
|
transformBlobs: this.transformBlobs
|
|
180
183
|
},
|
|
181
|
-
nativeDataKeys: keys
|
|
184
|
+
nativeDataKeys: keys
|
|
182
185
|
}, messageData);
|
|
183
186
|
this.worker.postMessage(mData);
|
|
184
187
|
});
|
|
@@ -186,31 +189,32 @@ export class SQLiteDatabaseBase {
|
|
|
186
189
|
get isOpen() {
|
|
187
190
|
return this.db && this.db.isOpen();
|
|
188
191
|
}
|
|
189
|
-
|
|
192
|
+
close() {
|
|
190
193
|
if (!this.isOpen)
|
|
191
194
|
return;
|
|
192
195
|
if (this.worker) {
|
|
193
196
|
this.worker.postMessage({
|
|
194
|
-
type: 'terminate'
|
|
197
|
+
type: 'terminate'
|
|
195
198
|
});
|
|
196
199
|
this.worker = null;
|
|
197
200
|
}
|
|
198
201
|
this.db.close();
|
|
202
|
+
// sqlite3_close_v2(db);
|
|
199
203
|
this.db = null;
|
|
200
204
|
}
|
|
201
205
|
async setVersion(version) {
|
|
202
206
|
this.db.setVersion(version);
|
|
203
207
|
}
|
|
204
|
-
|
|
208
|
+
getVersion() {
|
|
205
209
|
return this.db.getVersion();
|
|
206
210
|
}
|
|
207
211
|
async execute(query, params) {
|
|
208
212
|
if (this.threading) {
|
|
209
213
|
return this.sendMessageToWorker({
|
|
210
|
-
db: this.db
|
|
214
|
+
db: this.db
|
|
211
215
|
}, {
|
|
212
216
|
callName: 'execute',
|
|
213
|
-
args: [query, params]
|
|
217
|
+
args: [query, params]
|
|
214
218
|
});
|
|
215
219
|
}
|
|
216
220
|
return this.db.execSQL(query, paramsToStringArray(params));
|
|
@@ -218,49 +222,49 @@ export class SQLiteDatabaseBase {
|
|
|
218
222
|
async get(query, params, transformBlobs) {
|
|
219
223
|
if (this.threading) {
|
|
220
224
|
return this.sendMessageToWorker({
|
|
221
|
-
db: this.db
|
|
225
|
+
db: this.db
|
|
222
226
|
}, {
|
|
223
227
|
callName: 'get',
|
|
224
|
-
args: [query, params]
|
|
228
|
+
args: [query, params]
|
|
225
229
|
});
|
|
226
230
|
}
|
|
227
|
-
return rawSql(dataFromCursor)(this.db, transformBlobs
|
|
231
|
+
return rawSql(dataFromCursor)(this.db, transformBlobs ?? this.transformBlobs)(query, params)[0] || null;
|
|
228
232
|
}
|
|
229
233
|
async getArray(query, params, transformBlobs) {
|
|
230
234
|
if (this.threading) {
|
|
231
235
|
return this.sendMessageToWorker({
|
|
232
|
-
db: this.db
|
|
236
|
+
db: this.db
|
|
233
237
|
}, {
|
|
234
238
|
callName: 'getArray',
|
|
235
|
-
args: [query, params]
|
|
239
|
+
args: [query, params]
|
|
236
240
|
});
|
|
237
241
|
}
|
|
238
|
-
return rawSql(arrayFromCursor)(this.db, transformBlobs
|
|
242
|
+
return rawSql(arrayFromCursor)(this.db, transformBlobs ?? this.transformBlobs)(query, params)[0] || null;
|
|
239
243
|
}
|
|
240
244
|
async select(query, params, transformBlobs) {
|
|
241
245
|
if (this.threading) {
|
|
242
246
|
return this.sendMessageToWorker({
|
|
243
|
-
db: this.db
|
|
247
|
+
db: this.db
|
|
244
248
|
}, {
|
|
245
249
|
callName: 'select',
|
|
246
|
-
args: [query, params]
|
|
250
|
+
args: [query, params]
|
|
247
251
|
});
|
|
248
252
|
}
|
|
249
|
-
return rawSql(dataFromCursor)(this.db, transformBlobs
|
|
253
|
+
return rawSql(dataFromCursor)(this.db, transformBlobs ?? this.transformBlobs)(query, params);
|
|
250
254
|
}
|
|
251
255
|
async selectArray(query, params, transformBlobs) {
|
|
252
256
|
if (this.threading) {
|
|
253
257
|
return this.sendMessageToWorker({
|
|
254
|
-
db: this.db
|
|
258
|
+
db: this.db
|
|
255
259
|
}, {
|
|
256
260
|
callName: 'selectArray',
|
|
257
|
-
args: [query, params]
|
|
261
|
+
args: [query, params]
|
|
258
262
|
});
|
|
259
263
|
}
|
|
260
|
-
return rawSql(arrayFromCursor)(this.db, transformBlobs
|
|
264
|
+
return rawSql(arrayFromCursor)(this.db, transformBlobs ?? this.transformBlobs)(query, params);
|
|
261
265
|
}
|
|
262
266
|
async each(query, params, callback, complete, transformBlobs) {
|
|
263
|
-
return eachRaw(dataFromCursor)(this.db, transformBlobs
|
|
267
|
+
return eachRaw(dataFromCursor)(this.db, transformBlobs ?? this.transformBlobs)(query, params, callback, complete);
|
|
264
268
|
}
|
|
265
269
|
async transaction(action) {
|
|
266
270
|
return transactionRaw(this.db, action);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlitedatabase.android.js","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"sqlitedatabase.android.js","sourceRoot":"../src/","sources":["sqlitedatabase.android.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './sqlitedatabase.android';
|
|
@@ -1,14 +1,29 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { AbstractSqliteDriver } from '
|
|
3
|
-
import { ColumnType } from '@nativescript-community/typeorm/browser/driver/types/ColumnTypes';
|
|
4
|
-
import { QueryRunner } from '@nativescript-community/typeorm/browser/query-runner/QueryRunner';
|
|
1
|
+
import { ColumnType, DataSource, QueryRunner } from 'typeorm/browser';
|
|
2
|
+
import { AbstractSqliteDriver } from 'typeorm/browser/driver/sqlite-abstract/AbstractSqliteDriver';
|
|
5
3
|
import * as NSQlite from '../sqlite';
|
|
6
4
|
import { NativescriptConnectionOptions } from './index';
|
|
5
|
+
/**
|
|
6
|
+
* Organizes communication with sqlite DBMS within Nativescript.
|
|
7
|
+
*/
|
|
7
8
|
export declare class NativescriptDriver extends AbstractSqliteDriver {
|
|
9
|
+
/**
|
|
10
|
+
* Connection options.
|
|
11
|
+
*/
|
|
8
12
|
options: NativescriptConnectionOptions;
|
|
13
|
+
/**
|
|
14
|
+
* Nativescript driver module
|
|
15
|
+
* this is most likely `nativescript-sqlite`
|
|
16
|
+
* but user can pass his own
|
|
17
|
+
*/
|
|
9
18
|
driver: any;
|
|
10
|
-
constructor(connection:
|
|
19
|
+
constructor(connection: DataSource);
|
|
20
|
+
/**
|
|
21
|
+
* Closes connection with database.
|
|
22
|
+
*/
|
|
11
23
|
disconnect(): Promise<any>;
|
|
24
|
+
/**
|
|
25
|
+
* Creates a query runner used to execute database queries.
|
|
26
|
+
*/
|
|
12
27
|
createQueryRunner(mode?: 'master' | 'slave'): QueryRunner;
|
|
13
28
|
normalizeType(column: {
|
|
14
29
|
type?: ColumnType;
|
|
@@ -16,8 +31,25 @@ export declare class NativescriptDriver extends AbstractSqliteDriver {
|
|
|
16
31
|
precision?: number | null;
|
|
17
32
|
scale?: number;
|
|
18
33
|
}): string;
|
|
34
|
+
/**
|
|
35
|
+
* Creates connection with the database.
|
|
36
|
+
*
|
|
37
|
+
* nativescript-sqlite driver constructor and execSQL()/all() methods return Promise
|
|
38
|
+
* Also as mentioned in nativescript-sqlite documentation:
|
|
39
|
+
*
|
|
40
|
+
* "You should choose either to use a promise or a callback;
|
|
41
|
+
* you can use whichever you are most comfortable with
|
|
42
|
+
* however, you CAN use both if you want;
|
|
43
|
+
* but side effects WILL occur with some functions."
|
|
44
|
+
*
|
|
45
|
+
* We choose Promise. So we should use Promises, when create connection and when make query
|
|
46
|
+
* Let's use async/await
|
|
47
|
+
*/
|
|
19
48
|
sqlite: typeof NSQlite;
|
|
20
49
|
protected createDatabaseConnection(): Promise<NSQlite.SQLiteDatabase>;
|
|
50
|
+
/**
|
|
51
|
+
* If driver dependency is not given explicitly, then try to load it via "require".
|
|
52
|
+
*/
|
|
21
53
|
protected loadDependencies(): void;
|
|
22
54
|
}
|
|
23
55
|
export declare class MongoDriver {
|
|
@@ -1,23 +1,40 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
1
|
+
import { DataSource, DriverOptionNotSetError, DriverPackageNotInstalledError } from 'typeorm/browser';
|
|
2
|
+
import { AbstractSqliteDriver } from 'typeorm/browser/driver/sqlite-abstract/AbstractSqliteDriver';
|
|
3
|
+
import * as NSQlite from '../sqlite';
|
|
4
4
|
import { NativescriptQueryRunner } from './NativescriptQueryRunner';
|
|
5
|
+
/**
|
|
6
|
+
* Organizes communication with sqlite DBMS within Nativescript.
|
|
7
|
+
*/
|
|
5
8
|
export class NativescriptDriver extends AbstractSqliteDriver {
|
|
9
|
+
// -------------------------------------------------------------------------
|
|
10
|
+
// Constructor
|
|
11
|
+
// -------------------------------------------------------------------------
|
|
6
12
|
constructor(connection) {
|
|
7
13
|
super(connection);
|
|
8
14
|
this.connection = connection;
|
|
9
15
|
this.options = connection.options;
|
|
10
16
|
this.database = this.options.database;
|
|
11
17
|
this.driver = this.options.driver;
|
|
18
|
+
// validate options to make sure everything is set
|
|
12
19
|
if (!this.options.database) {
|
|
13
20
|
throw new DriverOptionNotSetError('database');
|
|
14
21
|
}
|
|
22
|
+
// load sqlite package
|
|
15
23
|
this.loadDependencies();
|
|
16
24
|
}
|
|
25
|
+
// -------------------------------------------------------------------------
|
|
26
|
+
// Public Methods
|
|
27
|
+
// -------------------------------------------------------------------------
|
|
28
|
+
/**
|
|
29
|
+
* Closes connection with database.
|
|
30
|
+
*/
|
|
17
31
|
async disconnect() {
|
|
18
32
|
this.queryRunner = undefined;
|
|
19
33
|
return this.databaseConnection.close();
|
|
20
34
|
}
|
|
35
|
+
/**
|
|
36
|
+
* Creates a query runner used to execute database queries.
|
|
37
|
+
*/
|
|
21
38
|
createQueryRunner(mode = 'master') {
|
|
22
39
|
if (!this.queryRunner) {
|
|
23
40
|
this.queryRunner = new NativescriptQueryRunner(this);
|
|
@@ -32,7 +49,11 @@ export class NativescriptDriver extends AbstractSqliteDriver {
|
|
|
32
49
|
}
|
|
33
50
|
async createDatabaseConnection() {
|
|
34
51
|
try {
|
|
35
|
-
const db = this.sqlite.openOrCreate(this.options.database, this.options.extra ?
|
|
52
|
+
const db = this.sqlite.openOrCreate(this.options.database, this.options.extra ? { ...this.options.extra } : {});
|
|
53
|
+
// use object mode to work with TypeORM
|
|
54
|
+
// db.resultType(this.sqlite.RESULTSASOBJECT);
|
|
55
|
+
// we need to enable foreign keys in sqlite to make sure all foreign key related features
|
|
56
|
+
// working properly. this also makes onDelete work with sqlite.
|
|
36
57
|
await db.execute('PRAGMA foreign_keys = ON;', []);
|
|
37
58
|
return db;
|
|
38
59
|
}
|
|
@@ -40,6 +61,9 @@ export class NativescriptDriver extends AbstractSqliteDriver {
|
|
|
40
61
|
throw new Error(err);
|
|
41
62
|
}
|
|
42
63
|
}
|
|
64
|
+
/**
|
|
65
|
+
* If driver dependency is not given explicitly, then try to load it via "require".
|
|
66
|
+
*/
|
|
43
67
|
loadDependencies() {
|
|
44
68
|
try {
|
|
45
69
|
this.sqlite = this.options.driver || require('@nativescript-community/sqlite');
|
|
@@ -49,6 +73,7 @@ export class NativescriptDriver extends AbstractSqliteDriver {
|
|
|
49
73
|
}
|
|
50
74
|
}
|
|
51
75
|
}
|
|
76
|
+
// fake export class for webpack clean up with aliases
|
|
52
77
|
export class MongoDriver {
|
|
53
78
|
}
|
|
54
79
|
export class SqljsDriver {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NativescriptDriver.js","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"NativescriptDriver.js","sourceRoot":"../src/","sources":["typeorm/NativescriptDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,21 @@
|
|
|
1
|
-
import { ObjectLiteral } from '
|
|
2
|
-
import { AbstractSqliteQueryRunner } from '
|
|
1
|
+
import { ObjectLiteral, QueryRunner } from 'typeorm/browser';
|
|
2
|
+
import { AbstractSqliteQueryRunner } from 'typeorm/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner';
|
|
3
3
|
import { NativescriptDriver } from './NativescriptDriver';
|
|
4
|
-
|
|
4
|
+
/**
|
|
5
|
+
* Runs queries on a single sqlite database connection.
|
|
6
|
+
*/
|
|
7
|
+
export declare class NativescriptQueryRunner extends AbstractSqliteQueryRunner implements QueryRunner {
|
|
8
|
+
/**
|
|
9
|
+
* Database driver used by connection.
|
|
10
|
+
*/
|
|
5
11
|
driver: NativescriptDriver;
|
|
6
12
|
constructor(driver: NativescriptDriver);
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
13
|
+
/**
|
|
14
|
+
* Executes a given SQL query.
|
|
15
|
+
*/
|
|
16
|
+
query(query: string, parameters?: any[], useStructuredResult?: boolean): Promise<any>;
|
|
17
|
+
/**
|
|
18
|
+
* Parametrizes given object of values. Used to create column=value queries.
|
|
19
|
+
*/
|
|
14
20
|
protected parametrize(objectLiteral: ObjectLiteral, startIndex?: number): string[];
|
|
15
21
|
}
|
|
@@ -1,15 +1,25 @@
|
|
|
1
|
-
import { QueryRunnerAlreadyReleasedError } from '
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
1
|
+
import { QueryFailedError, QueryResult, QueryRunnerAlreadyReleasedError } from 'typeorm/browser';
|
|
2
|
+
import { AbstractSqliteQueryRunner } from 'typeorm/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner';
|
|
3
|
+
import { Broadcaster } from 'typeorm/browser/subscriber/Broadcaster';
|
|
4
|
+
import { NativescriptDriver } from './NativescriptDriver';
|
|
5
|
+
import * as NSQlite from '../sqlite';
|
|
6
|
+
/**
|
|
7
|
+
* Runs queries on a single sqlite database connection.
|
|
8
|
+
*/
|
|
5
9
|
export class NativescriptQueryRunner extends AbstractSqliteQueryRunner {
|
|
10
|
+
// -------------------------------------------------------------------------
|
|
11
|
+
// Constructor
|
|
12
|
+
// -------------------------------------------------------------------------
|
|
6
13
|
constructor(driver) {
|
|
7
14
|
super();
|
|
8
15
|
this.driver = driver;
|
|
9
16
|
this.connection = driver.connection;
|
|
10
17
|
this.broadcaster = new Broadcaster(this);
|
|
11
18
|
}
|
|
12
|
-
|
|
19
|
+
/**
|
|
20
|
+
* Executes a given SQL query.
|
|
21
|
+
*/
|
|
22
|
+
async query(query, parameters, useStructuredResult) {
|
|
13
23
|
if (this.isReleased) {
|
|
14
24
|
throw new QueryRunnerAlreadyReleasedError();
|
|
15
25
|
}
|
|
@@ -19,22 +29,34 @@ export class NativescriptQueryRunner extends AbstractSqliteQueryRunner {
|
|
|
19
29
|
try {
|
|
20
30
|
const db = await this.connect();
|
|
21
31
|
const queryStartTime = +new Date();
|
|
22
|
-
const result = isInsertQuery
|
|
32
|
+
const result = isInsertQuery // when isInsertQuery == true, result is the id
|
|
23
33
|
? await db.execute(query, parameters)
|
|
24
34
|
: await db.select(query, parameters);
|
|
25
35
|
const queryEndTime = +new Date();
|
|
26
36
|
const queryExecutionTime = queryEndTime - queryStartTime;
|
|
27
37
|
const maxQueryExecutionTime = connection.options.maxQueryExecutionTime;
|
|
38
|
+
// log slow queries if maxQueryExecution time is set
|
|
28
39
|
if (maxQueryExecutionTime && queryExecutionTime > maxQueryExecutionTime) {
|
|
29
40
|
connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
|
|
30
41
|
}
|
|
31
|
-
|
|
42
|
+
if (useStructuredResult) {
|
|
43
|
+
return { records: result, raw: result };
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
return result;
|
|
47
|
+
}
|
|
32
48
|
}
|
|
33
49
|
catch (err) {
|
|
34
50
|
connection.logger.logQueryError(err, query, parameters, this);
|
|
35
51
|
throw new QueryFailedError(query, parameters, err);
|
|
36
52
|
}
|
|
37
53
|
}
|
|
54
|
+
// -------------------------------------------------------------------------
|
|
55
|
+
// Protected Methods
|
|
56
|
+
// -------------------------------------------------------------------------
|
|
57
|
+
/**
|
|
58
|
+
* Parametrizes given object of values. Used to create column=value queries.
|
|
59
|
+
*/
|
|
38
60
|
parametrize(objectLiteral, startIndex = 0) {
|
|
39
61
|
return Object.keys(objectLiteral).map((key, index) => `"${key}"` + '=?');
|
|
40
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NativescriptQueryRunner.js","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"NativescriptQueryRunner.js","sourceRoot":"../src/","sources":["typeorm/NativescriptQueryRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,gBAAgB,EAAE,WAAW,EAAe,+BAA+B,EAAE,MAAM,iBAAiB,CAAC;AAC7H,OAAO,EAAE,yBAAyB,EAAE,MAAM,kEAAkE,CAAC;AAC7G,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AAErC;;GAEG;AACH,MAAM,OAAO,uBAAwB,SAAQ,yBAAyB;IAKlE,4EAA4E;IAC5E,cAAc;IACd,4EAA4E;IAC5E,YAAY,MAA0B;QAClC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,KAAK,CAAC,KAAa,EAAE,UAAkB,EAAE,mBAA6B;QACxE,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,IAAI,+BAA+B,EAAE,CAAC;SAC/C;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QAC1C,MAAM,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACpF,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAEpD,IAAI;YACA,MAAM,EAAE,GAA2B,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACxD,MAAM,cAAc,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;YACnC,MAAM,MAAM,GAAG,aAAa,CAAC,+CAA+C;gBACxE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC;gBACrC,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;YACzC,MAAM,YAAY,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;YACjC,MAAM,kBAAkB,GAAG,YAAY,GAAG,cAAc,CAAC;YACzD,MAAM,qBAAqB,GAAG,UAAU,CAAC,OAAO,CAAC,qBAAqB,CAAC;YACvE,oDAAoD;YACpD,IAAI,qBAAqB,IAAI,kBAAkB,GAAG,qBAAqB,EAAE;gBACrE,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;aAC/E;YAED,IAAI,mBAAmB,EAAE;gBACrB,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAiB,CAAC;aAC1D;iBAAM;gBACH,OAAO,MAAM,CAAC;aACjB;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;YAC9D,MAAM,IAAI,gBAAgB,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;SACtD;IACL,CAAC;IACD,4EAA4E;IAC5E,oBAAoB;IACpB,4EAA4E;IAC5E;;OAEG;IACO,WAAW,CAAC,aAA4B,EAAE,aAAqB,CAAC;QACtE,OAAO,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC;IAC7E,CAAC;CACJ"}
|
package/typeorm/index.d.ts
CHANGED
|
@@ -1,7 +1,22 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { BaseDataSourceOptions } from 'typeorm/browser/data-source/BaseDataSourceOptions';
|
|
2
|
+
export * from './NativescriptDriver';
|
|
3
|
+
export * from './NativescriptQueryRunner';
|
|
2
4
|
export declare function installMixins(): void;
|
|
3
|
-
|
|
5
|
+
/**
|
|
6
|
+
* NativeScript-specific connection options.
|
|
7
|
+
*/
|
|
8
|
+
export interface NativescriptConnectionOptions extends BaseDataSourceOptions {
|
|
9
|
+
/**
|
|
10
|
+
* Database type.
|
|
11
|
+
*/
|
|
4
12
|
readonly type: 'nativescript';
|
|
13
|
+
/**
|
|
14
|
+
* Database name.
|
|
15
|
+
*/
|
|
5
16
|
readonly database: string;
|
|
17
|
+
/**
|
|
18
|
+
* The driver object
|
|
19
|
+
* Default is `require('nativescript-sqlite')
|
|
20
|
+
*/
|
|
6
21
|
readonly driver?: any;
|
|
7
22
|
}
|
package/typeorm/index.js
CHANGED
|
@@ -1,14 +1,21 @@
|
|
|
1
|
+
import { DataSource } from 'typeorm/browser';
|
|
1
2
|
import { NativescriptDriver } from './NativescriptDriver';
|
|
3
|
+
export * from './NativescriptDriver';
|
|
4
|
+
export * from './NativescriptQueryRunner';
|
|
2
5
|
let installed = false;
|
|
3
6
|
export function installMixins() {
|
|
4
7
|
if (installed) {
|
|
5
8
|
return;
|
|
6
9
|
}
|
|
7
10
|
installed = true;
|
|
8
|
-
|
|
11
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
12
|
+
const DriverFactory = require('typeorm/browser/driver/DriverFactory').DriverFactory;
|
|
9
13
|
const oldFunc = DriverFactory.prototype.create;
|
|
10
14
|
DriverFactory.prototype.create = function (connection) {
|
|
11
15
|
const { type } = connection.options;
|
|
16
|
+
if (type === '@nativescript-community/sqlite') {
|
|
17
|
+
console.warn('"@nativescript-community/sqlite" is not recognized as a valid sqlite driver by typeorm and will break some SQL queries. Please use "nativescript" instead.');
|
|
18
|
+
}
|
|
12
19
|
switch (type) {
|
|
13
20
|
case 'nativescript':
|
|
14
21
|
case '@nativescript-community/sqlite':
|
package/typeorm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"../src/","sources":["typeorm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAE1C,IAAI,SAAS,GAAG,KAAK,CAAC;AACtB,MAAM,UAAU,aAAa;IACzB,IAAI,SAAS,EAAE;QACX,OAAO;KACV;IACD,SAAS,GAAG,IAAI,CAAC;IACjB,8DAA8D;IAC9D,MAAM,aAAa,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC,aAAa,CAAC;IACpF,MAAM,OAAO,GAAG,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC;IAE/C,aAAa,CAAC,SAAS,CAAC,MAAM,GAAG,UAAU,UAAsB;QAC7D,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC;QAEpC,IAAI,IAAI,KAAM,gCAAwC,EAAE;YACpD,OAAO,CAAC,IAAI,CAAC,4JAA4J,CAAC,CAAC;SAC9K;QAED,QAAQ,IAAI,EAAE;YACV,KAAK,cAAc,CAAC;YACpB,KAAK,gCAAuC;gBACxC,OAAO,IAAI,kBAAkB,CAAC,UAAU,CAAC,CAAC;YAC9C;gBACI,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;SAC7C;IACL,CAAC,CAAC;AACN,CAAC"}
|