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

Time to start moving to only async/await syntax

This commit is contained in:
Christopher Jones 2019-03-13 10:49:26 +11:00 committed by Christopher Jones
parent 28cfe1ea57
commit 04807e595f
3 changed files with 118 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
examples/connect.js
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. */
/* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. */
/******************************************************************************
*
@ -24,29 +24,40 @@
*
* For a connection pool example see connectionpool.js
*
* This example uses Node 8's async/await syntax.
*
*****************************************************************************/
'use strict';
var oracledb = require('oracledb');
var dbConfig = require('./dbconfig.js');
oracledb.getConnection(
{
async function run() {
let connection;
try {
// Get a non-pooled connection
connection = await oracledb.getConnection( {
user : dbConfig.user,
password : dbConfig.password,
connectString : dbConfig.connectString
},
function(err, connection) {
if (err) {
console.error(err.message);
return;
}
connectString: dbConfig.connectString
});
console.log('Connection was successful!');
connection.close(
function(err) {
if (err) {
console.error(err.message);
return;
} catch (err) {
console.error(err);
} finally {
if (connection) {
try {
await connection.close();
} catch (err) {
console.error(err);
}
});
});
}
}
}
run();

67
examples/select1.js
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. */
/* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. */
/******************************************************************************
*
@ -25,30 +25,34 @@
* Scripts to create the HR schema can be found at:
* https://github.com/oracle/db-sample-schemas
*
* For an async/await example see selectawait.js
* For a connection pool example see connectionpool.js
* For a ResultSet example see resultset2.js
* For a query stream example see selectstream.js
* For a Promise example see promises.js
*
* This example uses Node 8's async/await syntax.
*
*****************************************************************************/
'use strict';
var oracledb = require('oracledb');
var dbConfig = require('./dbconfig.js');
// Get a non-pooled connection
oracledb.getConnection(
{
async function run() {
let connection;
try {
// Get a non-pooled connection
connection = await oracledb.getConnection( {
user : dbConfig.user,
password : dbConfig.password,
connectString : dbConfig.connectString
},
function(err, connection) {
if (err) {
console.error(err.message);
return;
}
connection.execute(
connectString: dbConfig.connectString
});
let result = await connection.execute(
// The statement to execute
`SELECT department_id, department_name
FROM departments
@ -57,35 +61,32 @@ oracledb.getConnection(
// The "bind value" 180 for the bind variable ":id"
[180],
// execute() options argument. Since the query only returns one
// Options argument. Since the query only returns one
// row, we can optimize memory usage by reducing the default
// maxRows value. For the complete list of other options see
// the documentation.
{ maxRows: 1
{
maxRows: 1
//, outFormat: oracledb.OBJECT // query result format
//, extendedMetaData: true // get extra metadata
//, fetchArraySize: 100 // internal buffer allocation size for tuning
},
});
// The callback function handles the SQL execution results
function(err, result) {
if (err) {
console.error(err.message);
doRelease(connection);
return;
}
console.log(result.metaData); // [ { name: 'DEPARTMENT_ID' }, { name: 'DEPARTMENT_NAME' } ]
console.log(result.rows); // [ [ 180, 'Construction' ] ]
doRelease(connection);
});
});
// Note: connections should always be released when not needed
function doRelease(connection) {
connection.close(
function(err) {
if (err) {
console.error(err.message);
} catch (err) {
console.error(err);
} finally {
if (connection) {
try {
// Note: connections should always be released when not needed
await connection.close();
} catch (err) {
console.error(err);
}
}
}
});
}
run();

98
examples/select2.js
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. */
/* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. */
/******************************************************************************
*
@ -26,9 +26,12 @@
* Scripts to create the HR schema can be found at:
* https://github.com/oracle/db-sample-schemas
*
* This example uses Node 8's async/await syntax.
*
******************************************************************************/
var async = require('async');
'use strict';
var oracledb = require('oracledb');
var dbConfig = require('./dbconfig.js');
@ -48,64 +51,53 @@ var dbConfig = require('./dbconfig.js');
//
// oracledb.outFormat = oracledb.OBJECT;
var doconnect = function(cb) {
oracledb.getConnection(
{
async function run() {
let connection;
try {
// Get a non-pooled connection
connection = await oracledb.getConnection( {
user : dbConfig.user,
password : dbConfig.password,
connectString : dbConfig.connectString
},
cb);
};
var dorelease = function(conn) {
conn.close(function (err) {
if (err)
console.error(err.message);
connectString: dbConfig.connectString
});
};
// Default Array Output Format
var doquery_array = function (conn, cb) {
conn.execute(
"SELECT location_id, city FROM locations WHERE city LIKE 'S%' ORDER BY city",
function(err, result) {
if (err) {
return cb(err, conn);
} else {
// The statement to execute
let sql =
`SELECT location_id, city
FROM locations
WHERE city LIKE 'S%'
ORDER BY city`;
let result;
// Default Array Output Format
result = await connection.execute(sql);
console.log("----- Cities beginning with 'S' (default ARRAY output format) --------");
console.log(result.rows);
return cb(null, conn);
}
});
};
// Optional Object Output Format
var doquery_object = function (conn, cb) {
conn.execute(
"SELECT location_id, city FROM locations WHERE city LIKE 'S%' ORDER BY city",
{}, // A bind variable parameter is needed to disambiguate the following options parameter
// otherwise you will get Error: ORA-01036: illegal variable name/number
{ outFormat: oracledb.OBJECT }, // outFormat can be OBJECT or ARRAY. The default is ARRAY
function(err, result) {
if (err) {
return cb(err, conn);
} else {
// Optional Object Output Format
result = await connection.execute(
sql,
{}, // A bind parameter is needed to disambiguate the following options parameter and avoid ORA-01036
{ outFormat: oracledb.OBJECT }); // outFormat can be OBJECT or ARRAY. The default is ARRAY
console.log("----- Cities beginning with 'S' (OBJECT output format) --------");
console.log(result.rows);
return cb(null, conn);
}
});
};
async.waterfall(
[
doconnect,
doquery_array,
doquery_object
],
function (err, conn) {
if (err) { console.error("In waterfall error cb: ==>", err, "<=="); }
if (conn)
dorelease(conn);
});
} catch (err) {
console.error(err);
} finally {
if (connection) {
try {
// Note: connections should always be released when not needed
await connection.close();
} catch (err) {
console.error(err);
}
}
}
}
run();