ODPI sample updates to use thick driver.

Updated the ODPI samples programs and related files to work with python-oracledb instead of cx-oracle and node-oracledb using the thick driver.

Author: jennylibloom

languages/THIRD_PARTY_LICENSES.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2019, 2024 Oracle and/or its affiliates. All rights reserved.
 
 # TimesTen Node.js Samples
 
@@ -9,9 +9,9 @@ The following table describes the tested operating systems, node-oracledb driver
 
 OS  | Node.js Version  | node-oracledb Driver Version | TimesTen Client Driver	| TimesTen Direct Driver
 ------------- | ------- | -------------	| ------------ | ------
-Linux 64-bit  | 12.7.0  |4.0.1+    | 18.1.4.1.0+	| 18.1.4.1.0+
-macOS      |  12.7.0  |4.0.1+  | 18.1.4.1.0+	| N/A
-MS Windows 64-bit    | 12.7.0  | 4.0.1+    | 18.1.4.1.0+ | N/A
+Linux 64-bit  | 14+  |6.0+    | 22.1.1.25.0+	| 22.1.1.25.0+
+macOS      |  14+  |6.0+  | 22.1.1.25.0+	| N/A
+MS Windows 64-bit    | 14+  | 6.0+    | 22.1.1.25.0+ | N/A
 
 **NOTE**: Access to TimesTen Databases on any supported TimesTen server platforms can be achieved using the TimesTen client driver from any of the platforms listed above. For more information on supported TimesTen platforms, see [TimesTen Release Notes](https://docs.oracle.com/en/database/other-databases/timesten/22.1/release-notes/toc.htm).
 

languages/nodejs/README.md

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown
  * at http://oss.oracle.com/licenses/upl
@@ -12,6 +12,8 @@
 var fs            = require('fs');
 var oracledb      = require('oracledb');
 var accessControl = require('./AccessControl');
+oracledb.initOracleClient();
+oracledb.fetchAsString = [oracledb.CLOB];
 
 // Execute the sample
 run(lobSample);
@@ -39,17 +41,16 @@ async function lobSample(conn) {
   // Get the LOB for reading
   console.log("> Querying CLOB column");
   result = await conn.execute("SELECT text FROM clobs where id=1");
-  let outClob = result.rows[0][0];
+  // let outClob = result.rows[0][0];
 
   console.log("> Reading CLOB");
-  await new Promise( (resolve, reject) => {
-    outClob.on("data", chunk => console.log(chunk.toString()));
-    outClob.on("error", error => reject(error));
-    outClob.on("end", () => {
-      console.log("> Finished reading CLOB");
-      resolve();
-    });
-  } );
+  if (result.rows.length == 0)
+    console.error ("No results");
+  else {
+    const outClob = result.rows[0][0];
+    console.log(outClob);
+  }
+      console.log("> Finished reading CLOB");  
 }
 
 

languages/nodejs/lobs.js

@@ -16,6 +16,7 @@
 'use strict';
 var oracledb      = require('oracledb');
 var accessControl = require('./AccessControl');
+oracledb.initOracleClient();
 
 const NUM_RECORDS = 100;  // Number of records to insert
 

languages/nodejs/queriesAndPlsql.js

@@ -11,6 +11,7 @@
 var oracledb      = require('oracledb');
 var accessControl = require('./AccessControl');
 
+oracledb.initOracleClient();
 async function run() {
 
   let connection;

languages/nodejs/simple.js

@@ -16,6 +16,7 @@
 'use strict';
 var oracledb      = require('oracledb');
 var accessControl = require('./AccessControl');
+oracledb.initOracleClient();
 
 const NUM_RECORDS       = 100;  // Number of records to insert. (Must have an exact square root)
 const READ_PERCENTAGE   = 80;     // Percentage of records to perform SELECTS.

languages/nodejs/sql.js

@@ -2,16 +2,16 @@ Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
 
 # TimesTen Python Samples
 
-This folder contains Python samples that illustrate database connection and operations using the cx_Oracle driver against the TimesTen database. 
+This folder contains Python samples that illustrate database connection and operations using the python-oracledb driver against the TimesTen database. 
 
 ## Software & Platform Support
-The following table describes the tested operating systems, cx_Oracle driver and TimesTen software versions.
+The following table describes the tested operating systems, python_oracledb driver and TimesTen software versions.
 
-OS  | Python Version | cx_Oracle Driver Version | TimesTen Client Driver	| TimesTen Direct Driver
+OS  | Python Version | python-oracledb Driver Version | TimesTen Client Driver	| TimesTen Direct Driver
 ------------- | --------- | --------- | ------------| ------
-Linux 64-bit  |  3.7.5   | 7.2.2+    | 18.1.4.1.0+	| 18.1.4.1.0+
-macOS  	    |  3.7.5   |7.2.2+    | 18.1.4.1.0+	| N/A
-MS Windows 64-bit   | 3.7.5  |7.2.2+    | 18.1.4.1.0+| N/A
+Linux 64-bit  |  3.7+   | 7.2.2+    | 22.1.1.25.0+	| 22.1.1.25.0+
+macOS  	    |  3.7+   |7.2.2+    | 22.1.1.25.0+	| N/A
+MS Windows 64-bit   | 3.7+  |7.2.2+    | 22.1.1.25.0+| N/A
 
 **NOTE**: Access to TimesTen Databases on any supported TimesTen server platforms can be achieved using the TimesTen client driver from any of the platforms listed above. For more information on supported TimesTen platforms, see [TimesTen Release Notes](https://docs.oracle.com/en/database/other-databases/timesten/22.1/release-notes/toc.htm).
 
@@ -22,9 +22,9 @@ MS Windows 64-bit   | 3.7.5  |7.2.2+    | 18.1.4.1.0+| N/A
 ## PRE-REQUISITES
 
 1. Python language is installed. 
-2. The cx_Oracle driver for Python is installed. 
+2. The python_oracledb for Python is installed. 
 3. A TimesTen database is created and data source is setup to access that database. 
-4. Environment to access Python, cx_Oracle driver and TimesTen data source are set up (i.e. the TimesTen environment script ttenv.sh/ttenv.csh has been executed)
+4. Environment to access Python, python_oracledb driver and TimesTen data source are set up (i.e. the TimesTen environment script ttenv.sh/ttenv.csh has been executed)
 
 For more information on setup, see [TimesTen In-Memory Database Open Source Languages Support Guide](https://docs.oracle.com/en/database/other-databases/timesten/22.1/open-source-languages/index.html).
 
@@ -182,4 +182,4 @@ Aliquam erat volutpat. Maecenas porttitor vel sapien non viverra. Sed dignissim
 
 
 ## Documentation
-You can find the online documentation for Oracle TimesTen In-Memory Database in the [Documentation Library](https://docs.oracle.com/en/database/other-databases/timesten/). Online documenation for the cx_Oracle driver can be found [here](https://cx-oracle.readthedocs.io/en/latest/).
+You can find the online documentation for Oracle TimesTen In-Memory Database in the [Documentation Library](https://docs.oracle.com/en/database/other-databases/timesten/). Online documenation for the python-oracledb driver can be found [here](https://cx-oracle.readthedocs.io/en/latest/).

languages/python/README.md

@@ -9,10 +9,11 @@
 #     reading its content.
 #
 
-import cx_Oracle
+import oracledb
 import AccessControl
 import os
 
+oracledb.defaults.fetch_lobs = False
 def lobSample(cursor):
 
   print("> Creating table with CLOB column")
@@ -34,30 +35,30 @@ def lobSample(cursor):
   outClob, = cursor.fetchone()
 
   print("> Reading CLOB")
-  print(outClob.read())
+  print(outClob)
   print("> Finished reading CLOB")
 
 
 def run():
   try:
     print("> Connecting")
     credentials = AccessControl.getCredentials("lobs.py")
-    connection = cx_Oracle.connect(credentials.user, credentials.password, credentials.connstr)
+    connection = oracledb.connect(user=credentials.user, password=credentials.password, dsn=credentials.connstr)
     connection.autocommit = True
     cursor = connection.cursor()
 
     lobSample(cursor)
 
   except Exception as e:
-    print("An error ocurred", str(e))
+    print("An error occurred", str(e))
   finally:
     if(connection):
       try:
         cursor.close()
         connection.close()
         print("> Connection released")
       except Exception as e:
-        print("An error ocurred", str(e))
+        print("An error occurred", str(e))
 
 # Execute sample
 run()

languages/python/lobs.py

@@ -13,7 +13,7 @@
 #       - Calls a PL/SQL anonymous block to delete a row
 #       - Drops the table
 #
-import cx_Oracle
+import oracledb
 import AccessControl
 
 NUM_RECORDS = 100  # Number of records to insert.
@@ -68,7 +68,7 @@
 # Get connection and cursor.
 def connect():
   credentials = AccessControl.getCredentials("queriesAndPlsql.py")
-  connection = cx_Oracle.connect(credentials.user, credentials.password, credentials.connstr)
+  connection = oracledb.connect(user=credentials.user, password=credentials.password, dsn=credentials.connstr)
   connection.autocommit = True
   return connection.cursor()
 

languages/python/queriesAndPlsql.py

@@ -9,13 +9,14 @@
 #
 
 from __future__ import print_function
-import cx_Oracle
+import oracledb
 import AccessControl
 
 def run():
   try:
+    oracledb.init_oracle_client();
     credentials = AccessControl.getCredentials("simple.py")
-    connection = cx_Oracle.connect(credentials.user, credentials.password, credentials.connstr)
+    connection = oracledb.connect(user=credentials.user, password=credentials.password, dsn=credentials.connstr)
 
     cursor = connection.cursor()
     cursor.execute("""
@@ -36,7 +37,7 @@ def run():
 
   except Exception as e:
     # Something went wrong
-    print("An error ocurred", str(e))
+    print("An error occurred", str(e))
 
 run()
 

languages/python/simple.py

@@ -13,7 +13,7 @@
 #       - Deletes a number of records (based on 'UPDATE_PERCENTAGE')
 #       - Drops the table
 #
-import cx_Oracle
+import oracledb
 import math
 import AccessControl
 
@@ -52,7 +52,7 @@
 # Get connection and cursor.
 def connect():
   credentials     = AccessControl.getCredentials("sql.py")
-  connection = cx_Oracle.connect(credentials.user, credentials.password, credentials.connstr)
+  connection = oracledb.connect(user=credentials.user, password=credentials.password, dsn=credentials.connstr)
   # Set autocommit to true.
   connection.autocommit = True
   return connection.cursor()

languages/python/sql.py

@@ -191,15 +191,15 @@ For the full syntax, use "wiscbm -help".
 
 **updatelob**
 
-This program queries against a Large Binary Object(LOB) and then update the selected LOB field with new value of the same row.  PRINT_MEDIA table needs to be provisioned before executing this program.
+This program queries against a Large Binary Object(LOB) field and then update the selected LOB field with new value of the same row.  PRINT_MEDIA table needs to be provisioned before executing this program.
 
 Example usage:
 
   Default connection string
 
   `updatelob`
 
-For the full syntac, use "updatelob -help".
+For the full syntax, use "updatelob -help".
 
 
 **xlaSimple**

quickstart/classic/sample_code/odbc/README.md

@@ -106,7 +106,7 @@ clean:
 		$(PLAT_SPECIFIC_CLEAN)
 
 $(OBJ_DIR):
-        $(MD) obj
+		$(MD) obj
 
 # -----------------------------------------------------------------------------
 # build targets