Skip to content

Commit ca243cc

Browse files
quweifanquweifan
quweifan
and
quweifan
authored
test:修改封装同步方法void变更异步方法Promise<void>包 (#12)
* test:修改封装同步方法void变更异步方法Promise<void>包 --------- Co-authored-by: quweifan <quweifan1@h-partners.com>
1 parent d8f28b0 commit ca243cc

File tree

5 files changed

+50
-29
lines changed

5 files changed

+50
-29
lines changed

‎NativeSQLitePlugin.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,37 @@ export interface Spec extends TurboModule {
66
openargs: Object,
77
opensuccesscb: () => void,
88
openerrorcb: (e: Object) => void
9-
): void;
9+
): Promise<void>;
1010

1111
close(
1212
closeargs: Object,
1313
mysuccess: (t: Object, r: Object) => void,
1414
myerror: (e: Object) => void
15-
): void;
15+
): Promise<void>;
1616

1717
attach(
1818
attachargs: Object,
1919
mysuccess: (t: Object, r: Object) => void,
2020
myerror: (e: Object) => void
21-
): void;
21+
): Promise<void>;
2222

2323
backgroundExecuteSqlBatch(
2424
args: Object,
2525
mysuccess: (result: Object) => void,
2626
myerror: (e: Object) => void
27-
): void;
27+
): Promise<void>;
2828

2929
echoStringValue(
3030
openargs: Object,
3131
mysuccess: (testValue: Object) => void,
3232
myerror: (e: Object) => void
33-
): void;
33+
): Promise<void>;
3434

3535
delete(
3636
args: Object,
3737
mysuccess: (r: Object) => void,
3838
myerror: (e: Object) => void
39-
): void;
39+
): Promise<void>;
4040
}
4141

4242
export default TurboModuleRegistry.getEnforcing<Spec>("SQLitePlugin");

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native-oh-tpl/react-native-sqlite-storage",
3-
"version": "6.0.1-0.0.7",
3+
"version": "6.0.1-0.0.7-beta",
44
"description": "SQLite3 bindings for React Native (Android & iOS)",
55
"overrides":{
66
"@react-native/codegen": "0.74.0"

‎platforms/harmony/sqlite_storage.har

-538 Bytes
Binary file not shown.

‎platforms/harmony/sqlite_storage/oh-package.json5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"description": "",
77
"main": "ts.ts",
88
"type": "module",
9-
"version": "6.0.1-0.0.7",
9+
"version": "6.0.1-0.0.7-beta",
1010
"dependencies": {
1111
"@rnoh/react-native-openharmony": "file:../react_native_openharmony",
1212
}

‎platforms/harmony/sqlite_storage/src/main/ets/SQLitePluginTurboModule.ts

Lines changed: 42 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
2121
this.context = ctx;
2222
}
2323

24-
echoStringValue(openargs: Object, mysuccess: (testValue: Object) => void, myerror: (e: Object) => void): void {
24+
echoStringValue(openargs: Object, mysuccess: (testValue: Object) => void,
25+
myerror: (e: Object) => void): Promise<void> {
2526

2627
try {
2728
this.execute(Action.echoStringValue, openargs, mysuccess, myerror);
@@ -30,9 +31,10 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
3031

3132
myerror(err);
3233
}
34+
return Promise.resolve()
3335
}
3436

35-
open(openargs: Object, opensuccesscb: () => void, openerrorcb: (e: Object) => void): void {
37+
open(openargs: Object, opensuccesscb: () => void, openerrorcb: (e: Object) => void): Promise<void> {
3638

3739
try {
3840
this.execute(Action.open, openargs, opensuccesscb, openerrorcb);
@@ -41,9 +43,10 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
4143

4244
openerrorcb(err);
4345
}
46+
return Promise.resolve()
4447
}
4548

46-
close(closeargs: Object, mysuccess: (t: Object, r: Object) => void, myerror: (e: Object) => void): void {
49+
close(closeargs: Object, mysuccess: (t: Object, r: Object) => void, myerror: (e: Object) => void): Promise<void> {
4750

4851
try {
4952
this.execute(Action.close, closeargs, mysuccess, myerror);
@@ -52,9 +55,10 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
5255

5356
myerror(err);
5457
}
58+
return Promise.resolve()
5559
}
5660

57-
delete(args: Object, mysuccess: (r: Object) => void, myerror: (e: Object) => void): void {
61+
delete(args: Object, mysuccess: (r: Object) => void, myerror: (e: Object) => void): Promise<void> {
5862

5963
try {
6064
this.execute(Action.delete, args, mysuccess, myerror);
@@ -63,9 +67,10 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
6367

6468
myerror(err);
6569
}
70+
return Promise.resolve()
6671
}
6772

68-
attach(attachargs: Object, mysuccess: (t: Object, r: Object) => void, myerror: (e: Object) => void): void {
73+
attach(attachargs: Object, mysuccess: (t: Object, r: Object) => void, myerror: (e: Object) => void): Promise<void> {
6974

7075
try {
7176
this.execute(Action.attach, attachargs, mysuccess, myerror);
@@ -74,10 +79,11 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
7479

7580
myerror(err);
7681
}
77-
82+
return Promise.resolve()
7883
}
7984

80-
backgroundExecuteSqlBatch(args: Object, mysuccess: (result: Object) => void, myerror: (e: Object) => void): void {
85+
backgroundExecuteSqlBatch(args: Object, mysuccess: (result: Object) => void,
86+
myerror: (e: Object) => void): Promise<void> {
8187

8288
try {
8389
this.execute(Action.backgroundExecuteSqlBatch, args, mysuccess, myerror);
@@ -86,10 +92,12 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
8692

8793
myerror(err);
8894
}
95+
return Promise.resolve()
8996
}
9097

9198
//桥接执行方法
92-
execute(actionAsString: string, args: Object, success: (result?: Object, tx?: Object) => void, error: (e: Object) => void): boolean {
99+
execute(actionAsString: string, args: Object, success: (result?: Object, tx?: Object) => void,
100+
error: (e: Object) => void): boolean {
93101
let dbname: string = '';
94102
const argsmap = args as Map<string, Object>;
95103
const map = new Map(Object.entries(JSON.parse(json.stringify(argsmap))));
@@ -155,7 +163,8 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
155163

156164
relationalStore.getRdbStore(this.context.uiAbilityContext, STORE_CONFIG, (err, store) => {
157165
if (err) {
158-
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=Failed to getRdbStore code:' + err.code + ", message:" + err.message);
166+
Logger.debug(CommonConstants.TAG,
167+
'test--SQLitePlugin=Failed to getRdbStore code:' + err.code + ", message:" + err.message);
159168
const e = { "code": err.code, "message": err.message }
160169

161170
error(e);
@@ -206,7 +215,8 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
206215
}
207216

208217
//SQL执行数据库方法
209-
async executeSqlBatchDatabase(args: Object, success: (result?: Object) => void, error: (e: Object) => void): Promise<void> {
218+
async executeSqlBatchDatabase(args: Object, success: (result?: Object) => void,
219+
error: (e: Object) => void): Promise<void> {
210220
const argsmap = args as Map<string, Object>;
211221
const map = new Map(Object.entries(JSON.parse(json.stringify(argsmap))));
212222
const dbArgs = map.get('dbargs');
@@ -245,7 +255,8 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
245255
queryResultcall = { 'rowsAffected': 1 }
246256
} catch (e) {
247257
errorMessage = e.message;
248-
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>创建表失败=' + errorMessage);
258+
Logger.debug(CommonConstants.TAG,
259+
'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>创建表失败=' + errorMessage);
249260
}
250261

251262
} else if (queryType == 'INSERT') {
@@ -257,7 +268,8 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
257268
queryResultcall = { 'insertId': rowId, 'rowsAffected': 1 }
258269
} catch (e) {
259270
errorMessage = e.message;
260-
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>插入数据失败=' + errorMessage);
271+
Logger.debug(CommonConstants.TAG,
272+
'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>插入数据失败=' + errorMessage);
261273
}
262274

263275
} else if (queryType == 'UPDATE' || queryType == 'DELETE' || queryType == 'ALTER') {
@@ -270,7 +282,8 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
270282
queryResultcall = { 'rowsAffected': rowsAffected }
271283
} catch (e) {
272284
errorMessage = e.message;
273-
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>插入数据失败=' + errorMessage);
285+
Logger.debug(CommonConstants.TAG,
286+
'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>插入数据失败=' + errorMessage);
274287
}
275288

276289
} else if (queryType == 'BEGIN') {
@@ -282,7 +295,8 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
282295
queryResultcall = { 'rowsAffected': 0 }
283296
} catch (e) {
284297
errorMessage = e.message;
285-
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>开始事务失败=' + errorMessage);
298+
Logger.debug(CommonConstants.TAG,
299+
'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>开始事务失败=' + errorMessage);
286300
}
287301
} else if (queryType == 'COMMIT') {
288302
needRawQuery = false;
@@ -293,7 +307,8 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
293307
queryResultcall = { 'rowsAffected': 0 }
294308
} catch (e) {
295309
errorMessage = e.message;
296-
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>结束事务失败=' + errorMessage);
310+
Logger.debug(CommonConstants.TAG,
311+
'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>结束事务失败=' + errorMessage);
297312
}
298313
} else if (queryType == 'ROLLBACK') {
299314
needRawQuery = false;
@@ -304,15 +319,17 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
304319
queryResultcall = { 'rowsAffected': 0 }
305320
} catch (e) {
306321
errorMessage = e.message;
307-
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>回滚事务失败=' + errorMessage);
322+
Logger.debug(CommonConstants.TAG,
323+
'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>回滚事务失败=' + errorMessage);
308324
}
309325
}
310326

311327
if (needRawQuery) {
312328
try {
313329
let resultSet = await rdbStore.querySql(querySql, queryParams)
314330
const count = resultSet.columnCount;
315-
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>查询数据个数====' + count);
331+
Logger.debug(CommonConstants.TAG,
332+
'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>查询数据个数====' + count);
316333
let results: Array<relationalStore.ValuesBucket> = new Array<relationalStore.ValuesBucket>();
317334

318335
while (resultSet.goToNextRow()) {
@@ -343,7 +360,8 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
343360
success(callvalue);
344361
}
345362

346-
async attachDatabase(dbname: string, dbNameToAttach: string, dbAlias: string, success: (t: Object, r: Object) => void, error: (e: Object) => void): Promise<void> {
363+
async attachDatabase(dbname: string, dbNameToAttach: string, dbAlias: string, success: (t: Object, r: Object) => void,
364+
error: (e: Object) => void): Promise<void> {
347365

348366
const rdbStore = this.rdbMap.get(dbname) as relationalStore.RdbStore;
349367

@@ -381,23 +399,26 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
381399
try {
382400
fs.mkdirSync(dirPath);
383401
} catch (error) {
384-
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=mkdir dirPath failed,error code:' + error.code + ", message:" + error.message);
402+
Logger.debug(CommonConstants.TAG,
403+
'test--SQLitePlugin=mkdir dirPath failed,error code:' + error.code + ", message:" + error.message);
385404
}
386405

387406
try {
388407
dirPath = dirPath + "/rdb"
389408

390409
fs.mkdirSync(dirPath);
391410
} catch (error) {
392-
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=mkdir dirPathrdbPath failed,error code:' + error.code + ", message:" + error.message);
411+
Logger.debug(CommonConstants.TAG,
412+
'test--SQLitePlugin=mkdir dirPathrdbPath failed,error code:' + error.code + ", message:" + error.message);
393413
}
394414

395415
try {
396416
let result = this.context.uiAbilityContext.resourceManager.getRawFdSync('rdb/' + dbName);
397417

398418
this.saveFileToCache(result, dbName)
399419
} catch (error) {
400-
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=callback getRawFd failed,error code:' + error.code + ", message:" + error.message)
420+
Logger.debug(CommonConstants.TAG,
421+
'test--SQLitePlugin=callback getRawFd failed,error code:' + error.code + ", message:" + error.message)
401422
}
402423
}
403424

0 commit comments

Comments
 (0)