Skip to content

Commit bd2bfd1

Browse files
author
Christopher Jones
committed
Make test DROPs use the PURGE option. Some Node version portability fixes
1 parent f3bbf90 commit bd2bfd1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+356
-283
lines changed

‎test/autoCommit.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describe('7. autoCommit.js', function() {
5050
e_table_missing EXCEPTION; \
5151
PRAGMA EXCEPTION_INIT(e_table_missing, -00942); \
5252
BEGIN \
53-
EXECUTE IMMEDIATE ('DROP TABLE nodb_commit_dept'); \
53+
EXECUTE IMMEDIATE ('DROP TABLE nodb_commit_dept purge'); \
5454
EXCEPTION \
5555
WHEN e_table_missing \
5656
THEN NULL; \
@@ -104,7 +104,7 @@ describe('7. autoCommit.js', function() {
104104
async.series([
105105
function(callback) {
106106
connection.execute(
107-
"DROP TABLE nodb_commit_dept",
107+
"DROP TABLE nodb_commit_dept purge",
108108
function(err) {
109109
should.not.exist(err);
110110
callback();

‎test/autoCommit4nestedExecutes.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ describe('63. autoCommit4nestedExecutes.js', function() {
5757
+ " e_table_missing EXCEPTION; "
5858
+ " PRAGMA EXCEPTION_INIT(e_table_missing, -00942); "
5959
+ " BEGIN "
60-
+ " EXECUTE IMMEDIATE ('DROP TABLE " + tableName + " '); "
60+
+ " EXECUTE IMMEDIATE ('DROP TABLE " + tableName + " PURGE'); "
6161
+ " EXCEPTION "
6262
+ " WHEN e_table_missing "
6363
+ " THEN NULL; "
@@ -124,7 +124,7 @@ describe('63. autoCommit4nestedExecutes.js', function() {
124124
},
125125
function(cb) {
126126
connection.execute(
127-
"DROP TABLE " + tableName,
127+
"DROP TABLE " + tableName + " PURGE",
128128
function(err) {
129129
should.not.exist(err);
130130
cb();

‎test/autoCommitForSelect.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ describe('8. autoCommitForSelect.js', function(){
4949
e_table_missing EXCEPTION; \
5050
PRAGMA EXCEPTION_INIT(e_table_missing, -00942); \
5151
BEGIN \
52-
EXECUTE IMMEDIATE ('DROP TABLE nodb_commit4_dept'); \
52+
EXECUTE IMMEDIATE ('DROP TABLE nodb_commit4_dept PURGE'); \
5353
EXCEPTION \
5454
WHEN e_table_missing \
5555
THEN NULL; \
@@ -137,7 +137,7 @@ describe('8. autoCommitForSelect.js', function(){
137137

138138
afterEach(function(done){
139139
connection.execute(
140-
'DROP TABLE nodb_commit4_dept',
140+
'DROP TABLE nodb_commit4_dept purge',
141141
function(err){
142142
if(err) { console.error(err.message); return; }
143143
done();

‎test/binding.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ describe('4. binding.js', function() {
329329
e_table_missing EXCEPTION; \
330330
PRAGMA EXCEPTION_INIT(e_table_missing, -00942); \
331331
BEGIN \
332-
EXECUTE IMMEDIATE ('DROP TABLE nodb_binding1'); \
332+
EXECUTE IMMEDIATE ('DROP TABLE nodb_binding1 PURGE'); \
333333
EXCEPTION \
334334
WHEN e_table_missing \
335335
THEN NULL; \
@@ -363,7 +363,7 @@ describe('4. binding.js', function() {
363363
afterEach(function(done) {
364364
connection.should.be.ok();
365365
connection.execute(
366-
"DROP TABLE nodb_binding1",
366+
"DROP TABLE nodb_binding1 PURGE",
367367
function(err) {
368368
should.not.exist(err);
369369
connection.release(function(err) {
@@ -436,7 +436,7 @@ describe('4. binding.js', function() {
436436
e_table_missing EXCEPTION; \
437437
PRAGMA EXCEPTION_INIT(e_table_missing, -00942); \
438438
BEGIN \
439-
EXECUTE IMMEDIATE ('DROP TABLE nodb_binding2'); \
439+
EXECUTE IMMEDIATE ('DROP TABLE nodb_binding2 PURGE'); \
440440
EXCEPTION \
441441
WHEN e_table_missing \
442442
THEN NULL; \
@@ -467,7 +467,7 @@ describe('4. binding.js', function() {
467467
afterEach(function(done) {
468468
connection.should.be.ok();
469469
connection.execute(
470-
"DROP TABLE nodb_binding2",
470+
"DROP TABLE nodb_binding2 PURGE",
471471
function(err) {
472472
should.not.exist(err);
473473
connection.release(function(err) {
@@ -719,7 +719,7 @@ describe('4. binding.js', function() {
719719
async.series([
720720
function(callback) {
721721
connection.execute(
722-
"DROP TABLE " + tableName,
722+
"DROP TABLE " + tableName + " PURGE",
723723
function(err) {
724724
should.not.exist(err);
725725
callback();
@@ -752,7 +752,7 @@ describe('4. binding.js', function() {
752752

753753
it('4.6.1 ', function(done) {
754754

755-
var sql = "begin execute immediate 'drop table does_not_exist'; "
755+
var sql = "begin execute immediate 'drop table does_not_exist purge'; "
756756
+ "exception when others then "
757757
+ "if sqlcode <> -942 then "
758758
+ "raise; "
@@ -979,7 +979,7 @@ describe('4. binding.js', function() {
979979
"AS \n" +
980980
"BEGIN \n" +
981981
" p_out1 := SYSDATE + 10; \n" +
982-
" p_out2 := TO_DATE('5-AUG-2016'); \n" +
982+
" p_out2 := TO_DATE('2016-08-05', 'YYYY-MM-DD'); \n" +
983983
"END;";
984984

985985
connection.execute(

‎test/checkClassesTypes.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ describe('61. checkClassesTypes.js', function() {
147147
},
148148
function dropTab(callback) {
149149
connection.execute(
150-
"DROP TABLE " + clobTableName,
150+
"DROP TABLE " + clobTableName + " PURGE",
151151
function(err) {
152152
should.not.exist(err);
153153
callback();

‎test/clobPlsqlString.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ describe('60. clobPlsqlString.js', function() {
7676
async.series([
7777
function(callback) {
7878
connection.execute(
79-
"DROP TABLE nodb_myclobs",
79+
"DROP TABLE nodb_myclobs purge",
8080
function(err) {
8181
should.not.exist(err);
8282
callback();

‎test/columnMetadata.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ describe('9. columnMetadata.js', function(){
7171
" e_table_missing EXCEPTION; \n" +
7272
" PRAGMA EXCEPTION_INIT(e_table_missing, -00942);\n " +
7373
" BEGIN \n" +
74-
" EXECUTE IMMEDIATE ('DROP TABLE nodb_cmd'); \n" +
74+
" EXECUTE IMMEDIATE ('DROP TABLE nodb_cmd PURGE'); \n" +
7575
" EXCEPTION \n" +
7676
" WHEN e_table_missing \n" +
7777
" THEN NULL; \n" +
@@ -109,7 +109,7 @@ describe('9. columnMetadata.js', function(){
109109

110110
after(function(done) {
111111
connection.execute(
112-
"DROP TABLE nodb_cmd",
112+
"DROP TABLE nodb_cmd PURGE",
113113
function(err) {
114114
should.not.exist(err);
115115
done();
@@ -312,7 +312,7 @@ describe('9. columnMetadata.js', function(){
312312
" e_table_missing EXCEPTION; \n" +
313313
" PRAGMA EXCEPTION_INIT(e_table_missing, -00942);\n " +
314314
" BEGIN \n" +
315-
" EXECUTE IMMEDIATE ('DROP TABLE nodb_casesensitive'); \n" +
315+
" EXECUTE IMMEDIATE ('DROP TABLE nodb_casesensitive PURGE'); \n" +
316316
" EXCEPTION \n" +
317317
" WHEN e_table_missing \n" +
318318
" THEN NULL; \n" +
@@ -347,7 +347,7 @@ describe('9. columnMetadata.js', function(){
347347
},
348348
function(callback){
349349
connection.execute(
350-
"DROP TABLE nodb_casesensitive",
350+
"DROP TABLE nodb_casesensitive PURGE",
351351
function(err){
352352
should.not.exist(err);
353353
callback();
@@ -375,14 +375,14 @@ describe('9. columnMetadata.js', function(){
375375

376376
var table_name = "nodb_large_columns";
377377
var sqlSelect = "SELECT * FROM " + table_name;
378-
var sqlDrop = "DROP TABLE " + table_name;
378+
var sqlDrop = "DROP TABLE " + table_name + " PURGE";
379379

380380
var proc = "BEGIN \n" +
381381
" DECLARE \n" +
382382
" e_table_missing EXCEPTION; \n" +
383383
" PRAGMA EXCEPTION_INIT(e_table_missing, -00942);\n " +
384384
" BEGIN \n" +
385-
" EXECUTE IMMEDIATE ('DROP TABLE nodb_large_columns'); \n" +
385+
" EXECUTE IMMEDIATE ('DROP TABLE nodb_large_columns PURGE'); \n" +
386386
" EXCEPTION \n" +
387387
" WHEN e_table_missing \n" +
388388
" THEN NULL; \n" +
@@ -440,7 +440,7 @@ describe('9. columnMetadata.js', function(){
440440
" e_table_missing EXCEPTION; \n" +
441441
" PRAGMA EXCEPTION_INIT(e_table_missing, -00942); \n" +
442442
" BEGIN \n" +
443-
" EXECUTE IMMEDIATE ('DROP TABLE " + tableName + " '); \n" +
443+
" EXECUTE IMMEDIATE ('DROP TABLE " + tableName + " PURGE'); \n" +
444444
" EXCEPTION \n" +
445445
" WHEN e_table_missing \n" +
446446
" THEN NULL; \n" +
@@ -453,7 +453,7 @@ describe('9. columnMetadata.js', function(){
453453
" '); \n" +
454454
"END; \n";
455455
var sqlSelect = "SELECT * FROM " + tableName;
456-
var sqlDrop = "DROP TABLE " + tableName;
456+
var sqlDrop = "DROP TABLE " + tableName + " PURGE";
457457

458458
async.series([
459459
function(callback) {

‎test/connection.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ describe('1. connection.js', function(){
5555
e_table_missing EXCEPTION; \
5656
PRAGMA EXCEPTION_INIT(e_table_missing, -00942); \
5757
BEGIN \
58-
EXECUTE IMMEDIATE ('DROP TABLE nodb_conn_dept1'); \
58+
EXECUTE IMMEDIATE ('DROP TABLE nodb_conn_dept1 PURGE'); \
5959
EXCEPTION \
6060
WHEN e_table_missing \
6161
THEN NULL; \
@@ -94,7 +94,7 @@ describe('1. connection.js', function(){
9494

9595
after(function(done){
9696
connection.execute(
97-
'DROP TABLE nodb_conn_dept1',
97+
'DROP TABLE nodb_conn_dept1 PURGE',
9898
function(err){
9999
if(err) { console.error(err.message); return; }
100100
connection.release( function(err) {
@@ -168,7 +168,7 @@ describe('1. connection.js', function(){
168168
e_table_missing EXCEPTION; \
169169
PRAGMA EXCEPTION_INIT(e_table_missing, -00942); \
170170
BEGIN \
171-
EXECUTE IMMEDIATE ('DROP TABLE nodb_conn_emp2'); \
171+
EXECUTE IMMEDIATE ('DROP TABLE nodb_conn_emp2 PURGE'); \
172172
EXCEPTION \
173173
WHEN e_table_missing \
174174
THEN NULL; \
@@ -215,7 +215,7 @@ describe('1. connection.js', function(){
215215

216216
after(function(done){
217217
connection.execute(
218-
'DROP TABLE nodb_conn_emp2',
218+
'DROP TABLE nodb_conn_emp2 PURGE',
219219
function(err){
220220
if(err) { console.error(err.message); return; }
221221
connection.release( function(err) {
@@ -390,7 +390,7 @@ describe('1. connection.js', function(){
390390
e_table_missing EXCEPTION; \
391391
PRAGMA EXCEPTION_INIT(e_table_missing, -00942); \
392392
BEGIN \
393-
EXECUTE IMMEDIATE ('DROP TABLE nodb_conn_emp4'); \
393+
EXECUTE IMMEDIATE ('DROP TABLE nodb_conn_emp4 PURGE'); \
394394
EXCEPTION \
395395
WHEN e_table_missing \
396396
THEN NULL; \
@@ -438,7 +438,7 @@ describe('1. connection.js', function(){
438438
afterEach('drop table and release connection', function(done) {
439439
oracledb.stmtCacheSize = defaultStmtCache;
440440
connection.execute(
441-
"DROP TABLE nodb_conn_emp4",
441+
"DROP TABLE nodb_conn_emp4 PURGE",
442442
function(err){
443443
if(err) { console.error(err.message); return; }
444444
connection.release( function(err){
@@ -540,7 +540,7 @@ describe('1. connection.js', function(){
540540
e_table_missing EXCEPTION; \
541541
PRAGMA EXCEPTION_INIT(e_table_missing, -00942); \
542542
BEGIN \
543-
EXECUTE IMMEDIATE ('DROP TABLE nodb_conn_emp5'); \
543+
EXECUTE IMMEDIATE ('DROP TABLE nodb_conn_emp5 PURGE'); \
544544
EXCEPTION \
545545
WHEN e_table_missing \
546546
THEN NULL; \
@@ -602,7 +602,7 @@ describe('1. connection.js', function(){
602602
async.series([
603603
function(callback) {
604604
conn2.execute(
605-
"DROP TABLE nodb_conn_emp5",
605+
"DROP TABLE nodb_conn_emp5 PURGE",
606606
function(err) {
607607
should.not.exist(err);
608608
callback();

‎test/dataTypeAssist.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ assist.sqlCreateTable = function(tableName)
460460
" e_table_missing EXCEPTION; " +
461461
" PRAGMA EXCEPTION_INIT(e_table_missing, -00942); " +
462462
" BEGIN " +
463-
" EXECUTE IMMEDIATE ('DROP TABLE " + tableName + " '); " +
463+
" EXECUTE IMMEDIATE ('DROP TABLE " + tableName + " PURGE'); " +
464464
" EXCEPTION " +
465465
" WHEN e_table_missing " +
466466
" THEN NULL; " +
@@ -697,7 +697,7 @@ assist.verifyNullValues = function(connection, tableName, done)
697697
},
698698
function dropTable(callback) {
699699
connection.execute(
700-
"DROP table " + tableName,
700+
"DROP table " + tableName + " PURGE",
701701
function(err) {
702702
should.not.exist(err);
703703
callback();

‎test/dataTypeBinaryDouble.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ describe('31. dataTypeBinaryDouble.js', function() {
7979

8080
after(function(done) {
8181
connection.execute(
82-
"DROP table " + tableName,
82+
"DROP table " + tableName + " PURGE",
8383
function(err) {
8484
should.not.exist(err);
8585
done();
@@ -120,7 +120,7 @@ describe('31. dataTypeBinaryDouble.js', function() {
120120

121121
after(function(done) {
122122
connection.execute(
123-
"DROP table " + tableName,
123+
"DROP table " + tableName + " PURGE",
124124
function(err) {
125125
should.not.exist(err);
126126
done();

0 commit comments

Comments
 (0)