openharmony/distributeddatamgr_relational_store
1
0
Fork 0
mirror of https://gitee.com/openharmony/distributeddatamgr_relational_store synced 2024-11-27 01:01:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1925 fix code

Browse Source 
Merge pull request !1925 from Anvette/master
This commit is contained in:
openharmony_ci 2024-11-23 03:34:57 +00:00 committed by Gitee
commit 807d06f963
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frameworks/js/napi/rdb/src/napi_rdb_store.cpp
View File

@ -268,9 +268,9 @@ int ParseDevice(const napi_env env, const napi_value arg, std::shared_ptr<RdbSto
int ParseTablesName(const napi_env env, const napi_value arg, std::shared_ptr<RdbStoreContext> context)
{
uint32_t arrLen = 0;
napi_get_array_length(env, arg, &arrLen);
napi_status status = napi_get_array_length(env, arg, &arrLen);
std::shared_ptr<Error> paramError = std::make_shared<ParamTypeError>("tables", "a string array.");
RDB_CHECK_RETURN_CALL_RESULT(arrLen >= 0, context->SetError(paramError));
RDB_CHECK_RETURN_CALL_RESULT(status == napi_ok, context->SetError(paramError));
for (uint32_t i = 0; i < arrLen; ++i) {
napi_value element = nullptr;
@ -494,12 +494,12 @@ int ParseValuesBuckets(const napi_env env, const napi_value arg, std::shared_ptr
}
uint32_t arrLen = 0;
napi_status status = napi_get_array_length(env, arg, &arrLen);
RDB_CHECK_RETURN_CALL_RESULT(status == napi_ok || arrLen >= 0, context->SetError(paramError));
RDB_CHECK_RETURN_CALL_RESULT(status == napi_ok, context->SetError(paramError));
for (uint32_t i = 0; i < arrLen; ++i) {
napi_value obj = nullptr;
status = napi_get_element(env, arg, i, &obj);
RDB_CHECK_RETURN_CALL_RESULT(status == napi_ok || arrLen >= 0, context->SetError(paramError));
RDB_CHECK_RETURN_CALL_RESULT(status == napi_ok, context->SetError(paramError));
ParseValuesBucket(env, obj, context);
context->valuesBuckets.push_back(context->valuesBucket);

2
frameworks/native/rdb/src/rdb_notifier_stub.cpp
View File

@ -52,7 +52,7 @@ int RdbNotifierStub::OnRemoteRequest(uint32_t code, MessageParcel &data, Message
return RDB_ERROR;
}
if (code >= 0 && code < static_cast<uint32_t>(NotifierIFCode::RDB_NOTIFIER_CMD_MAX)) {
if (code < static_cast<uint32_t>(NotifierIFCode::RDB_NOTIFIER_CMD_MAX)) {
return (this->*HANDLES[code])(data, reply);
}

49
test/js/rdb/unittest/src/RdbstoreInsertJsunit.test.js
View File

@ -24,7 +24,7 @@ const STORE_CONFIG = {
name: "InsertTest.db",
}
var rdbStore = undefined;
let rdbStore = undefined;
describe('rdbStoreInsertTest', function () {
beforeAll(async function () {
@ -57,7 +57,7 @@ describe('rdbStoreInsertTest', function () {
*/
it('testRdbStoreInsert0001', 0, async function (done) {
console.log(TAG + "************* testRdbStoreInsert0001 start *************");
var u8 = new Uint8Array([1, 2, 3])
let u8 = new Uint8Array([1, 2, 3])
{
const valueBucket = {
"name": "zhangsan",
@ -122,7 +122,7 @@ describe('rdbStoreInsertTest', function () {
*/
it('testRdbStoreInsert0002', 0, async function (done) {
console.log(TAG + "************* testRdbStoreInsert0002 start *************");
var u8 = new Uint8Array([1, 2, 3])
let u8 = new Uint8Array([1, 2, 3])
{
const valueBucket = {
"name": "zhangsan",
@ -150,7 +150,7 @@ describe('rdbStoreInsertTest', function () {
*/
it('testRdbStoreInsert0003', 0, async function (done) {
console.log(TAG + "************* testRdbStoreInsert0003 start *************");
var u8 = new Uint8Array([1, 2, 3])
let u8 = new Uint8Array([1, 2, 3])
{
const valueBucket = {
"name": "zhangsan",
@ -185,8 +185,8 @@ describe('rdbStoreInsertTest', function () {
*/
it('testRdbStoreInsert0004', 0, async function (done) {
console.log(TAG + "************* testRdbStoreInsert0004 start *************");
var u8 = new Uint8Array([1, 2, 3])
var nameStr = "abcd" + "e".repeat(2000) + "./&*$!@()"
let u8 = new Uint8Array([1, 2, 3])
let nameStr = "abcd" + "e".repeat(2000) + "./&*$!@()"
const valueBucket = {
"name": nameStr,
"age": 19,
@ -219,8 +219,8 @@ describe('rdbStoreInsertTest', function () {
*/
it('testRdbStoreInsert0005', 0, async function (done) {
console.log(TAG + "************* testRdbStoreInsert0005 start *************");
var u8 = new Uint8Array([1, 2, 3])
var nameStr = "苹果是水果" + "e".repeat(2000)
let u8 = new Uint8Array([1, 2, 3])
let nameStr = "苹果是水果" + "e".repeat(2000)
const valueBucket = {
"name": nameStr,
"age": 20,
@ -253,8 +253,8 @@ describe('rdbStoreInsertTest', function () {
*/
it('testRdbStoreInsert0006', 0, async function (done) {
console.log(TAG + "************* testRdbStoreInsert0006 start *************");
var u8 = new Uint8Array([1, 2, 3])
var nameStr = "西瓜是水果" + "e".repeat(2000) + "好吃又好看"
let u8 = new Uint8Array([1, 2, 3])
let nameStr = "西瓜是水果" + "e".repeat(2000) + "好吃又好看"
const valueBucket = {
"name": nameStr,
"age": 21,
@ -287,7 +287,7 @@ describe('rdbStoreInsertTest', function () {
*/
it('testRdbStoreGetString0001', 0, async function (done) {
console.log(TAG + "************* testRdbStoreGetString0001 start *************");
var u8 = new Uint8Array([1, 2, 3])
let u8 = new Uint8Array([1, 2, 3])
const valueBucket = {
"name": "",
"age": 21,
@ -322,7 +322,7 @@ describe('rdbStoreInsertTest', function () {
it('testRdbStorebatchInsert001', 0, async function () {
console.log(TAG + "************* testRdbStorebatchInsert001 start *************");
var u8 = new Uint8Array([1, 2, 3])
let u8 = new Uint8Array([1, 2, 3])
const valueBucket = {
"name": "zhangsan",
"age": 18,
@ -354,7 +354,7 @@ describe('rdbStoreInsertTest', function () {
let valueBucketArray = new Array();
var u8 = new Uint8Array([1, 2, 3])
let u8 = new Uint8Array([1, 2, 3])
const valueBucket = {
"name": "zhangsan",
"age": 18,
@ -420,7 +420,7 @@ describe('rdbStoreInsertTest', function () {
let valueBucketArray = new Array();
var u8 = new Uint8Array([1, 2, 3])
let u8 = new Uint8Array([1, 2, 3])
const valueBucket = {
"name": "zhangsan",
"age": 18,
@ -438,5 +438,26 @@ describe('rdbStoreInsertTest', function () {
resultSet.close()
console.log(TAG + "************* testRdbStorebatchInsert003 end *************");
})
/**
* @tc.name: rdb batchInsert test
* @tc.number: SUB_DDM_AppDataFWK_JSRDB_batchInsert_0004
* @tc.desc: Test with empty valueBucket in rdb batchInsert
* @tc.require: issueIB3DGQ
*/
it('testRdbStorebatchInsert004', 0, async function () {
console.log(TAG + "************* testRdbStorebatchInsert004 start *************");
await rdbStore.executeSql("delete from test");
let valueBucketArray = [];
let errCode = await rdbStore.batchInsert("test", valueBucketArray);
expect(0).assertEqual(errCode);
let resultSet = await rdbStore.querySql("SELECT * FROM test");
let count = resultSet.rowCount;
expect(0).assertEqual(count);
resultSet.close()
console.log(TAG + "************* testRdbStorebatchInsert004 end *************");
})
console.log(TAG + "*************Unit Test End*************");
})