Skip to content

test:修改封装同步方法void变更异步方法Promise<void>包 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 30, 2024
Merged

test:修改封装同步方法void变更异步方法Promise<void>包 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26a9a1c
test:修改封装同步方法void变更异步方法Promise<void>包
Aug 30, 2024
04cf2a5
test:修改封装同步方法void变更异步方法Promise<void>包
Aug 30, 2024
139d10d
Merge branch 'native-async' of https://github.com/quweifan/react-nati…
Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions NativeSQLitePlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,37 @@ export interface Spec extends TurboModule {
openargs: Object,
opensuccesscb: () => void,
openerrorcb: (e: Object) => void
): void;
): Promise<void>;

close(
closeargs: Object,
mysuccess: (t: Object, r: Object) => void,
myerror: (e: Object) => void
): void;
): Promise<void>;

attach(
attachargs: Object,
mysuccess: (t: Object, r: Object) => void,
myerror: (e: Object) => void
): void;
): Promise<void>;

backgroundExecuteSqlBatch(
args: Object,
mysuccess: (result: Object) => void,
myerror: (e: Object) => void
): void;
): Promise<void>;

echoStringValue(
openargs: Object,
mysuccess: (testValue: Object) => void,
myerror: (e: Object) => void
): void;
): Promise<void>;

delete(
args: Object,
mysuccess: (r: Object) => void,
myerror: (e: Object) => void
): void;
): Promise<void>;
}

export default TurboModuleRegistry.getEnforcing<Spec>("SQLitePlugin");
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-native-oh-tpl/react-native-sqlite-storage",
"version": "6.0.1-0.0.7",
"version": "6.0.1-0.0.7-beta",
"description": "SQLite3 bindings for React Native (Android & iOS)",
"overrides":{
"@react-native/codegen": "0.74.0"
Expand Down
Binary file modified platforms/harmony/sqlite_storage.har
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion platforms/harmony/sqlite_storage/oh-package.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"description": "",
"main": "ts.ts",
"type": "module",
"version": "6.0.1-0.0.7",
"version": "6.0.1-0.0.7-beta",
"dependencies": {
"@rnoh/react-native-openharmony": "file:../react_native_openharmony",
}
Expand Down
63 changes: 42 additions & 21 deletions platforms/harmony/sqlite_storage/src/main/ets/SQLitePluginTurboModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
this.context = ctx;
}

echoStringValue(openargs: Object, mysuccess: (testValue: Object) => void, myerror: (e: Object) => void): void {
echoStringValue(openargs: Object, mysuccess: (testValue: Object) => void,
myerror: (e: Object) => void): Promise<void> {

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

myerror(err);
}
return Promise.resolve()
}

open(openargs: Object, opensuccesscb: () => void, openerrorcb: (e: Object) => void): void {
open(openargs: Object, opensuccesscb: () => void, openerrorcb: (e: Object) => void): Promise<void> {

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

openerrorcb(err);
}
return Promise.resolve()
}

close(closeargs: Object, mysuccess: (t: Object, r: Object) => void, myerror: (e: Object) => void): void {
close(closeargs: Object, mysuccess: (t: Object, r: Object) => void, myerror: (e: Object) => void): Promise<void> {

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

myerror(err);
}
return Promise.resolve()
}

delete(args: Object, mysuccess: (r: Object) => void, myerror: (e: Object) => void): void {
delete(args: Object, mysuccess: (r: Object) => void, myerror: (e: Object) => void): Promise<void> {

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

myerror(err);
}
return Promise.resolve()
}

attach(attachargs: Object, mysuccess: (t: Object, r: Object) => void, myerror: (e: Object) => void): void {
attach(attachargs: Object, mysuccess: (t: Object, r: Object) => void, myerror: (e: Object) => void): Promise<void> {

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

myerror(err);
}

return Promise.resolve()
}

backgroundExecuteSqlBatch(args: Object, mysuccess: (result: Object) => void, myerror: (e: Object) => void): void {
backgroundExecuteSqlBatch(args: Object, mysuccess: (result: Object) => void,
myerror: (e: Object) => void): Promise<void> {

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

myerror(err);
}
return Promise.resolve()
}

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

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

error(e);
Expand Down Expand Up @@ -206,7 +215,8 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
}

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

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

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

} else if (queryType == 'BEGIN') {
Expand All @@ -282,7 +295,8 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
queryResultcall = { 'rowsAffected': 0 }
} catch (e) {
errorMessage = e.message;
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>开始事务失败=' + errorMessage);
Logger.debug(CommonConstants.TAG,
'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>开始事务失败=' + errorMessage);
}
} else if (queryType == 'COMMIT') {
needRawQuery = false;
Expand All @@ -293,7 +307,8 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
queryResultcall = { 'rowsAffected': 0 }
} catch (e) {
errorMessage = e.message;
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>结束事务失败=' + errorMessage);
Logger.debug(CommonConstants.TAG,
'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>结束事务失败=' + errorMessage);
}
} else if (queryType == 'ROLLBACK') {
needRawQuery = false;
Expand All @@ -304,15 +319,17 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
queryResultcall = { 'rowsAffected': 0 }
} catch (e) {
errorMessage = e.message;
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>回滚事务失败=' + errorMessage);
Logger.debug(CommonConstants.TAG,
'test--SQLitePlugin=backgroundExecuteSqlBatch>>>>>>回滚事务失败=' + errorMessage);
}
}

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

while (resultSet.goToNextRow()) {
Expand Down Expand Up @@ -343,7 +360,8 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
success(callvalue);
}

async attachDatabase(dbname: string, dbNameToAttach: string, dbAlias: string, success: (t: Object, r: Object) => void, error: (e: Object) => void): Promise<void> {
async attachDatabase(dbname: string, dbNameToAttach: string, dbAlias: string, success: (t: Object, r: Object) => void,
error: (e: Object) => void): Promise<void> {

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

Expand Down Expand Up @@ -381,23 +399,26 @@ export class SQLitePluginTurboModule extends TurboModule implements TM.SQLitePlu
try {
fs.mkdirSync(dirPath);
} catch (error) {
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=mkdir dirPath failed,error code:' + error.code + ", message:" + error.message);
Logger.debug(CommonConstants.TAG,
'test--SQLitePlugin=mkdir dirPath failed,error code:' + error.code + ", message:" + error.message);
}

try {
dirPath = dirPath + "/rdb"

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

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

this.saveFileToCache(result, dbName)
} catch (error) {
Logger.debug(CommonConstants.TAG, 'test--SQLitePlugin=callback getRawFd failed,error code:' + error.code + ", message:" + error.message)
Logger.debug(CommonConstants.TAG,
'test--SQLitePlugin=callback getRawFd failed,error code:' + error.code + ", message:" + error.message)
}
}

Expand Down