knex - npm Package Compare versions
Comparing version 0.95.12-rc1 to 0.95.12-rc2
@@ -431,2 +431,6 @@ const { Pool, TimeoutError } = require('tarn'); | ||
| } | ||
| processPassedConnection(connection) { | ||
| // Default implementation is noop | ||
| } | ||
| } | ||
@@ -433,0 +437,0 @@ |
| // Oracledb Client | ||
| // ------- | ||
| const { promisify } = require('util'); | ||
| const stream = require('stream'); | ||
| const each = require('lodash/each'); | ||
@@ -15,3 +13,7 @@ const flatten = require('lodash/flatten'); | ||
| const ColumnCompiler = require('./schema/oracledb-columncompiler'); | ||
| const { BlobHelper, ReturningHelper, isConnectionError } = require('./utils'); | ||
| const { | ||
| BlobHelper, | ||
| ReturningHelper, | ||
| monkeyPatchConnection, | ||
| } = require('./utils'); | ||
| const Transaction = require('./transaction'); | ||
@@ -143,137 +145,4 @@ const Client_Oracle = require('../oracle'); | ||
| } | ||
| connection.commitAsync = function () { | ||
| return new Promise((commitResolve, commitReject) => { | ||
| this.commit(function (err) { | ||
| if (err) { | ||
| return commitReject(err); | ||
| } | ||
| commitResolve(); | ||
| }); | ||
| }); | ||
| }; | ||
| connection.rollbackAsync = function () { | ||
| return new Promise((rollbackResolve, rollbackReject) => { | ||
| this.rollback(function (err) { | ||
| if (err) { | ||
| return rollbackReject(err); | ||
| } | ||
| rollbackResolve(); | ||
| }); | ||
| }); | ||
| }; | ||
| const fetchAsync = promisify(function (sql, bindParams, options, cb) { | ||
| options = options || {}; | ||
| options.outFormat = | ||
| client.driver.OUT_FORMAT_OBJECT || client.driver.OBJECT; | ||
| if (!options.outFormat) { | ||
| throw new Error('not found oracledb.outFormat constants'); | ||
| } | ||
| if (options.resultSet) { | ||
| connection.execute( | ||
| sql, | ||
| bindParams || [], | ||
| options, | ||
| function (err, result) { | ||
| if (err) { | ||
| if (isConnectionError(err)) { | ||
| connection.close().catch(function (err) {}); | ||
| connection.__knex__disposed = err; | ||
| } | ||
| return cb(err); | ||
| } | ||
| const fetchResult = { rows: [], resultSet: result.resultSet }; | ||
| const numRows = 100; | ||
| const fetchRowsFromRS = function ( | ||
| connection, | ||
| resultSet, | ||
| numRows | ||
| ) { | ||
| resultSet.getRows(numRows, function (err, rows) { | ||
| if (err) { | ||
| if (isConnectionError(err)) { | ||
| connection.close().catch(function (err) {}); | ||
| connection.__knex__disposed = err; | ||
| } | ||
| resultSet.close(function () { | ||
| return cb(err); | ||
| }); | ||
| } else if (rows.length === 0) { | ||
| return cb(null, fetchResult); | ||
| } else if (rows.length > 0) { | ||
| if (rows.length === numRows) { | ||
| fetchResult.rows = fetchResult.rows.concat(rows); | ||
| fetchRowsFromRS(connection, resultSet, numRows); | ||
| } else { | ||
| fetchResult.rows = fetchResult.rows.concat(rows); | ||
| return cb(null, fetchResult); | ||
| } | ||
| } | ||
| }); | ||
| }; | ||
| fetchRowsFromRS(connection, result.resultSet, numRows); | ||
| } | ||
| ); | ||
| } else { | ||
| connection.execute( | ||
| sql, | ||
| bindParams || [], | ||
| options, | ||
| function (err, result) { | ||
| if (err) { | ||
| // dispose the connection on connection error | ||
| if (isConnectionError(err)) { | ||
| connection.close().catch(function (err) {}); | ||
| connection.__knex__disposed = err; | ||
| } | ||
| return cb(err); | ||
| } | ||
| monkeyPatchConnection(connection, client); | ||
| return cb(null, result); | ||
| } | ||
| ); | ||
| } | ||
| }); | ||
| connection.executeAsync = function (sql, bindParams, options) { | ||
| // Read all lob | ||
| return fetchAsync(sql, bindParams, options).then(async (results) => { | ||
| const closeResultSet = () => { | ||
| return results.resultSet | ||
| ? promisify(results.resultSet.close).call(results.resultSet) | ||
| : Promise.resolve(); | ||
| }; | ||
| // Collect LOBs to read | ||
| const lobs = []; | ||
| if (results.rows) { | ||
| if (Array.isArray(results.rows)) { | ||
| for (let i = 0; i < results.rows.length; i++) { | ||
| // Iterate through the rows | ||
| const row = results.rows[i]; | ||
| for (const column in row) { | ||
| if (row[column] instanceof stream.Readable) { | ||
| lobs.push({ index: i, key: column, stream: row[column] }); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| try { | ||
| for (const lob of lobs) { | ||
| // todo should be fetchAsString/fetchAsBuffer polyfill only | ||
| results.rows[lob.index][lob.key] = await lobProcessing( | ||
| lob.stream | ||
| ); | ||
| } | ||
| } catch (e) { | ||
| await closeResultSet().catch(() => {}); | ||
| throw e; | ||
| } | ||
| await closeResultSet(); | ||
| return results; | ||
| }); | ||
| }; | ||
| resolver(connection); | ||
@@ -427,2 +296,6 @@ }); | ||
| } | ||
| processPassedConnection(connection) { | ||
| monkeyPatchConnection(connection, this); | ||
| } | ||
| } | ||
@@ -450,57 +323,2 @@ | ||
| /** | ||
| * @param stream | ||
| * @param {'string' | 'buffer'} type | ||
| */ | ||
| function readStream(stream, type) { | ||
| return new Promise((resolve, reject) => { | ||
| let data = type === 'string' ? '' : Buffer.alloc(0); | ||
| stream.on('error', function (err) { | ||
| reject(err); | ||
| }); | ||
| stream.on('data', function (chunk) { | ||
| if (type === 'string') { | ||
| data += chunk; | ||
| } else { | ||
| data = Buffer.concat([data, chunk]); | ||
| } | ||
| }); | ||
| stream.on('end', function () { | ||
| resolve(data); | ||
| }); | ||
| }); | ||
| } | ||
| const lobProcessing = function (stream) { | ||
| const oracledb = require('oracledb'); | ||
| /** | ||
| * @type 'string' | 'buffer' | ||
| */ | ||
| let type; | ||
| if (stream.type) { | ||
| // v1.2-v4 | ||
| if (stream.type === oracledb.BLOB) { | ||
| type = 'buffer'; | ||
| } else if (stream.type === oracledb.CLOB) { | ||
| type = 'string'; | ||
| } | ||
| } else if (stream.iLob) { | ||
| // v1 | ||
| if (stream.iLob.type === oracledb.CLOB) { | ||
| type = 'string'; | ||
| } else if (stream.iLob.type === oracledb.BLOB) { | ||
| type = 'buffer'; | ||
| } | ||
| } else { | ||
| throw new Error('Unrecognized oracledb lob stream type'); | ||
| } | ||
| if (type === 'string') { | ||
| stream.setEncoding('utf-8'); | ||
| } | ||
| return readStream(stream, type); | ||
| }; | ||
| module.exports = Client_Oracledb; |
| const Utils = require('../oracle/utils'); | ||
| const { promisify } = require('util'); | ||
| const stream = require('stream'); | ||
@@ -13,3 +15,195 @@ function BlobHelper(columnName, value) { | ||
| /** | ||
| * @param stream | ||
| * @param {'string' | 'buffer'} type | ||
| */ | ||
| function readStream(stream, type) { | ||
| return new Promise((resolve, reject) => { | ||
| let data = type === 'string' ? '' : Buffer.alloc(0); | ||
| stream.on('error', function (err) { | ||
| reject(err); | ||
| }); | ||
| stream.on('data', function (chunk) { | ||
| if (type === 'string') { | ||
| data += chunk; | ||
| } else { | ||
| data = Buffer.concat([data, chunk]); | ||
| } | ||
| }); | ||
| stream.on('end', function () { | ||
| resolve(data); | ||
| }); | ||
| }); | ||
| } | ||
| const lobProcessing = function (stream) { | ||
| const oracledb = require('oracledb'); | ||
| /** | ||
| * @type 'string' | 'buffer' | ||
| */ | ||
| let type; | ||
| if (stream.type) { | ||
| // v1.2-v4 | ||
| if (stream.type === oracledb.BLOB) { | ||
| type = 'buffer'; | ||
| } else if (stream.type === oracledb.CLOB) { | ||
| type = 'string'; | ||
| } | ||
| } else if (stream.iLob) { | ||
| // v1 | ||
| if (stream.iLob.type === oracledb.CLOB) { | ||
| type = 'string'; | ||
| } else if (stream.iLob.type === oracledb.BLOB) { | ||
| type = 'buffer'; | ||
| } | ||
| } else { | ||
| throw new Error('Unrecognized oracledb lob stream type'); | ||
| } | ||
| if (type === 'string') { | ||
| stream.setEncoding('utf-8'); | ||
| } | ||
| return readStream(stream, type); | ||
| }; | ||
| function monkeyPatchConnection(connection, client) { | ||
| // Connection is already monkey-patched | ||
| if (connection.executeAsync) { | ||
| return; | ||
| } | ||
| connection.commitAsync = function () { | ||
| return new Promise((commitResolve, commitReject) => { | ||
| this.commit(function (err) { | ||
| if (err) { | ||
| return commitReject(err); | ||
| } | ||
| commitResolve(); | ||
| }); | ||
| }); | ||
| }; | ||
| connection.rollbackAsync = function () { | ||
| return new Promise((rollbackResolve, rollbackReject) => { | ||
| this.rollback(function (err) { | ||
| if (err) { | ||
| return rollbackReject(err); | ||
| } | ||
| rollbackResolve(); | ||
| }); | ||
| }); | ||
| }; | ||
| const fetchAsync = promisify(function (sql, bindParams, options, cb) { | ||
| options = options || {}; | ||
| options.outFormat = client.driver.OUT_FORMAT_OBJECT || client.driver.OBJECT; | ||
| if (!options.outFormat) { | ||
| throw new Error('not found oracledb.outFormat constants'); | ||
| } | ||
| if (options.resultSet) { | ||
| connection.execute( | ||
| sql, | ||
| bindParams || [], | ||
| options, | ||
| function (err, result) { | ||
| if (err) { | ||
| if (Utils.isConnectionError(err)) { | ||
| connection.close().catch(function (err) {}); | ||
| connection.__knex__disposed = err; | ||
| } | ||
| return cb(err); | ||
| } | ||
| const fetchResult = { rows: [], resultSet: result.resultSet }; | ||
| const numRows = 100; | ||
| const fetchRowsFromRS = function (connection, resultSet, numRows) { | ||
| resultSet.getRows(numRows, function (err, rows) { | ||
| if (err) { | ||
| if (Utils.isConnectionError(err)) { | ||
| connection.close().catch(function (err) {}); | ||
| connection.__knex__disposed = err; | ||
| } | ||
| resultSet.close(function () { | ||
| return cb(err); | ||
| }); | ||
| } else if (rows.length === 0) { | ||
| return cb(null, fetchResult); | ||
| } else if (rows.length > 0) { | ||
| if (rows.length === numRows) { | ||
| fetchResult.rows = fetchResult.rows.concat(rows); | ||
| fetchRowsFromRS(connection, resultSet, numRows); | ||
| } else { | ||
| fetchResult.rows = fetchResult.rows.concat(rows); | ||
| return cb(null, fetchResult); | ||
| } | ||
| } | ||
| }); | ||
| }; | ||
| fetchRowsFromRS(connection, result.resultSet, numRows); | ||
| } | ||
| ); | ||
| } else { | ||
| connection.execute( | ||
| sql, | ||
| bindParams || [], | ||
| options, | ||
| function (err, result) { | ||
| if (err) { | ||
| // dispose the connection on connection error | ||
| if (Utils.isConnectionError(err)) { | ||
| connection.close().catch(function (err) {}); | ||
| connection.__knex__disposed = err; | ||
| } | ||
| return cb(err); | ||
| } | ||
| return cb(null, result); | ||
| } | ||
| ); | ||
| } | ||
| }); | ||
| connection.executeAsync = function (sql, bindParams, options) { | ||
| // Read all lob | ||
| return fetchAsync(sql, bindParams, options).then(async (results) => { | ||
| const closeResultSet = () => { | ||
| return results.resultSet | ||
| ? promisify(results.resultSet.close).call(results.resultSet) | ||
| : Promise.resolve(); | ||
| }; | ||
| // Collect LOBs to read | ||
| const lobs = []; | ||
| if (results.rows) { | ||
| if (Array.isArray(results.rows)) { | ||
| for (let i = 0; i < results.rows.length; i++) { | ||
| // Iterate through the rows | ||
| const row = results.rows[i]; | ||
| for (const column in row) { | ||
| if (row[column] instanceof stream.Readable) { | ||
| lobs.push({ index: i, key: column, stream: row[column] }); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| try { | ||
| for (const lob of lobs) { | ||
| // todo should be fetchAsString/fetchAsBuffer polyfill only | ||
| results.rows[lob.index][lob.key] = await lobProcessing(lob.stream); | ||
| } | ||
| } catch (e) { | ||
| await closeResultSet().catch(() => {}); | ||
| throw e; | ||
| } | ||
| await closeResultSet(); | ||
| return results; | ||
| }); | ||
| }; | ||
| } | ||
| Utils.BlobHelper = BlobHelper; | ||
| Utils.monkeyPatchConnection = monkeyPatchConnection; | ||
| module.exports = Utils; |
@@ -1047,2 +1047,3 @@ // Builder | ||
| this._connection = _connection; | ||
| this.client.processPassedConnection(_connection); | ||
| return this; | ||
@@ -1049,0 +1050,0 @@ } |
| { | ||
| "name": "knex", | ||
| "version": "0.95.12-rc1", | ||
| "version": "0.95.12-rc2", | ||
| "description": "A batteries-included SQL query & schema builder for PostgresSQL, MySQL, CockroachDB, MSSQL and SQLite3", | ||
@@ -5,0 +5,0 @@ "main": "knex", |
New alerts
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Fixed alerts
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Improved metrics
- Lines of code
- increased by0.06%
19533
Worsened metrics
- Total package byte prevSize
- decreased by-0.05%
742676
No dependency changes