Skip to content

Commit cee1065

Browse files
committed
Fix some diffs with Node 0.10 (yes!)
1 parent 280863c commit cee1065

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

test/blobDMLBindAsBuffer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ var async = require('async');
3939
var dbConfig = require('./dbconfig.js');
4040
var random = require('./random.js');
4141
var fs = require('fs');
42+
var assist = require('./dataTypeAssist.js');
4243

4344
describe('80.blobDMLBindAsBuffer.js', function() {
4445
this.timeout(100000);
@@ -187,13 +188,13 @@ describe('80.blobDMLBindAsBuffer.js', function() {
187188
lob.on('end', function() {
188189
if(originalBuffer == "EMPTY_BLOB") {
189190
var nullBuffer = node6plus ? Buffer.from('', "utf-8") : new Buffer('', "utf-8");
190-
should.strictEqual(blobData.equals(nullBuffer), true);
191+
should.strictEqual(assist.compare2Buffers(blobData, nullBuffer), true);
191192
} else {
192193
should.strictEqual(totalLength, originalBuffer.length);
193194
var specStrLength = specialStr.length;
194195
should.strictEqual(blobData.toString('utf8', 0, specStrLength), specialStr);
195196
should.strictEqual(blobData.toString('utf8', (totalLength - specStrLength), totalLength), specialStr);
196-
should.strictEqual(blobData.equals(originalBuffer), true);
197+
should.strictEqual(assist.compare2Buffers(blobData, originalBuffer), true);
197198
}
198199
return callback();
199200
});

test/dataTypeAssist.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */
1+
/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. */
22

33
/******************************************************************************
44
*
@@ -379,6 +379,21 @@ assist.createBuffer = function(size) {
379379
return new Buffer(array);
380380
};
381381

382+
assist.compare2Buffers = function(originalBuf, compareBuf) {
383+
var node01113plus = true; // assume node runtime version is higher than 0.11.13
384+
var nodeVer = process.versions["node"].split(".");
385+
if(nodeVer[0] === "0" && nodeVer[1] === "11" && nodeVer[2] < "13") {
386+
node01113plus = false;
387+
} else if(nodeVer[0] === "0" && nodeVer[1] < "11"){
388+
node01113plus = false;
389+
}
390+
if(node01113plus === true) {
391+
return originalBuf.equals(compareBuf);
392+
} else {
393+
return (originalBuf.toString('utf8') === compareBuf.toString('utf8'));
394+
}
395+
};
396+
382397
assist.setUp = function(connection, tableName, array, done)
383398
{
384399
async.series([

test/fetchBlobAsBuffer.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ var should = require('should');
4040
var fs = require('fs');
4141
var dbConfig = require('./dbconfig.js');
4242
var random = require('./random.js');
43+
var assist = require('./dataTypeAssist.js');
4344

4445
describe('83. fetchBlobAsBuffer.js', function() {
4546
this.timeout(100000);
@@ -277,7 +278,7 @@ describe('83. fetchBlobAsBuffer.js', function() {
277278
// compare two buffers
278279
var compareBuffers = function(resultVal, specialStr, content, contentLength) {
279280
should.equal(resultVal.length, contentLength);
280-
var compareBuffer = resultVal.equals(content);
281+
var compareBuffer = assist.compare2Buffers(resultVal, content);
281282
should.strictEqual(compareBuffer, true);
282283
};
283284

0 commit comments

Comments
 (0)