dnrops
/
node-oracledb
mirror of https://github.com/oracle/node-oracledb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change conn.release() to preferred alias conn.close() in examples

This commit is contained in:
Christopher Jones 2016-12-01 22:24:55 +11:00
parent b8f8e9433f
commit 2b423f9a6f
36 changed files with 86 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/blobhttp.js
View File

@ -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);
});
});

4
examples/blobinsert1.js
View File

@ -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);
});
});

2
examples/blobstream1.js
View File

@ -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);
});
});

2
examples/blobstream2.js
View File

@ -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);
});
});

4
examples/clobinsert1.js
View File

@ -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);
});
});

4
examples/clobinsert2.js
View File

@ -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);
});
});

2
examples/clobstream1.js
View File

@ -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);
});
});

2
examples/clobstream2.js
View File

@ -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);
});
});

4
examples/clobupdate1.js
View File

@ -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);
});
});

4
examples/connect.js
View File

@ -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) {

4
examples/date.js
View File

@ -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) {

4
examples/dbmsoutputgetline.js
View File

@ -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); });
}
);
};

4
examples/dbmsoutputpipe.js
View File

@ -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); });
});
};

4
examples/endtoend.js
View File

@ -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);

4
examples/fetchinfo.js
View File

@ -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);

2
examples/insert1.js
View File

@ -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);
});

4
examples/insert2.js
View File

@ -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) {

2
examples/lobbinds.js
View File

@ -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);
});

2
examples/metadata.js
View File

@ -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);
});

2
examples/plsqlarray.js
View File

@ -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);
});

19
examples/plsqlfunc.js
View File

@ -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);
}
});
}

17
examples/plsqlproc.js
View File

@ -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);
}
});
}

4
examples/promises.js
View File

@ -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) {

4
examples/raw1.js
View File

@ -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); });
});

4
examples/refcursor.js
View File

@ -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); }

2
examples/refcursortoquerystream.js
View File

@ -80,7 +80,7 @@ oracledb.getConnection(
);
function doRelease(connection) {
connection.release(
connection.close(
function(err) {
if (err) {
console.error(err.message);

4
examples/resultset1.js
View File

@ -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); }

2
examples/resultset2.js
View File

@ -94,7 +94,7 @@ function fetchRowsFromRS(connection, resultSet, numRows)
function doRelease(connection)
{
connection.release(
connection.close(
function(err)
{
if (err) { console.error(err.message); }

2
examples/resultsettoquerystream.js
View File

@ -75,7 +75,7 @@ oracledb.getConnection(
function doRelease(connection)
{
connection.release(
connection.close(
function(err)
{
if (err) { console.error(err.message); }

2
examples/select2.js
View File

@ -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);
});

2
examples/selectjson.js
View File

@ -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);
});

2
examples/selectjsonclob.js
View File

@ -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);
});

2
examples/selectstream.js
View File

@ -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);

4
examples/templobinsert.js
View File

@ -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);
});
}

4
examples/webapp.js
View File

@ -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 {

4
examples/webapppromises.js
View File

@ -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.