Merge branch 'master' of https://github.com/oracle/oracle-db-examples

Author: nigelbayliss

README.md

@@ -8,9 +8,11 @@ This repository stores a variety of examples demonstrating how to use the Oracle
 | [java](./java)  | Java based examples |
 | [javascript](./javascript) | JavaScript based examples |
 | [optimizer](./optimizer) | Oracle Optmizer and Optimizer Stats examples |
+| [plsql](./plsql) | PL/SQL based examples |
 | [python](./python) | Python based examples |
+| [ruby](./ruby) | Ruby based examples |
 | [sql](./sql) | SQL based examples |
-| [sqldeveloper](./sqldeveloper) | [SQL Developer](http://www.oracle.com/technetwork/developer-tools/sql-developer/) Examples |
+| [sqldeveloper](./sqldeveloper) | [SQL Developer](http://www.oracle.com/technetwork/developer-tools/sql-developer/) examples |
 
 ## Documentation
 You can find the online documentation of the Oracle Database under [docs.oracle.com/en/database/](http://docs.oracle.com/en/database/)

java/jdbc/ConnectionManagementSamples/DataSourceSample.java

@@ -37,7 +37,7 @@ such as Universal Connection Pool (UCP), can be configured to use an
 public class DataSourceSample {  
   // The recommended format of a connection URL is the long format with the
   // connection descriptor.
-  final static String DB_URL= "jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(HOST=myhost)(PORT=1521)(PROTOCOL=tcp))(CONNECT_DATA=(SERVICE_NAME=myorcldbservicename)))";
+  final static String DB_URL= "jdbc:oracle:thin:@myhost:1521/myorcldbservicename";
   final static String DB_USER = "hr";
   final static String DB_PASSWORD = "hr";
 

java/ojvm/SODA.md

@@ -8,13 +8,13 @@ The goal of this write up is to furnish the steps for running testSODA.java in O
 
 (i) Download the [latest orajsoda.jar](https://github.com/oracle/soda-for-java/releases) currently orajsoda-1.0.4.jar 
 
-(ii) Upload orasoda.jar in your database schema
-
-            loadjava -r -v -u hr/hr orajsoda-1.0.4.jar
-
-(iii) Load the [latest javax.json-1.0.4.jar](https://mvnrepository.com/artifact/org.glassfish/javax.json/1.0.4) 
+(ii) Load the [latest javax.json-1.0.4.jar](https://mvnrepository.com/artifact/org.glassfish/javax.json/1.0.4) 
 
             loadjava -r -v -u hr/hr javax.json-1.0.4.jar
+            
+(iii) Upload orasoda.jar in your database schema
+
+            loadjava -r -v -u hr/hr orajsoda-1.0.5.jar
 
 **Prep testSODA.java for OJVM**
 

java/ucp/ConnectionManagementSamples/UCPSample.java

@@ -30,7 +30,7 @@ The code sample demonstrates Universal Connection Pool (UCP) as a client
 import oracle.ucp.jdbc.PoolDataSource;
 
 public class UCPSample {
-  final static String DB_URL=   "jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(HOST=myhost)(PORT=1521)(PROTOCOL=tcp))(CONNECT_DATA=(SERVICE_NAME=myorcldbservicename)))";
+  final static String DB_URL=   "jdbc:oracle:thin:@myhost:1521/myorcldbservicename";
   // Use TNS alias when using tnsnames.ora.  Use it while connecting to the database service on cloud. 
   // final static String DB_URL=   "jdbc:oracle:thin:@orcldbaccess";
   final static String DB_USER                 = "hr";

javascript/node-oracledb/README.md

@@ -1,14 +1,45 @@
-These are examples for the [node-oracledb 1.13 driver](https://www.npmjs.com/package/oracledb)
+# Node-oracledb Examples
 
-The node-oracledb add-on for Node.js powers high performance Oracle Database applications.
+This directory contains [node-oracledb 2.0](https://www.npmjs.com/package/oracledb) examples.
 
-[node-oracledb installation instructions](https://github.com/oracle/node-oracledb/blob/master/INSTALL.md)
+The node-oracledb add-on for Node.js powers high performance Oracle Database applications.
 
 [Node-oracledb documentation](https://github.com/oracle/node-oracledb/blob/master/doc/api.md)
 
 [Issues and questions](https://github.com/oracle/node-oracledb/issues)
 
-After installing node-oracledb, the demos can be run by editing
-dbconfig.js to set your database credentials, creating the schema
-objects with demo.sql, and then executing each JavaScript file with
-Node.js.
+To run the examples:
+
+- [Install node-oracledb](https://github.com/oracle/node-oracledb/blob/master/INSTALL.md).
+
+
+- Use `demo.sql` to create schema objects used by the samples.  For
+  example, to load them in the HR schema run:
+
+  ```
+  sqlplus hr/welcome@localhost/orclpdb @demo.sql
+  ```
+
+- Edit `dbconfig.js` and set your username, password and the database
+connection string:
+
+  ```
+  module.exports = {
+      user: "hr",
+      password: "welcome",
+      connectString:"localhost/orclpdb"
+  };
+
+  ```
+
+- Then run the samples like:
+
+  ```
+  node select1.js
+  ```
+
+The demonstration objects can be dropped with `demodrop.sql`:
+
+  ```
+  sqlplus hr/welcome@localhost/orclpdb @demodrop.sql
+  ```

javascript/node-oracledb/blobhttp.js

@@ -57,10 +57,10 @@ function init() {
 
       // Create HTTP server and listen on port 'httpPort'
       http
-      .createServer(function(request, response) {
-        handleRequest(request, response);
-      })
-      .listen(httpPort);
+        .createServer(function(request, response) {
+          handleRequest(request, response);
+        })
+        .listen(httpPort);
 
       console.log("Server running.  Try requesting: http://localhost:" + httpPort + "/getimage");
     });
@@ -140,13 +140,13 @@ function handleRequest(request, response) {
 }
 
 process
-.on('SIGTERM', function() {
-  console.log("\nTerminating");
-  process.exit(0);
-})
-.on('SIGINT', function() {
-  console.log("\nTerminating");
-  process.exit(0);
-});
+  .on('SIGTERM', function() {
+    console.log("\nTerminating");
+    process.exit(0);
+  })
+  .on('SIGINT', function() {
+    console.log("\nTerminating");
+    process.exit(0);
+  });
 
 init();

javascript/node-oracledb/date.js

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */
+/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. */
 
 /******************************************************************************
  *
@@ -50,17 +50,17 @@ var dorelease = function(conn) {
 
 var docleanup = function (conn, cb) {
   conn.execute(
-    "BEGIN " +
-      "  DECLARE" +
-      "    e_table_exists EXCEPTION;" +
-      "    PRAGMA EXCEPTION_INIT(e_table_exists, -00942);" +
-      "  BEGIN" +
-      "    EXECUTE IMMEDIATE ('DROP TABLE datetest');" +
-      "  EXCEPTION" +
-      "    WHEN e_table_exists" +
-      "    THEN NULL;" +
-      "  END; " +
-      "END;",
+    `BEGIN
+       DECLARE
+         e_table_exists EXCEPTION;
+         PRAGMA EXCEPTION_INIT(e_table_exists, -00942);
+       BEGIN
+         EXECUTE IMMEDIATE ('DROP TABLE datetest');
+       EXCEPTION
+         WHEN e_table_exists
+         THEN NULL;
+       END;
+     END;`,
     function(err) {
       return cb(err, conn);
     });

javascript/node-oracledb/dbconfig.js

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */
+/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. */
 
 /******************************************************************************
  *
@@ -34,7 +34,7 @@
  *     [//]host_name[:port][/service_name][:server_type][/instance_name]
  *
  *   Commonly just the host_name and service_name are needed
- *   e.g. "localhost/orcl" or "localhost/XE"
+ *   e.g. "localhost/orclpdb" or "localhost/XE"
  *
  *   If using a tnsnames.ora file, the file can be in a default
  *   location such as $ORACLE_HOME/network/admin/tnsnames.ora or
@@ -76,7 +76,7 @@ module.exports = {
 
   // For information on connection strings see:
   // https://github.com/oracle/node-oracledb/blob/master/doc/api.md#connectionstrings
-  connectString : process.env.NODE_ORACLEDB_CONNECTIONSTRING || "localhost/orcl",
+  connectString : process.env.NODE_ORACLEDB_CONNECTIONSTRING || "localhost/orclpdb",
 
   // Setting externalAuth is optional.  It defaults to false.  See:
   // https://github.com/oracle/node-oracledb/blob/master/doc/api.md#extauth

javascript/node-oracledb/dbmsoutputgetline.js

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */
+/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. */
 
 /******************************************************************************
  *
@@ -65,10 +65,10 @@ var enableDbmsOutput = function (conn, cb) {
 
 var createDbmsOutput = function (conn, cb) {
   conn.execute(
-    "BEGIN " +
-      "DBMS_OUTPUT.PUT_LINE('Hello, Oracle!');" +
-      "DBMS_OUTPUT.PUT_LINE('Hello, Node!');" +
-      "END;",
+    `BEGIN
+       DBMS_OUTPUT.PUT_LINE('Hello, Oracle!');
+       DBMS_OUTPUT.PUT_LINE('Hello, Node!');
+     END;`,
     function(err) { return cb(err, conn); });
 };
 

javascript/node-oracledb/dbmsoutputpipe.js

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. */
+/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. */
 
 /******************************************************************************
  *
@@ -68,7 +68,8 @@ var doit = function(pool) {
       enableDbmsOutput,
       createDbmsOutput,
       fetchDbmsOutput,
-      printDbmsOutput
+      printDbmsOutput,
+      closeRS
     ],
     function (err, conn) {
       if (err) { console.error("In waterfall error cb: ==>", err, "<=="); }
@@ -84,10 +85,10 @@ var enableDbmsOutput = function (conn, cb) {
 
 var createDbmsOutput = function (conn, cb) {
   conn.execute(
-    "BEGIN " +
-      "DBMS_OUTPUT.PUT_LINE('Hello, Oracle!');" +
-      "DBMS_OUTPUT.PUT_LINE('Hello, Node!');" +
-      "END;",
+    `BEGIN
+       DBMS_OUTPUT.PUT_LINE('Hello, Oracle!');
+       DBMS_OUTPUT.PUT_LINE('Hello, Node!');
+     END;`,
     function(err) { return cb(err, conn); });
 };
 
@@ -118,12 +119,18 @@ var fetchRowsFromRS = function(conn, resultSet, numRows, cb) {
     numRows,
     function (err, rows) {
       if (err) {
-        return cb(err, conn);
+        return cb(err, conn, resultSet);
       } else if (rows.length > 0) {
         console.log(rows);
         return fetchRowsFromRS(conn, resultSet, numRows, cb);
       } else {
-        return cb(null, conn);
+        return cb(null, conn, resultSet);
       }
     });
 };
+
+var closeRS = function(conn, resultSet, cb) {
+  resultSet.close(function(err) {
+    return cb(err, conn);
+  });
+};