Backmerge origin changes into my fork

README.md

@@ -20,7 +20,7 @@ For beginning Oracle .NET developers, these <a href="http://www.oracle.com/techn
 
 <H2>More Information</H2>
 <ul>
-<li><a href="http://docs.oracle.com/cd/E63277_01/index.htm">Documentation</a></li>
+<li><a href="https://docs.oracle.com/en/database/oracle/oracle-data-access-components/19.3/">Documentation</a></li>
 <li>Code samples are included with the ODAC Oracle Universal Installation. You will find them in the "ODACSamples" directory in the Oracle Client installation home (e.g. d:\app\client\&lt;username&gt;\product\&lt;Oracle version&gt;\client_1\ODACsamples).</li>
 <li>Contibutions to code samples should review <a href="CONTRIBUTING.md">CONTRIBUTING</a> for more details.</li>
 <li>You may use files in this repository only if in compliance with the <a href="LICENSE">LICENSE</a>.</li>

samples/array-bind/ArrayBind.cs

@@ -31,7 +31,8 @@ class ArrayBind
     static void Main(string[] args)
     {
       // Connect
-      string connectStr = "User Id=scott;Password=tiger;Data Source=oracle";
+      // This sample code's DEPT table shares the same characteristics as SCOTT schema's DEPT table
+      string connectStr = "User Id=<USER ID>;Password=<PASSWORD>;Data Source=<TNS ALIAS>";
 
       // Setup the Tables for sample
       Setup(connectStr);

samples/assoc-array/AssocArray.cs

@@ -32,8 +32,8 @@ static void Main(string[] args)
     {
       Console.WriteLine("Demo: PL/SQL Associative Array");
 
-      // Connect
-      string connectStr = "User Id=scott;Password=tiger;Data Source=oracle";
+      // Provide password and connect
+      string connectStr = "User Id=scott;Password=<PASSWORD>;Data Source=oracle";
 
       // Setup the Tables for sample
       Setup(connectStr);

samples/autonomous-db/README.md

@@ -1,8 +1,8 @@
-These ODP.NET Autonomous DB code samples are intended to be used with the [Developing .NET Applications for Oracle Autonomous Database tutorial](https://www.oracle.com/technetwork/topics/dotnet/tech-info/default-5032178.html). 
+These ODP.NET Autonomous Database code samples are intended to be used with the [Developing .NET Framework Applications for Oracle Autonomous Database tutorial](https://www.oracle.com/database/technologies/appdev/dotnet/adbdotnetfw.html). 
 
-This sample demonstrates how to connect to Oracle Autonomous Database, Including Oracle Autonomous Transaction Processing and Autonomous Data Warehouse.
+This sample demonstrates how to connect to Oracle Autonomous Database, including Oracle Autonomous Transaction Processing and Autonomous Data Warehouse.
 
-Create a new .NET Framework project and add either managed or unmanaged ODP.NET assembly. Managed ODP.NET ([Oracle.ManagedDataAccess](https://www.nuget.org/packages/Oracle.ManagedDataAccess)) can be downloaded from NuGet Gallery. Unmanaged ODP.NET can be added after an [ODAC installation](https://www.oracle.com/database/technologies/dotnet-odacdev-downloads.html). Paste the sample code into the project. You can then enter your ADB connection and configuration information into the sample code as described in the comments.
+Create a new .NET Framework project and add either managed or unmanaged ODP.NET assembly. Oracle recommends using managed ODP.NET for most .NET Framework apps. Managed ODP.NET ([Oracle.ManagedDataAccess](https://www.nuget.org/packages/Oracle.ManagedDataAccess)) can be downloaded from NuGet Gallery. Unmanaged ODP.NET can be added after an [ODAC installation](https://www.oracle.com/database/technologies/dotnet-odacdeploy-downloads.html). Paste the sample code into the project. You can then enter your ADB connection and configuration information into the sample code as described in the comments.
 
 This directory contains the 
 managed and unmanaged ODP.NET samples. The ODP.NET Core sample is located [here](https://github.com/oracle/dotnet-db-samples/tree/master/samples/dotnet-core/autonomous-db).

samples/autonomous-db/managed-odp/web-app/README.md

@@ -0,0 +1,7 @@
+To use the ASP.NET web sample code:
+1. Create an empty ASP.NET Web Application (.NET Framework) in Visual Studio. 
+2. Add managed ODP.NET (Oracle.ManagedDataAccess) to your project from NuGet Gallery.
+3. Save the files in this Github directory to your local project directory. 
+4. Add the files to your web project as existing items.
+5. Modify the User Id, Password, and Data Source as necessary to connect to your Autonomous Database instance.
+6. Run the app.

samples/client-factory/ClientFactory.cs

@@ -15,42 +15,42 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- *****************************************************************************/
-
-using System;
-using System.Data;
-using System.Data.Common;
-using Oracle.ManagedDataAccess.Client;
-
-class FactorySample
-{
-  static void Main()
-  {
-    string constr = "user id=scott;password=tiger;data source=oracle";
-
-    DbProviderFactory factory =
-            DbProviderFactories.GetFactory("Oracle.ManagedDataAccess.Client");
-
-    DbConnection conn = factory.CreateConnection();
-
-    try
-    {
-      conn.ConnectionString = constr;
-      conn.Open();
-
-      DbCommand cmd = factory.CreateCommand();
-      cmd.Connection = conn;
-      cmd.CommandText = "select * from emp";
-
-      DbDataReader reader = cmd.ExecuteReader();
-      while (reader.Read())
-        Console.WriteLine(reader["EMPNO"] + " : " + reader["ENAME"]);
-    }
-    catch (Exception ex)
-    {
-      Console.WriteLine(ex.Message);
-      Console.WriteLine(ex.StackTrace);
-    }
-  }
-}
-
+ *****************************************************************************/
+
+using System;
+using System.Data;
+using System.Data.Common;
+using Oracle.ManagedDataAccess.Client;
+
+class FactorySample
+{
+  static void Main()
+  {
+    string constr = "user id=scott;password=<PASSWORD>;data source=oracle";
+
+    DbProviderFactory factory =
+            DbProviderFactories.GetFactory("Oracle.ManagedDataAccess.Client");
+
+    DbConnection conn = factory.CreateConnection();
+
+    try
+    {
+      conn.ConnectionString = constr;
+      conn.Open();
+
+      DbCommand cmd = factory.CreateCommand();
+      cmd.Connection = conn;
+      cmd.CommandText = "select * from emp";
+
+      DbDataReader reader = cmd.ExecuteReader();
+      while (reader.Read())
+        Console.WriteLine(reader["EMPNO"] + " : " + reader["ENAME"]);
+    }
+    catch (Exception ex)
+    {
+      Console.WriteLine(ex.Message);
+      Console.WriteLine(ex.StackTrace);
+    }
+  }
+}
+

samples/connection-string-builder/ConnectionStringBuilder.cs

@@ -27,7 +27,7 @@ class ConnectionStringBuilderSample
 {
   static void Main(string[] args)
   {
-    string connString = "user id=scott;password=tiger;Data source=oracle;";
+    string connString = "user id=scott;password=<PASSWORD>;Data source=oracle;";
     bool bRet = false;
 
     // Create an instance of OracleConnectionStringBuilder

samples/connection/Connection1.cs

@@ -15,40 +15,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- *****************************************************************************/
-
-using System;
-using System.Data;
-using System.Data.Common;
-using Oracle.ManagedDataAccess.Client;
-
-class GetSchemaSample
-{
-  static void Main(string[] args)
-  {
-    string constr = "User Id=scott; Password=tiger; Data Source=oracle;";
-    string ProviderName = "Oracle.ManagedDataAccess.Client";
-
-    DbProviderFactory factory = DbProviderFactories.GetFactory(ProviderName);
-
-    using (DbConnection conn = factory.CreateConnection())
-    {
-      try
-      {
-        conn.ConnectionString = constr;
-        conn.Open();
-
-        //Get all the schema collections and write to an XML file. 
-        //The XML file name is Oracle.ManagedDataAccess.Client_Schema.xml
-        DataTable dtSchema = conn.GetSchema();
-        dtSchema.WriteXml(ProviderName + "_Schema.xml");
-      }
-      catch (Exception ex)
-      {
-        Console.WriteLine(ex.Message);
-        Console.WriteLine(ex.StackTrace);
-      }
-    }
-  }
-}
-
+ *****************************************************************************/
+
+using System;
+using System.Data;
+using System.Data.Common;
+using Oracle.ManagedDataAccess.Client;
+
+class GetSchemaSample
+{
+  static void Main(string[] args)
+  {
+    string constr = "User Id=scott; Password=<PASSWORD>; Data Source=oracle;";
+    string ProviderName = "Oracle.ManagedDataAccess.Client";
+
+    DbProviderFactory factory = DbProviderFactories.GetFactory(ProviderName);
+
+    using (DbConnection conn = factory.CreateConnection())
+    {
+      try
+      {
+        conn.ConnectionString = constr;
+        conn.Open();
+
+        //Get all the schema collections and write to an XML file. 
+        //The XML file name is Oracle.ManagedDataAccess.Client_Schema.xml
+        DataTable dtSchema = conn.GetSchema();
+        dtSchema.WriteXml(ProviderName + "_Schema.xml");
+      }
+      catch (Exception ex)
+      {
+        Console.WriteLine(ex.Message);
+        Console.WriteLine(ex.StackTrace);
+      }
+    }
+  }
+}
+

samples/connection/Connection2.cs

@@ -15,74 +15,74 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- *****************************************************************************/
-
-using System;
-using System.Data;
-using System.Data.Common;
-using Oracle.ManagedDataAccess.Client;
-
-class GetSchemaSample
-{
-  static void Main(string[] args)
-  {
-    string constr = "User Id=scott; Password=tiger; Data Source=oracle;";
-    string ProviderName = "Oracle.ManagedDataAccess.Client";
-
-    DbProviderFactory factory = DbProviderFactories.GetFactory(ProviderName);
-
-    using (DbConnection conn = factory.CreateConnection())
-    {
-      try
-      {
-        conn.ConnectionString = constr;
-        conn.Open();
-
-        //Get MetaDataCollections and write to an XML file.
-        //This is equivalent to GetSchema()
-        DataTable dtMetadata =
-          conn.GetSchema(DbMetaDataCollectionNames.MetaDataCollections);
-        dtMetadata.WriteXml(ProviderName + "_MetaDataCollections.xml");
-
-        //Get Restrictions and write to an XML file.
-        DataTable dtRestrictions =
-          conn.GetSchema(DbMetaDataCollectionNames.Restrictions);
-        dtRestrictions.WriteXml(ProviderName + "_Restrictions.xml");
-
-        //Get DataSourceInformation and write to an XML file.
-        DataTable dtDataSrcInfo =
-          conn.GetSchema(DbMetaDataCollectionNames.DataSourceInformation);
-        dtDataSrcInfo.WriteXml(ProviderName + "_DataSourceInformation.xml");
-
-        //DataTypes and write to an XML file.
-        DataTable dtDataTypes =
-          conn.GetSchema(DbMetaDataCollectionNames.DataTypes);
-        dtDataTypes.WriteXml(ProviderName + "_DataTypes.xml");
-
-        //Get ReservedWords and write to an XML file.
-        DataTable dtReservedWords =
-          conn.GetSchema(DbMetaDataCollectionNames.ReservedWords);
-        dtReservedWords.WriteXml(ProviderName + "_ReservedWords.xml");
-
-        //Get all the tables and write to an XML file.
-        DataTable dtTables = conn.GetSchema("Tables");
-        dtTables.WriteXml(ProviderName + "_Tables.xml");
-
-        //Get all the views and write to an XML file.
-        DataTable dtViews = conn.GetSchema("Views");
-        dtViews.WriteXml(ProviderName + "_Views.xml");
-
-        //Get all the columns and write to an XML file.
-        DataTable dtColumns = conn.GetSchema("Columns");
-        dtColumns.WriteXml(ProviderName + "_Columns.xml");
-      }
-      catch (Exception ex)
-      {
-        Console.WriteLine(ex.Message);
-        Console.WriteLine(ex.StackTrace);
-      }
-    }
-  }
-}
-
-
+ *****************************************************************************/
+
+using System;
+using System.Data;
+using System.Data.Common;
+using Oracle.ManagedDataAccess.Client;
+
+class GetSchemaSample
+{
+  static void Main(string[] args)
+  {
+    string constr = "User Id=scott; Password=<PASSWORD>; Data Source=oracle;";
+    string ProviderName = "Oracle.ManagedDataAccess.Client";
+
+    DbProviderFactory factory = DbProviderFactories.GetFactory(ProviderName);
+
+    using (DbConnection conn = factory.CreateConnection())
+    {
+      try
+      {
+        conn.ConnectionString = constr;
+        conn.Open();
+
+        //Get MetaDataCollections and write to an XML file.
+        //This is equivalent to GetSchema()
+        DataTable dtMetadata =
+          conn.GetSchema(DbMetaDataCollectionNames.MetaDataCollections);
+        dtMetadata.WriteXml(ProviderName + "_MetaDataCollections.xml");
+
+        //Get Restrictions and write to an XML file.
+        DataTable dtRestrictions =
+          conn.GetSchema(DbMetaDataCollectionNames.Restrictions);
+        dtRestrictions.WriteXml(ProviderName + "_Restrictions.xml");
+
+        //Get DataSourceInformation and write to an XML file.
+        DataTable dtDataSrcInfo =
+          conn.GetSchema(DbMetaDataCollectionNames.DataSourceInformation);
+        dtDataSrcInfo.WriteXml(ProviderName + "_DataSourceInformation.xml");
+
+        //DataTypes and write to an XML file.
+        DataTable dtDataTypes =
+          conn.GetSchema(DbMetaDataCollectionNames.DataTypes);
+        dtDataTypes.WriteXml(ProviderName + "_DataTypes.xml");
+
+        //Get ReservedWords and write to an XML file.
+        DataTable dtReservedWords =
+          conn.GetSchema(DbMetaDataCollectionNames.ReservedWords);
+        dtReservedWords.WriteXml(ProviderName + "_ReservedWords.xml");
+
+        //Get all the tables and write to an XML file.
+        DataTable dtTables = conn.GetSchema("Tables");
+        dtTables.WriteXml(ProviderName + "_Tables.xml");
+
+        //Get all the views and write to an XML file.
+        DataTable dtViews = conn.GetSchema("Views");
+        dtViews.WriteXml(ProviderName + "_Views.xml");
+
+        //Get all the columns and write to an XML file.
+        DataTable dtColumns = conn.GetSchema("Columns");
+        dtColumns.WriteXml(ProviderName + "_Columns.xml");
+      }
+      catch (Exception ex)
+      {
+        Console.WriteLine(ex.Message);
+        Console.WriteLine(ex.StackTrace);
+      }
+    }
+  }
+}
+
+