dnrops
/
node-oracledb
mirror of https://github.com/oracle/node-oracledb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor code refactoring

This commit is contained in:
Sharad Chandran R 2023-08-17 17:36:05 +05:30
parent 70cc5651a8
commit 546538315c
3 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/oracledb.js
View File

@ -1062,15 +1062,11 @@ module.exports = {
},
get oracleClientVersion() {
if (_initOracleClientArgs !== undefined) {
return settings.oracleClientVersion;
}
return settings.oracleClientVersion;
},
get oracleClientVersionString() {
if (_initOracleClientArgs !== undefined) {
return settings.oracleClientVersionString;
}
return settings.oracleClientVersionString;
},
get outFormat() {

8
test/aq6.js
View File

@ -181,8 +181,8 @@ describe('281. aq6.js', function() {
await conn.commit ();
/*Dequeue*/
const queue2 = await conn.getQueue (objQueueName,
{payloadType: oracledb.DB_TYPE_JSON});
const options = { payloadType: oracledb.DB_TYPE_JSON };
const queue2 = await conn.getQueue(objQueueName, options);
msg = await queue2.deqOne ();
assert(msg);
assert(msg.msgId.length > 0);
@ -203,8 +203,8 @@ describe('281. aq6.js', function() {
await queue3.enqMany (empList);
await conn.commit ();
const queue4 = await conn.getQueue(objQueueName,
{payloadType: oracledb.DB_TYPE_JSON});
const options = { payloadType: oracledb.DB_TYPE_JSON };
const queue4 = await conn.getQueue(objQueueName, options);
Object.assign(queue4.deqOptions,
{
navigation: oracledb.AQ_DEQ_NAV_FIRST_MSG,

30
test/aq7.js
View File

@ -103,14 +103,14 @@ describe('282. aq7.js', function() {
},
});
await conn.commit ();
await conn.commit();
const queue2 = await conn.getQueue (objQueueName,
{payloadType: oracledb.DB_TYPE_JSON});
const msg = await queue2.deqOne ();
await conn.commit ();
assert.equal (msg.payload.empName, "employee name");
assert.equal (msg.payload.empCity, "City");
const options = { payloadType: oracledb.DB_TYPE_JSON };
const queue2 = await conn.getQueue(objQueueName, options);
const msg = await queue2.deqOne();
await conn.commit();
assert.strictEqual(msg.payload.empName, "employee name");
assert.strictEqual(msg.payload.empCity, "City");
});
it('282.2 JSON type in enqMany/deqMany', async () => {
@ -127,7 +127,7 @@ describe('282. aq7.js', function() {
await conn.commit ();
const queue4 = await conn.getQueue(objQueueName,
{payloadType: oracledb.DB_TYPE_JSON});
{payloadType: oracledb.DB_TYPE_JSON});
Object.assign(queue4.deqOptions,
{
// consumerName: "sub1",
@ -164,7 +164,7 @@ describe('282. aq7.js', function() {
await conn.commit ();
const queue2 = await conn.getQueue (objQueueName,
{payloadType: oracledb.DB_TYPE_JSON});
{payloadType: oracledb.DB_TYPE_JSON});
const msg = await queue2.deqOne ();
await conn.commit ();
assert.equal (msg.payload.empName, "employee name");
@ -188,7 +188,7 @@ describe('282. aq7.js', function() {
await conn.commit ();
const queue2 = await conn.getQueue (objQueueName,
{payloadType: oracledb.DB_TYPE_JSON});
{payloadType: oracledb.DB_TYPE_JSON});
const msg = await queue2.deqOne ();
await conn.commit ();
assert.equal (msg.payload.empName, null);
@ -207,7 +207,7 @@ describe('282. aq7.js', function() {
await conn.commit ();
const queue2 = await conn.getQueue (objQueueName,
{payloadType: oracledb.DB_TYPE_JSON});
{payloadType: oracledb.DB_TYPE_JSON});
const msg = await queue2.deqOne ();
await conn.commit ();
assert.deepEqual (msg.payload.employees, [ "Employee1", "Employee2", "Employee3" ]);
@ -227,7 +227,7 @@ describe('282. aq7.js', function() {
await conn.commit ();
const queue4 = await conn.getQueue(objQueueName,
{payloadType: oracledb.DB_TYPE_JSON});
{payloadType: oracledb.DB_TYPE_JSON});
Object.assign(queue4.deqOptions,
{
navigation: oracledb.AQ_DEQ_NAV_FIRST_MSG,
@ -254,7 +254,7 @@ describe('282. aq7.js', function() {
await conn.commit ();
const queue2 = await conn.getQueue (objQueueName,
{payloadType: oracledb.DB_TYPE_JSON});
{payloadType: oracledb.DB_TYPE_JSON});
const msg = await queue2.deqOne ();
await conn.commit ();
assert.deepEqual (msg.payload.employee, { "name":"Employee1", "age":30, "city":"New City" });
@ -274,7 +274,7 @@ describe('282. aq7.js', function() {
await conn.commit ();
const queue4 = await conn.getQueue(objQueueName,
{payloadType: oracledb.DB_TYPE_JSON});
{payloadType: oracledb.DB_TYPE_JSON});
Object.assign(queue4.deqOptions,
{
navigation: oracledb.AQ_DEQ_NAV_FIRST_MSG,
@ -307,7 +307,7 @@ describe('282. aq7.js', function() {
await conn.commit ();
const queue2 = await conn.getQueue (objQueueName,
{payloadType: oracledb.DB_TYPE_JSON });
{payloadType: oracledb.DB_TYPE_JSON });
const msg = await queue2.deqOne ();
await conn.commit ();