Skip to content

Commit a48e685

Browse files
cjbjcjbj
committed
Update tests to use different table names in different tests for test portability
1 parent 4a2aeb5 commit a48e685

12 files changed

+249
-252
lines changed

‎test/autoCommit.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ 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_departments'); \
53+
EXECUTE IMMEDIATE ('DROP TABLE nodb_commit_dept'); \
5454
EXCEPTION \
5555
WHEN e_table_missing \
5656
THEN NULL; \
5757
END; \
5858
EXECUTE IMMEDIATE (' \
59-
CREATE TABLE nodb_departments ( \
59+
CREATE TABLE nodb_commit_dept ( \
6060
department_id NUMBER, \
6161
department_name VARCHAR2(20) \
6262
) \
@@ -105,7 +105,7 @@ describe('7. autoCommit.js', function() {
105105
async.series([
106106
function(callback) {
107107
connection.execute(
108-
"DROP TABLE nodb_departments",
108+
"DROP TABLE nodb_commit_dept",
109109
function(err) {
110110
should.not.exist(err);
111111
callback();
@@ -131,7 +131,7 @@ describe('7. autoCommit.js', function() {
131131
oracledb.autoCommit = false; /* Restore to default value */
132132

133133
connection.execute(
134-
"TRUNCATE TABLE nodb_departments",
134+
"TRUNCATE TABLE nodb_commit_dept",
135135
function(err) {
136136
should.not.exist(err);
137137
done();
@@ -157,7 +157,7 @@ describe('7. autoCommit.js', function() {
157157
},
158158
function(callback) {
159159
conn1.execute(
160-
"INSERT INTO nodb_departments VALUES (82, 'Security')",
160+
"INSERT INTO nodb_commit_dept VALUES (82, 'Security')",
161161
function(err) {
162162
should.not.exist(err);
163163
callback();
@@ -175,7 +175,7 @@ describe('7. autoCommit.js', function() {
175175
},
176176
function(callback) {
177177
conn2.execute(
178-
"SELECT department_id FROM nodb_departments WHERE department_name = 'Security'",
178+
"SELECT department_id FROM nodb_commit_dept WHERE department_name = 'Security'",
179179
[],
180180
{ outFormat: oracledb.OBJECT },
181181
function(err, result) {
@@ -187,7 +187,7 @@ describe('7. autoCommit.js', function() {
187187
},
188188
function(callback) {
189189
conn1.execute(
190-
"UPDATE nodb_departments SET department_id = 101 WHERE department_name = 'Security'",
190+
"UPDATE nodb_commit_dept SET department_id = 101 WHERE department_name = 'Security'",
191191
function(err){
192192
should.not.exist(err);
193193
callback();
@@ -196,7 +196,7 @@ describe('7. autoCommit.js', function() {
196196
},
197197
function(callback) {
198198
conn2.execute(
199-
"SELECT department_id FROM nodb_departments WHERE department_name = 'Security'",
199+
"SELECT department_id FROM nodb_commit_dept WHERE department_name = 'Security'",
200200
[],
201201
{ outFormat: oracledb.OBJECT },
202202
function(err, result) {
@@ -238,7 +238,7 @@ describe('7. autoCommit.js', function() {
238238
function(callback) {
239239
oracledb.autoCommit = true; // change autoCommit after connection
240240
conn1.execute(
241-
"INSERT INTO nodb_departments VALUES (82, 'Security')",
241+
"INSERT INTO nodb_commit_dept VALUES (82, 'Security')",
242242
function(err) {
243243
should.not.exist(err);
244244
callback();
@@ -256,7 +256,7 @@ describe('7. autoCommit.js', function() {
256256
},
257257
function(callback) {
258258
conn2.execute(
259-
"SELECT department_id FROM nodb_departments WHERE department_name = 'Security'",
259+
"SELECT department_id FROM nodb_commit_dept WHERE department_name = 'Security'",
260260
[],
261261
{ outFormat: oracledb.OBJECT },
262262
function(err, result) {
@@ -268,7 +268,7 @@ describe('7. autoCommit.js', function() {
268268
},
269269
function(callback) {
270270
conn1.execute(
271-
"UPDATE nodb_departments SET department_id = 101 WHERE department_name = 'Security'",
271+
"UPDATE nodb_commit_dept SET department_id = 101 WHERE department_name = 'Security'",
272272
function(err){
273273
should.not.exist(err);
274274
callback();
@@ -277,7 +277,7 @@ describe('7. autoCommit.js', function() {
277277
},
278278
function(callback) {
279279
conn2.execute(
280-
"SELECT department_id FROM nodb_departments WHERE department_name = 'Security'",
280+
"SELECT department_id FROM nodb_commit_dept WHERE department_name = 'Security'",
281281
[],
282282
{ outFormat: oracledb.OBJECT },
283283
function(err, result) {
@@ -318,7 +318,7 @@ describe('7. autoCommit.js', function() {
318318
},
319319
function(callback) {
320320
conn1.execute(
321-
"INSERT INTO nodb_departments VALUES (82, 'Security')",
321+
"INSERT INTO nodb_commit_dept VALUES (82, 'Security')",
322322
function(err) {
323323
should.not.exist(err);
324324
callback();
@@ -337,7 +337,7 @@ describe('7. autoCommit.js', function() {
337337
function(callback) {
338338
oracledb.autoCommit = true; // change autoCommit after connection
339339
conn2.execute(
340-
"SELECT department_id FROM nodb_departments WHERE department_name = 'Security'",
340+
"SELECT department_id FROM nodb_commit_dept WHERE department_name = 'Security'",
341341
[],
342342
{ outFormat: oracledb.OBJECT },
343343
function(err, result) {
@@ -349,7 +349,7 @@ describe('7. autoCommit.js', function() {
349349
},
350350
function(callback) {
351351
conn2.execute(
352-
"INSERT INTO nodb_departments VALUES (99, 'Marketing')",
352+
"INSERT INTO nodb_commit_dept VALUES (99, 'Marketing')",
353353
function(err) {
354354
should.not.exist(err);
355355
callback();
@@ -358,7 +358,7 @@ describe('7. autoCommit.js', function() {
358358
},
359359
function(callback) {
360360
conn2.execute(
361-
"SELECT COUNT(*) as amount FROM nodb_departments",
361+
"SELECT COUNT(*) as amount FROM nodb_commit_dept",
362362
[],
363363
{ outFormat: oracledb.OBJECT },
364364
function(err, result) {
@@ -370,7 +370,7 @@ describe('7. autoCommit.js', function() {
370370
},
371371
function(callback) {
372372
conn1.execute(
373-
"SELECT COUNT(*) as amount FROM nodb_departments",
373+
"SELECT COUNT(*) as amount FROM nodb_commit_dept",
374374
[],
375375
{ outFormat: oracledb.OBJECT },
376376
function(err, result) {

‎test/autoCommitForSelect.js

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,24 @@ 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_departments'); \
52+
EXECUTE IMMEDIATE ('DROP TABLE nodb_commit4_dept'); \
5353
EXCEPTION \
5454
WHEN e_table_missing \
5555
THEN NULL; \
5656
END; \
5757
EXECUTE IMMEDIATE (' \
58-
CREATE TABLE nodb_departments ( \
58+
CREATE TABLE nodb_commit4_dept ( \
5959
department_id NUMBER, \
6060
department_name VARCHAR2(20) \
6161
) \
6262
'); \
6363
EXECUTE IMMEDIATE (' \
64-
INSERT INTO nodb_departments \
64+
INSERT INTO nodb_commit4_dept \
6565
(department_id, department_name) VALUES \
6666
(40,''Human Resources'') \
6767
'); \
6868
EXECUTE IMMEDIATE (' \
69-
INSERT INTO nodb_departments \
69+
INSERT INTO nodb_commit4_dept \
7070
(department_id, department_name) VALUES \
7171
(20, ''Marketing'') \
7272
'); \
@@ -122,7 +122,7 @@ describe('8. autoCommitForSelect.js', function(){
122122

123123
afterEach(function(done){
124124
connection.execute(
125-
'DROP TABLE nodb_departments',
125+
'DROP TABLE nodb_commit4_dept',
126126
function(err){
127127
if(err) { console.error(err.message); return; }
128128
done();
@@ -137,7 +137,7 @@ describe('8. autoCommitForSelect.js', function(){
137137
async.series([
138138
function(callback){
139139
connection.execute(
140-
"INSERT INTO nodb_departments VALUES (180, 'Construction')",
140+
"INSERT INTO nodb_commit4_dept VALUES (180, 'Construction')",
141141
function(err){
142142
should.not.exist(err);
143143
callback();
@@ -146,7 +146,7 @@ describe('8. autoCommitForSelect.js', function(){
146146
},
147147
function(callback){
148148
connection.execute(
149-
"UPDATE nodb_departments SET department_id = 99 WHERE department_name = 'Marketing'",
149+
"UPDATE nodb_commit4_dept SET department_id = 99 WHERE department_name = 'Marketing'",
150150
function(err){
151151
should.not.exist(err);
152152
callback();
@@ -155,7 +155,7 @@ describe('8. autoCommitForSelect.js', function(){
155155
},
156156
function(callback){
157157
connection.execute(
158-
"SELECT * FROM nodb_departments ORDER BY department_id",
158+
"SELECT * FROM nodb_commit4_dept ORDER BY department_id",
159159
function(err, result){
160160
should.not.exist(err);
161161
(result.rows).should.containEql([180, 'Construction']);
@@ -165,7 +165,7 @@ describe('8. autoCommitForSelect.js', function(){
165165
},
166166
function(callback){
167167
anotherConnection.execute(
168-
"SELECT * FROM nodb_departments ORDER BY department_id",
168+
"SELECT * FROM nodb_commit4_dept ORDER BY department_id",
169169
function(err, result){
170170
should.not.exist(err);
171171
(result.rows).should.not.containEql([180, 'Construction']);
@@ -175,7 +175,7 @@ describe('8. autoCommitForSelect.js', function(){
175175
},
176176
function(callback){
177177
connection.execute(
178-
"SELECT department_id FROM nodb_departments WHERE department_name = 'Marketing'",
178+
"SELECT department_id FROM nodb_commit4_dept WHERE department_name = 'Marketing'",
179179
function(err, result){
180180
should.not.exist(err);
181181
(result.rows[0][0]).should.eql(99);
@@ -185,7 +185,7 @@ describe('8. autoCommitForSelect.js', function(){
185185
},
186186
function(callback){
187187
anotherConnection.execute(
188-
"SELECT department_id FROM nodb_departments WHERE department_name = 'Marketing'",
188+
"SELECT department_id FROM nodb_commit4_dept WHERE department_name = 'Marketing'",
189189
function(err, result){
190190
should.not.exist(err);
191191
(result.rows[0][0]).should.eql(20);
@@ -203,7 +203,7 @@ describe('8. autoCommitForSelect.js', function(){
203203
async.series([
204204
function(callback){
205205
connection.execute(
206-
"INSERT INTO nodb_departments VALUES (180, 'Construction')",
206+
"INSERT INTO nodb_commit4_dept VALUES (180, 'Construction')",
207207
function(err){
208208
should.not.exist(err);
209209
callback();
@@ -212,7 +212,7 @@ describe('8. autoCommitForSelect.js', function(){
212212
},
213213
function(callback){
214214
connection.execute(
215-
"UPDATE nodb_departments SET department_id = 99 WHERE department_name = 'Marketing'",
215+
"UPDATE nodb_commit4_dept SET department_id = 99 WHERE department_name = 'Marketing'",
216216
function(err){
217217
should.not.exist(err);
218218
callback();
@@ -227,7 +227,7 @@ describe('8. autoCommitForSelect.js', function(){
227227
},
228228
function(callback){
229229
connection.execute(
230-
"SELECT * FROM nodb_departments ORDER BY department_id",
230+
"SELECT * FROM nodb_commit4_dept ORDER BY department_id",
231231
function(err, result){
232232
should.not.exist(err);
233233
(result.rows).should.containEql([180, 'Construction']);
@@ -237,7 +237,7 @@ describe('8. autoCommitForSelect.js', function(){
237237
},
238238
function(callback){
239239
anotherConnection.execute(
240-
"SELECT * FROM nodb_departments ORDER BY department_id",
240+
"SELECT * FROM nodb_commit4_dept ORDER BY department_id",
241241
function(err, result){
242242
should.not.exist(err);
243243
(result.rows).should.containEql([180, 'Construction']);
@@ -247,7 +247,7 @@ describe('8. autoCommitForSelect.js', function(){
247247
},
248248
function(callback){
249249
connection.execute(
250-
"SELECT department_id FROM nodb_departments WHERE department_name = 'Marketing'",
250+
"SELECT department_id FROM nodb_commit4_dept WHERE department_name = 'Marketing'",
251251
function(err, result){
252252
should.not.exist(err);
253253
(result.rows[0][0]).should.eql(99);
@@ -257,7 +257,7 @@ describe('8. autoCommitForSelect.js', function(){
257257
},
258258
function(callback){
259259
anotherConnection.execute(
260-
"SELECT department_id FROM nodb_departments WHERE department_name = 'Marketing'",
260+
"SELECT department_id FROM nodb_commit4_dept WHERE department_name = 'Marketing'",
261261
function(err, result){
262262
should.not.exist(err);
263263
(result.rows[0][0]).should.eql(99);
@@ -275,7 +275,7 @@ describe('8. autoCommitForSelect.js', function(){
275275
async.series([
276276
function(callback){
277277
connection.execute(
278-
"INSERT INTO nodb_departments VALUES (180, 'Construction')",
278+
"INSERT INTO nodb_commit4_dept VALUES (180, 'Construction')",
279279
function(err){
280280
should.not.exist(err);
281281
callback();
@@ -284,7 +284,7 @@ describe('8. autoCommitForSelect.js', function(){
284284
},
285285
function(callback){
286286
connection.execute(
287-
"UPDATE nodb_departments SET department_id = 99 WHERE department_name = 'Marketing'",
287+
"UPDATE nodb_commit4_dept SET department_id = 99 WHERE department_name = 'Marketing'",
288288
function(err){
289289
should.not.exist(err);
290290
callback();
@@ -299,7 +299,7 @@ describe('8. autoCommitForSelect.js', function(){
299299
},
300300
function(callback){
301301
connection.execute(
302-
"SELECT * FROM nodb_departments ORDER BY department_id",
302+
"SELECT * FROM nodb_commit4_dept ORDER BY department_id",
303303
{},
304304
{autoCommit: true},
305305
function(err, result){
@@ -311,7 +311,7 @@ describe('8. autoCommitForSelect.js', function(){
311311
},
312312
function(callback){
313313
anotherConnection.execute(
314-
"SELECT * FROM nodb_departments ORDER BY department_id",
314+
"SELECT * FROM nodb_commit4_dept ORDER BY department_id",
315315
function(err, result){
316316
should.not.exist(err);
317317
(result.rows).should.containEql([180, 'Construction']);
@@ -321,7 +321,7 @@ describe('8. autoCommitForSelect.js', function(){
321321
},
322322
function(callback){
323323
connection.execute(
324-
"SELECT department_id FROM nodb_departments WHERE department_name = 'Marketing'",
324+
"SELECT department_id FROM nodb_commit4_dept WHERE department_name = 'Marketing'",
325325
function(err, result){
326326
should.not.exist(err);
327327
(result.rows[0][0]).should.eql(99);
@@ -331,7 +331,7 @@ describe('8. autoCommitForSelect.js', function(){
331331
},
332332
function(callback){
333333
anotherConnection.execute(
334-
"SELECT department_id FROM nodb_departments WHERE department_name = 'Marketing'",
334+
"SELECT department_id FROM nodb_commit4_dept WHERE department_name = 'Marketing'",
335335
function(err, result){
336336
should.not.exist(err);
337337
(result.rows[0][0]).should.eql(99);

0 commit comments

Comments
 (0)