From 2b423f9a6f8209aa5f56157ffdbf322e58e63af4 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Thu, 1 Dec 2016 22:24:55 +1100 Subject: [PATCH] Change conn.release() to preferred alias conn.close() in examples --- examples/blobhttp.js | 4 ++-- examples/blobinsert1.js | 4 ++-- examples/blobstream1.js | 2 +- examples/blobstream2.js | 2 +- examples/clobinsert1.js | 4 ++-- examples/clobinsert2.js | 4 ++-- examples/clobstream1.js | 2 +- examples/clobstream2.js | 2 +- examples/clobupdate1.js | 4 ++-- examples/connect.js | 4 ++-- examples/date.js | 4 ++-- examples/dbmsoutputgetline.js | 4 ++-- examples/dbmsoutputpipe.js | 4 ++-- examples/endtoend.js | 4 ++-- examples/fetchinfo.js | 4 ++-- examples/insert1.js | 2 +- examples/insert2.js | 4 ++-- examples/lobbinds.js | 2 +- examples/metadata.js | 2 +- examples/plsqlarray.js | 2 +- examples/plsqlfunc.js | 19 +++++++++++++++++-- examples/plsqlproc.js | 17 ++++++++++++++++- examples/promises.js | 4 ++-- examples/raw1.js | 4 ++-- examples/refcursor.js | 4 ++-- examples/refcursortoquerystream.js | 2 +- examples/resultset1.js | 4 ++-- examples/resultset2.js | 2 +- examples/resultsettoquerystream.js | 2 +- examples/select2.js | 2 +- examples/selectjson.js | 2 +- examples/selectjsonclob.js | 2 +- examples/selectstream.js | 2 +- examples/templobinsert.js | 4 ++-- examples/webapp.js | 4 ++-- examples/webapppromises.js | 4 ++-- 36 files changed, 86 insertions(+), 56 deletions(-) diff --git a/examples/blobhttp.js b/examples/blobhttp.js index b73d101d..1a75676c 100644 --- a/examples/blobhttp.js +++ b/examples/blobhttp.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */ +/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */ /****************************************************************************** * @@ -75,7 +75,7 @@ http.createServer(function(req, res){ function() { console.log("lob.on 'close' event"); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err); }); }); diff --git a/examples/blobinsert1.js b/examples/blobinsert1.js index 3e51daf5..78f64d81 100644 --- a/examples/blobinsert1.js +++ b/examples/blobinsert1.js @@ -75,7 +75,7 @@ oracledb.getConnection( console.error(err.message); else console.log("Image uploaded successfully."); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err.message); }); }); @@ -89,7 +89,7 @@ oracledb.getConnection( { console.log("inStream.on 'error' event"); console.error(err); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err.message); }); }); diff --git a/examples/blobstream1.js b/examples/blobstream1.js index 566841c0..12a20a7e 100644 --- a/examples/blobstream1.js +++ b/examples/blobstream1.js @@ -66,7 +66,7 @@ oracledb.getConnection( function() { console.log("lob.on 'close' event"); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err.message); }); }); diff --git a/examples/blobstream2.js b/examples/blobstream2.js index efc6d5d0..eed3ed19 100644 --- a/examples/blobstream2.js +++ b/examples/blobstream2.js @@ -90,7 +90,7 @@ oracledb.getConnection( function() { console.log("lob.on 'close' event"); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err); }); }); diff --git a/examples/clobinsert1.js b/examples/clobinsert1.js index f30fa39d..f9327881 100644 --- a/examples/clobinsert1.js +++ b/examples/clobinsert1.js @@ -75,7 +75,7 @@ oracledb.getConnection( console.error(err.message); else console.log("Text inserted successfully."); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err.message); }); }); @@ -89,7 +89,7 @@ oracledb.getConnection( { console.log("inStream.on 'error' event"); console.error(err); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err.message); }); }); diff --git a/examples/clobinsert2.js b/examples/clobinsert2.js index 01012388..43b638b2 100644 --- a/examples/clobinsert2.js +++ b/examples/clobinsert2.js @@ -64,7 +64,7 @@ oracledb.getConnection( console.error(err.message); else console.log("Text inserted successfully."); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err); }); }); @@ -75,7 +75,7 @@ oracledb.getConnection( { console.log("lob.on 'error' event"); console.error(err); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err.message); }); }); diff --git a/examples/clobstream1.js b/examples/clobstream1.js index a7396819..166006f8 100644 --- a/examples/clobstream1.js +++ b/examples/clobstream1.js @@ -67,7 +67,7 @@ oracledb.getConnection( function() { console.log("lob.on 'close' event"); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err.message); }); }); diff --git a/examples/clobstream2.js b/examples/clobstream2.js index f3d126d0..32fcf294 100644 --- a/examples/clobstream2.js +++ b/examples/clobstream2.js @@ -88,7 +88,7 @@ oracledb.getConnection( function() { console.log("lob.on 'close' event"); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err); }); }); diff --git a/examples/clobupdate1.js b/examples/clobupdate1.js index c412cdcb..7b7d27e6 100644 --- a/examples/clobupdate1.js +++ b/examples/clobupdate1.js @@ -68,7 +68,7 @@ oracledb.getConnection( console.error(err.message); else console.log("Text inserted successfully."); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err); }); }); @@ -95,7 +95,7 @@ oracledb.getConnection( { console.log("inStream.on 'error' event"); console.error(err); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err.message); }); }); diff --git a/examples/connect.js b/examples/connect.js index b73410b4..6c58b5ee 100644 --- a/examples/connect.js +++ b/examples/connect.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */ +/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */ /****************************************************************************** * @@ -41,7 +41,7 @@ oracledb.getConnection( } console.log('Connection was successful!'); - connection.release( + connection.close( function(err) { if (err) { diff --git a/examples/date.js b/examples/date.js index 17c258eb..83f638b8 100644 --- a/examples/date.js +++ b/examples/date.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */ +/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */ /****************************************************************************** * @@ -130,7 +130,7 @@ function releaseConnection(err) { } console.log("----- Rollback complete --------"); - connection.release(logReleaseError); // close the connection + connection.close(logReleaseError); // close the connection } function logReleaseError(err) { diff --git a/examples/dbmsoutputgetline.js b/examples/dbmsoutputgetline.js index 823b0aa2..3b7ffd16 100644 --- a/examples/dbmsoutputgetline.js +++ b/examples/dbmsoutputgetline.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */ +/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */ /****************************************************************************** * @@ -52,7 +52,7 @@ var doit = function(pool) { ], function (err, conn) { if (err) { console.error("In waterfall error cb: ==>", err, "<=="); } - conn.release(function (err) { if (err) console.error(err.message); }); + conn.close(function (err) { if (err) console.error(err.message); }); } ); }; diff --git a/examples/dbmsoutputpipe.js b/examples/dbmsoutputpipe.js index b583bace..5a0e7803 100644 --- a/examples/dbmsoutputpipe.js +++ b/examples/dbmsoutputpipe.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */ +/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */ /****************************************************************************** * @@ -72,7 +72,7 @@ var doit = function(pool) { ], function (err, conn) { if (err) { console.error("In waterfall error cb: ==>", err, "<=="); } - conn.release(function (err) { if (err) console.error(err.message); }); + conn.close(function (err) { if (err) console.error(err.message); }); }); }; diff --git a/examples/endtoend.js b/examples/endtoend.js index 4801ed5c..2936e54b 100644 --- a/examples/endtoend.js +++ b/examples/endtoend.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */ +/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */ /****************************************************************************** * @@ -64,7 +64,7 @@ oracledb.getConnection( // Release the connection function doRelease(connection) { - connection.release( + connection.close( function(err) { if (err) { console.error(err.message); diff --git a/examples/fetchinfo.js b/examples/fetchinfo.js index 5fbe776a..8d446337 100644 --- a/examples/fetchinfo.js +++ b/examples/fetchinfo.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */ +/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */ /****************************************************************************** * @@ -70,7 +70,7 @@ oracledb.getConnection( function doRelease(connection) { - connection.release( + connection.close( function(err) { if (err) { console.error(err.message); diff --git a/examples/insert1.js b/examples/insert1.js index 1b1f46be..1e48e501 100644 --- a/examples/insert1.js +++ b/examples/insert1.js @@ -38,7 +38,7 @@ var doconnect = function(cb) { }; var dorelease = function(conn) { - conn.release(function (err) { + conn.close(function (err) { if (err) console.error(err.message); }); diff --git a/examples/insert2.js b/examples/insert2.js index 32538422..38e70e0d 100644 --- a/examples/insert2.js +++ b/examples/insert2.js @@ -43,7 +43,7 @@ var doconnect = function(cb) { }; var dorelease = function(conn) { - conn.release(function (err) { + conn.close(function (err) { if (err) console.error(err.message); }); @@ -144,7 +144,7 @@ var doquery = function (conn, cb) { // Uncomment the autoCommit option above and you will see both rows console.log(result.rows); - connection2.release( + connection2.close( function(err) { if (err) { diff --git a/examples/lobbinds.js b/examples/lobbinds.js index 1a5b0071..618e785b 100644 --- a/examples/lobbinds.js +++ b/examples/lobbinds.js @@ -46,7 +46,7 @@ var doconnect = function(cb) { }; var dorelease = function(conn) { - conn.release(function (err) { + conn.close(function (err) { if (err) console.error(err.message); }); diff --git a/examples/metadata.js b/examples/metadata.js index 303375a1..c3810a11 100644 --- a/examples/metadata.js +++ b/examples/metadata.js @@ -42,7 +42,7 @@ var doconnect = function(cb) { }; var dorelease = function(conn) { - conn.release(function (err) { + conn.close(function (err) { if (err) console.error(err.message); }); diff --git a/examples/plsqlarray.js b/examples/plsqlarray.js index d1bd329f..ac1ad642 100644 --- a/examples/plsqlarray.js +++ b/examples/plsqlarray.js @@ -38,7 +38,7 @@ var doconnect = function(cb) { }; var dorelease = function(conn) { - conn.release(function (err) { + conn.close(function (err) { if (err) console.error(err.message); }); diff --git a/examples/plsqlfunc.js b/examples/plsqlfunc.js index 626a210f..1fb09b96 100644 --- a/examples/plsqlfunc.js +++ b/examples/plsqlfunc.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */ +/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */ /****************************************************************************** * @@ -54,7 +54,22 @@ oracledb.getConnection( bindvars, function (err, result) { - if (err) { console.error(err.message); return; } + if (err) { + console.error(err.message); + doRelease(connection); + return; + } console.log(result.outBinds); + doRelease(connection); }); }); + +function doRelease(connection) +{ + connection.close( + function(err) { + if (err) { + console.error(err.message); + } + }); +} diff --git a/examples/plsqlproc.js b/examples/plsqlproc.js index bb910200..5bc51bd1 100644 --- a/examples/plsqlproc.js +++ b/examples/plsqlproc.js @@ -55,7 +55,22 @@ oracledb.getConnection( bindvars, function (err, result) { - if (err) { console.error(err.message); return; } + if (err) { + console.error(err.message); + doRelease(connection); + return; + } console.log(result.outBinds); + doRelease(connection); }); }); + +function doRelease(connection) +{ + connection.close( + function(err) { + if (err) { + console.error(err.message); + } + }); +} diff --git a/examples/promises.js b/examples/promises.js index dfe469c9..a031e577 100644 --- a/examples/promises.js +++ b/examples/promises.js @@ -46,12 +46,12 @@ oracledb.getConnection( console.log(result.metaData); console.log(result.rows); - return connection.release(); + return connection.close(); }) .catch(function(err) { console.log(err.message); - return connection.release(); + return connection.close(); }); }) .catch(function(err) { diff --git a/examples/raw1.js b/examples/raw1.js index d4eab8ac..5a2bfa35 100644 --- a/examples/raw1.js +++ b/examples/raw1.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */ +/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */ /****************************************************************************** * @@ -74,6 +74,6 @@ async.waterfall( ], function (err, conn) { if (err) { console.error("In waterfall error cb: ==>", err, "<=="); } - conn.release(function (err) { if (err) console.error(err.message); }); + conn.close(function (err) { if (err) console.error(err.message); }); }); diff --git a/examples/refcursor.js b/examples/refcursor.js index 111a8252..0bfdcb75 100644 --- a/examples/refcursor.js +++ b/examples/refcursor.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */ +/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */ /****************************************************************************** * @@ -100,7 +100,7 @@ function fetchRowsFromRS(connection, resultSet, numRows) function doRelease(connection) { - connection.release( + connection.close( function(err) { if (err) { console.error(err.message); } diff --git a/examples/refcursortoquerystream.js b/examples/refcursortoquerystream.js index 3da7b70d..aa7b6244 100644 --- a/examples/refcursortoquerystream.js +++ b/examples/refcursortoquerystream.js @@ -80,7 +80,7 @@ oracledb.getConnection( ); function doRelease(connection) { - connection.release( + connection.close( function(err) { if (err) { console.error(err.message); diff --git a/examples/resultset1.js b/examples/resultset1.js index 112e6dc9..cc9a322c 100644 --- a/examples/resultset1.js +++ b/examples/resultset1.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */ +/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */ /****************************************************************************** * @@ -78,7 +78,7 @@ function fetchOneRowFromRS(connection, resultSet) function doRelease(connection) { - connection.release( + connection.close( function(err) { if (err) { console.error(err.message); } diff --git a/examples/resultset2.js b/examples/resultset2.js index 37a9d324..68aa7491 100644 --- a/examples/resultset2.js +++ b/examples/resultset2.js @@ -94,7 +94,7 @@ function fetchRowsFromRS(connection, resultSet, numRows) function doRelease(connection) { - connection.release( + connection.close( function(err) { if (err) { console.error(err.message); } diff --git a/examples/resultsettoquerystream.js b/examples/resultsettoquerystream.js index 524184c9..1de20a79 100644 --- a/examples/resultsettoquerystream.js +++ b/examples/resultsettoquerystream.js @@ -75,7 +75,7 @@ oracledb.getConnection( function doRelease(connection) { - connection.release( + connection.close( function(err) { if (err) { console.error(err.message); } diff --git a/examples/select2.js b/examples/select2.js index bcdfb968..71d14804 100644 --- a/examples/select2.js +++ b/examples/select2.js @@ -49,7 +49,7 @@ var doconnect = function(cb) { }; var dorelease = function(conn) { - conn.release(function (err) { + conn.close(function (err) { if (err) console.error(err.message); }); diff --git a/examples/selectjson.js b/examples/selectjson.js index 2dd9c34c..bfcddfa1 100644 --- a/examples/selectjson.js +++ b/examples/selectjson.js @@ -41,7 +41,7 @@ var doconnect = function(cb) { }; var dorelease = function(conn) { - conn.release(function (err) { + conn.close(function (err) { if (err) console.error(err.message); }); diff --git a/examples/selectjsonclob.js b/examples/selectjsonclob.js index 24cc286f..8f6a24b0 100644 --- a/examples/selectjsonclob.js +++ b/examples/selectjsonclob.js @@ -37,7 +37,7 @@ var doconnect = function(cb) { }; var dorelease = function(conn) { - conn.release(function (err) { + conn.close(function (err) { if (err) console.error(err.message); }); diff --git a/examples/selectstream.js b/examples/selectstream.js index 579e1744..58ae9435 100644 --- a/examples/selectstream.js +++ b/examples/selectstream.js @@ -65,7 +65,7 @@ oracledb.getConnection( stream.on('end', function () { // console.log("stream 'end' event"); - connection.release( + connection.close( function(err) { if (err) { console.error(err.message); diff --git a/examples/templobinsert.js b/examples/templobinsert.js index 006edd8e..36907f59 100644 --- a/examples/templobinsert.js +++ b/examples/templobinsert.js @@ -62,7 +62,7 @@ oracledb.getConnection( console.error(err.message); else console.log("Text inserted successfully."); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err.message); }); }); @@ -115,7 +115,7 @@ oracledb.getConnection( { console.log("inStream.on 'error' event"); console.error(err); - connection.release(function(err) { + connection.close(function(err) { if (err) console.error(err.message); }); } diff --git a/examples/webapp.js b/examples/webapp.js index c74e50d7..62f4f4f9 100644 --- a/examples/webapp.js +++ b/examples/webapp.js @@ -118,7 +118,7 @@ function handleRequest(request, response, pool) { [deptid], // bind variable value function(err, result) { if (err) { - connection.release(function(err) { + connection.close(function(err) { if (err) { // Just logging because handleError call below will have already // ended the response. @@ -132,7 +132,7 @@ function handleRequest(request, response, pool) { displayResults(response, result, deptid); /* Release the connection back to the connection pool */ - connection.release(function(err) { + connection.close(function(err) { if (err) { handleError(response, "normal release() error", err); } else { diff --git a/examples/webapppromises.js b/examples/webapppromises.js index e50cc69a..60e68209 100644 --- a/examples/webapppromises.js +++ b/examples/webapppromises.js @@ -114,7 +114,7 @@ function handleRequest(request, response, pool) { displayResults(response, result, deptid); /* Release the connection back to the connection pool */ - connection.release() + connection.close() .then(function() { htmlFooter(response); }) @@ -123,7 +123,7 @@ function handleRequest(request, response, pool) { }); }) .catch(function(err) { - connection.release() + connection.close() .catch(function(err) { // Just logging because handleError call below will have already // ended the response.