@@ -106,8 +106,7 @@ describe('185. runCQN.js', function() {
106106 let plsql = testsUtil . sqlCreateTable ( TABLE , sql ) ;
107107 await conn . execute ( plsql ) ;
108108
109- const myCallback = async function ( message ) {
110- // console.log(message);
109+ const myCallback = function ( message ) {
111110 should . strictEqual ( message . type , oracledb . SUBSCR_EVENT_TYPE_QUERY_CHANGE ) ;
112111 should . strictEqual ( message . registered , true ) ;
113112 const table = message . queries [ 0 ] . tables [ 0 ] ;
@@ -124,16 +123,14 @@ describe('185. runCQN.js', function() {
124123 qos : oracledb . SUBSCR_QOS_QUERY | oracledb . SUBSCR_QOS_ROWIDS
125124 } ;
126125
127- await conn . subscribe ( 'mysub ' , options ) ;
126+ await conn . subscribe ( 'sub1 ' , options ) ;
128127
129128 sql = `INSERT INTO ${ TABLE } VALUES (101)` ;
130129 await conn . execute ( sql ) ;
131130
132- plsql = `BEGIN DBMS_SESSION.SLEEP(2); END;` ;
133- await conn . execute ( plsql ) ;
134131 await conn . commit ( ) ;
135132
136- await conn . unsubscribe ( 'mysub ' ) ;
133+ await conn . unsubscribe ( 'sub1 ' ) ;
137134
138135 sql = `DROP TABLE ${ TABLE } PURGE` ;
139136 await conn . execute ( sql ) ;
@@ -154,14 +151,16 @@ describe('185. runCQN.js', function() {
154151 let plsql = testsUtil . sqlCreateTable ( TABLE , sql ) ;
155152 await conn . execute ( plsql ) ;
156153
157- const myCallback = async function ( message ) {
158- console . log ( message ) ;
154+ const myCallback = function ( message ) {
159155 should . strictEqual ( message . type , oracledb . SUBSCR_EVENT_TYPE_QUERY_CHANGE ) ;
160156 should . strictEqual ( message . registered , true ) ;
161157 const table = message . queries [ 0 ] . tables [ 0 ] ;
162158 const tableName = dbconfig . user . toUpperCase ( ) + '.' + TABLE . toUpperCase ( ) ;
163159 should . strictEqual ( table . name , tableName ) ;
164- should . strictEqual ( table . operation , oracledb . CQN_OPCODE_DELETE ) ;
160+ let expect = oracledb . CQN_OPCODE_INSERT |
161+ oracledb . CQN_OPCODE_DELETE |
162+ oracledb . CQN_OPCODE_ALL_ROWS ;
163+ should . strictEqual ( expect , table . operation ) ;
165164 } ;
166165
167166 const options = {
@@ -171,12 +170,15 @@ describe('185. runCQN.js', function() {
171170 qos : oracledb . SUBSCR_QOS_QUERY
172171 } ;
173172 await conn . subscribe ( 'sub2' , options ) ;
173+ sql = `INSERT INTO ${ TABLE } VALUES (99)` ;
174+ await conn . execute ( sql ) ;
175+
176+ sql = `INSERT INTO ${ TABLE } VALUES (102)` ;
177+ await conn . execute ( sql ) ;
174178
175179 sql = `DELETE FROM ${ TABLE } WHERE k > :bv` ;
176180 await conn . execute ( sql , { bv : 100 } ) ;
177181
178- plsql = `BEGIN DBMS_SESSION.SLEEP(2); END;` ;
179- await conn . execute ( plsql ) ;
180182 await conn . commit ( ) ;
181183
182184 await conn . unsubscribe ( 'sub2' ) ;
@@ -199,16 +201,15 @@ describe('185. runCQN.js', function() {
199201 let plsql = testsUtil . sqlCreateTable ( TABLE , sql ) ;
200202 await conn . execute ( plsql ) ;
201203
202- const myCallback = async function ( message ) {
203- // console.log(message);
204+ const myCallback = function ( message ) {
204205 should . strictEqual ( message . type , oracledb . SUBSCR_EVENT_TYPE_QUERY_CHANGE ) ;
205206 should . strictEqual ( message . registered , true ) ;
206207 const table = message . queries [ 0 ] . tables [ 0 ] ;
207208 const tableName = dbconfig . user . toUpperCase ( ) + '.' + TABLE . toUpperCase ( ) ;
208209 should . strictEqual ( table . name , tableName ) ;
209210 let expect = oracledb . CQN_OPCODE_INSERT | oracledb . CQN_OPCODE_ALL_ROWS ;
210211 should . strictEqual ( table . operation , expect ) ;
211- } ;
212+ }
212213
213214 const options = {
214215 callback : myCallback ,
@@ -226,8 +227,6 @@ describe('185. runCQN.js', function() {
226227 sql = `INSERT INTO ${ TABLE } VALUES (103)` ;
227228 await conn . execute ( sql ) ;
228229
229- plsql = `BEGIN DBMS_SESSION.SLEEP(2); END;` ;
230- await conn . execute ( plsql ) ;
231230 await conn . commit ( ) ;
232231
233232 await conn . unsubscribe ( 'sub3' ) ;
@@ -242,8 +241,9 @@ describe('185. runCQN.js', function() {
242241 it ( '185.4 Negative - provide invalid SQL in CQN option' , async ( ) => {
243242 try {
244243 const TABLE = 'nodb_tab_cqn_4' ;
245- const myCallback = async function ( message ) {
246- console . log ( message ) ;
244+
245+ const myCallback = function ( message ) {
246+ should . exist ( message ) ;
247247 } ;
248248
249249 const options = {
@@ -278,8 +278,7 @@ describe('185. runCQN.js', function() {
278278 let plsql = testsUtil . sqlCreateTable ( TABLE , sql ) ;
279279 await conn . execute ( plsql ) ;
280280
281- const myCallback = async function ( message ) {
282- // console.log(message);
281+ const myCallback = function ( message ) {
283282 should . strictEqual ( message . type , oracledb . SUBSCR_EVENT_TYPE_OBJ_CHANGE ) ;
284283 should . strictEqual ( message . registered , true ) ;
285284 } ;
@@ -289,10 +288,10 @@ describe('185. runCQN.js', function() {
289288 sql : `SELECT * FROM ${ TABLE } ` ,
290289 timeout : 60 ,
291290 qos : oracledb . SUBSCR_QOS_ROWIDS ,
292- // Group notifications in batches covering 2 second
291+ // Group notifications in batches covering 1 second
293292 // intervals, and send a summary
294293 groupingClass : oracledb . SUBSCR_GROUPING_CLASS_TIME ,
295- groupingValue : 2 ,
294+ groupingValue : 1 ,
296295 groupingType : oracledb . SUBSCR_GROUPING_TYPE_SUMMARY
297296 } ;
298297
@@ -304,8 +303,6 @@ describe('185. runCQN.js', function() {
304303 await conn . execute ( sql , bindArr [ i ] , { autoCommit : true } ) ;
305304 }
306305
307- plsql = `BEGIN DBMS_SESSION.SLEEP(2); END;` ;
308- await conn . execute ( plsql ) ;
309306 await conn . commit ( ) ;
310307
311308 await conn . unsubscribe ( 'sub5' ) ;
@@ -327,8 +324,7 @@ describe('185. runCQN.js', function() {
327324 let plsql = testsUtil . sqlCreateTable ( TABLE , sql ) ;
328325 await conn . execute ( plsql ) ;
329326
330- const myCallback = async function ( message ) {
331- // console.log(message);
327+ const myCallback = function ( message ) {
332328 should . strictEqual ( message . registered , true ) ;
333329 } ;
334330
@@ -340,8 +336,6 @@ describe('185. runCQN.js', function() {
340336 qos : oracledb . SUBSCR_QOS_QUERY | oracledb . SUBSCR_QOS_ROWIDS
341337 } ;
342338
343- let sleepPLSQL = `BEGIN DBMS_SESSION.SLEEP(2); END;` ;
344- await conn . execute ( plsql ) ;
345339 await conn . commit ( ) ;
346340
347341 const result = await conn . subscribe ( 'sub6' , options ) ;
@@ -356,7 +350,6 @@ describe('185. runCQN.js', function() {
356350 sql = `INSERT INTO ${ TABLE } VALUES (101)` ;
357351 await conn . execute ( sql ) ;
358352
359- await conn . execute ( sleepPLSQL ) ;
360353 await conn . commit ( ) ;
361354
362355 await conn . unsubscribe ( 'sub6' ) ;
@@ -378,8 +371,7 @@ describe('185. runCQN.js', function() {
378371 let plsql = testsUtil . sqlCreateTable ( TABLE , sql ) ;
379372 await conn . execute ( plsql ) ;
380373
381- const myCallback = async function ( message ) {
382- // console.log(message);
374+ const myCallback = function ( message ) {
383375 should . strictEqual ( message . registered , true ) ;
384376 } ;
385377
@@ -396,8 +388,6 @@ describe('185. runCQN.js', function() {
396388 sql = `INSERT INTO ${ TABLE } VALUES (101)` ;
397389 await conn . execute ( sql ) ;
398390
399- plsql = `BEGIN DBMS_SESSION.SLEEP(2); END;` ;
400- await conn . execute ( plsql ) ;
401391 await conn . commit ( ) ;
402392
403393 await conn . unsubscribe ( 'sub7' ) ;
@@ -432,12 +422,13 @@ describe('185. runCQN.js', function() {
432422 }
433423 } ) ; // 185.8
434424
435- // An variation of 185.4
425+ // A variation of 185.4
436426 it ( '185.9 Negative - unsubscribe the invalid subscription' , async ( ) => {
437427 try {
438428 const TABLE = 'nodb_tab_cqn_9' ;
439- const myCallback = async function ( message ) {
440- console . log ( message ) ;
429+
430+ const myCallback = function ( message ) {
431+ should . strictEqual ( message . registered , true ) ;
441432 } ;
442433
443434 const options = {
@@ -463,4 +454,4 @@ describe('185. runCQN.js', function() {
463454 }
464455 } ) ; // 185.9
465456
466- } ) ;
457+ } ) ;
0 commit comments