Skip to content

Commit 15f10c1

Browse files
committed
Import Buffer and process modules consistently as per PR #1559of Sławomir Osoba
1 parent 913247c commit 15f10c1

26 files changed

+44
-12
lines changed

doc/src/release_notes.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ node-oracledb `v6.0.1 <https://github.com/oracle/node-oracledb/compare/v6.0.0...
2121
#) Added clear error message when an attempt is made to establish a connection
2222
with an unsupported database version in Thin mode.
2323

24+
#) The buffer and process modules are now imported consistently instead of
25+
relying on global variable definitions, as suggested by Sławomir Osoba in
26+
`GitHub pull request #1559
27+
<https://github.com/oracle/node-oracledb/pull/1559>`__.
28+
29+
2430
node-oracledb `v6.0.0 <https://github.com/oracle/node-oracledb/compare/v5.5.0...v6.0.0>`__ (24 May 2023)
2531
--------------------------------------------------------------------------------------------------------
2632

lib/aqDeqOptions.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2019, 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2019, 2023, Oracle and/or its affiliates.
22

33
//-----------------------------------------------------------------------------
44
//
@@ -26,6 +26,7 @@
2626

2727
'use strict';
2828

29+
const { Buffer } = require('buffer');
2930
const constants = require('./constants.js');
3031
const errors = require('./errors.js');
3132

lib/aqQueue.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
'use strict';
2828

29+
const { Buffer } = require('buffer');
2930
const constants = require('./constants.js');
3031
const errors = require('./errors.js');
3132
const nodbUtil = require('./util.js');

lib/connection.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
const AqQueue = require('./aqQueue.js');
3030
const BaseDbObject = require('./dbObject.js');
31+
const { Buffer } = require('buffer');
3132
const Lob = require('./lob.js');
3233
const ResultSet = require('./resultset.js');
3334
const SodaDatabase = require('./sodaDatabase.js');
@@ -36,6 +37,7 @@ const QueryStream = require('./queryStream.js');
3637
const errors = require('./errors.js');
3738
const nodbUtil = require('./util.js');
3839
const impl = require('./impl');
40+
const process = require('process');
3941
const util = require('util');
4042
const constants = require('./constants.js');
4143
const settings = require('./settings.js');

lib/lob.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
'use strict';
2828

29+
const { Buffer } = require('buffer');
2930
const { Duplex } = require('stream');
3031
const constants = require('./constants.js');
3132
const errors = require('./errors.js');

lib/oracledb.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ const nodbUtil = require('./util.js');
3131
const errors = require('./errors.js');
3232
const types = require('./types.js');
3333
const impl = require('./impl');
34+
const process = require('process');
3435
const util = require('util');
3536

3637
// This version of node-oracledb works with Node.js 14.6 or later.
@@ -68,7 +69,6 @@ const defaultPoolAlias = 'default';
6869
let _initOracleClientArgs;
6970
let _thinDriverInitialized = false;
7071

71-
7272
// Load the Oracledb binary
7373
function _initCLib() {
7474
/*global __non_webpack_require__*/ // quieten eslint

lib/poolStatistics.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
'use strict';
2828

29+
const process = require('process');
2930
const settings = require('./settings.js');
3031

3132
//-----------------------------------------------------------------------------

lib/queryStream.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2015, 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2015, 2023, Oracle and/or its affiliates.
22

33
//-----------------------------------------------------------------------------
44
//
@@ -26,6 +26,7 @@
2626

2727
'use strict';
2828

29+
const process = require('process');
2930
const { Readable } = require('stream');
3031

3132
class QueryStream extends Readable {

lib/sodaDatabase.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
'use strict';
2828

29+
const { Buffer } = require('buffer');
2930
const SodaCollection = require('./sodaCollection.js');
3031
const SodaDocument = require('./sodaDocument.js');
3132
const errors = require('./errors.js');

lib/thin/connection.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
'use strict';
2828

29+
const { Buffer } = require('buffer');
2930
const ConnectionImpl = require('../impl/connection.js');
3031
const ThinResultSetImpl = require('./resultSet.js');
3132
const ThinLobImpl = require("./lob.js");
@@ -36,6 +37,7 @@ const { Statement } = require("./statement");
3637
const thinUtil = require('./util');
3738
const sqlNetConstants = require('./sqlnet/constants.js');
3839
const constants = require('./protocol/constants.js');
40+
const process = require('process');
3941
const types = require('../types.js');
4042
const errors = require("../errors.js");
4143
const messages = require('./protocol/messages');

0 commit comments

Comments
 (0)