2006-01-02 Daniel Morgan <[email protected]>

	* System.Data.OracleClient/OracleConnection.cs: dispose of the
	connection string and other fields
	
	* Test/TestOracleClient.cs: tests for Intergrated Security
	and Persist Secuirty Info connection string parameters

svn path=/trunk/mcs/; revision=54951

mcs/class/System.Data.OracleClient/ChangeLog

@@ -1,3 +1,11 @@
+2006-01-02  Daniel Morgan <[email protected]>
+
+	* System.Data.OracleClient/OracleConnection.cs: dispose of the
+	connection string and other fields
+	
+	* Test/TestOracleClient.cs: tests for Intergrated Security
+	and Persist Secuirty Info connection string parameters
+
 2006-01-01  Daniel Morgan <[email protected]>
 
 	* System.Data.OracleClient/OracleConnection.cs: implement

mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleConnection.cs

@@ -64,6 +64,7 @@ namespace System.Data.OracleClient
 		int minPoolSize = 0;
 		int maxPoolSize = 100;
 		byte persistSecurityInfo = 1;
+		bool disposed = false;
 
 		#endregion // Fields
 
@@ -257,7 +258,21 @@ namespace System.Data.OracleClient
 		[MonoTODO]
 		protected override void Dispose (bool disposing)
 		{
-			base.Dispose (disposing);
+			if (!disposed) {
+				if (State == ConnectionState.Open)
+					Close ();
+				dataReader = null;
+				transaction = null;
+				oci = null;
+				pool = null;
+				conInfo.Username = "";
+				conInfo.Database = "";
+				conInfo.Password = "";
+				connectionString = "";
+				parsedConnectionString = "";
+				base.Dispose (disposing);
+				disposed = true;
+			}
 		}
 
 		[MonoTODO]

mcs/class/System.Data.OracleClient/Test/TestOracleClient.cs

@@ -1940,6 +1940,132 @@ namespace Test.OracleClient
 
 			reader.Close();
 		}
+
+		static void ExternalAuthenticationTest () 
+		{
+			string user = Environment.UserName;
+			if (!Environment.UserDomainName.Equals(String.Empty))
+				user = Environment.UserDomainName + "\\" + Environment.UserName;
+			Console.WriteLine("Environment UserDomainName and UserName: " + user);
+			Console.WriteLine("Open connection using external authentication...");
+			OracleConnection con = new OracleConnection("Data Source=palis;Integrated Security=true");
+			try {
+				con.Open();
+				OracleCommand cmd = con.CreateCommand();
+				cmd.CommandText = "SELECT USER FROM DUAL";
+				OracleDataReader reader = cmd.ExecuteReader();
+				if (reader.Read())
+					Console.WriteLine("User: " + reader.GetString(reader.GetOrdinal("USER")));
+				con.Close();
+			}
+			catch (Exception e) {
+				Console.WriteLine("Exception caught: " + e.Message);
+				Console.WriteLine("Probably not setup for external authentication.");
+			}
+			con.Dispose();
+			con = null;
+		}
+
+		public static void TestPersistSucurityInfo1() 
+		{
+			Console.WriteLine("\nTestPersistSucurityInfo1 - persist security info=false");
+			OracleConnection con = new OracleConnection("data source=palis;user id=scott;password=tiger;persist security info=false");
+			Console.WriteLine("ConnectionString before open: " + con.ConnectionString);
+			con.Open();
+			Console.WriteLine("ConnectionString after open: " + con.ConnectionString);
+			con.Close();
+			Console.WriteLine("ConnectionString after close: " + con.ConnectionString);
+			con = null;
+		}
+
+		public static void TestPersistSucurityInfo2() 
+		{
+			Console.WriteLine("\nTestPersistSucurityInfo2 - persist security info=true");
+			OracleConnection con = new OracleConnection("data source=palis;user id=scott;password=tiger;persist security info=true");
+			Console.WriteLine("ConnectionString before open: " + con.ConnectionString);
+			con.Open();
+			Console.WriteLine("ConnectionString after open: " + con.ConnectionString);
+			con.Close();
+			Console.WriteLine("ConnectionString after close: " + con.ConnectionString);
+			con = null;
+		}
+
+		public static void TestPersistSucurityInfo3() 
+		{
+			Console.WriteLine("\nTestPersistSucurityInfo3 - use default for persist security info which is false");
+			OracleConnection con = new OracleConnection("data source=palis;user id=scott;password=tiger");
+			Console.WriteLine("ConnectionString before open: " + con.ConnectionString);
+			con.Open();
+			Console.WriteLine("ConnectionString after open: " + con.ConnectionString);
+			con.Close();
+			Console.WriteLine("ConnectionString after close: " + con.ConnectionString);
+			con = null;
+		}
+
+		public static void TestPersistSucurityInfo4() 
+		{
+			Console.WriteLine("\nTestPersistSucurityInfo4 - persist security info=false with password at front");
+			OracleConnection con = new OracleConnection(";password=tiger;data source=palis;user id=scott;persist security info=false");
+			Console.WriteLine("ConnectionString before open: " + con.ConnectionString);
+			con.Open();
+			Console.WriteLine("ConnectionString after open: " + con.ConnectionString);
+			con.Close();
+			Console.WriteLine("ConnectionString after close: " + con.ConnectionString);
+			con = null;
+		}
+
+		public static void TestPersistSucurityInfo5() 
+		{
+			Console.WriteLine("\nTestPersistSucurityInfo5 - persist security info=false");
+			OracleConnection con = new OracleConnection("data source=palis;user id=scott;password=tiger;persist security info=false");
+			Console.WriteLine("ConnectionString before open: " + con.ConnectionString);
+			con.Open();
+			Console.WriteLine("ConnectionString after open: " + con.ConnectionString);
+			Console.WriteLine("ConnectionState for con: " + con.State.ToString() + "\n");
+		
+			Console.WriteLine("Clone OracleConnection...");
+			OracleConnection con2 = (OracleConnection) ((ICloneable) con).Clone();
+		
+			Console.WriteLine("ConnectionState for con2: " + con2.State.ToString());
+			Console.WriteLine("con2 ConnectionString before open: " + con2.ConnectionString);
+			con2.Open();
+			Console.WriteLine("con2 ConnectionString after open: " + con2.ConnectionString);
+			con2.Close();
+			Console.WriteLine("con2 ConnectionString after close: " + con2.ConnectionString);
+		
+			con.Close();
+		}
+
+		public static void TestPersistSucurityInfo6() 
+		{
+			Console.WriteLine("\nTestPersistSucurityInfo6 - external auth using persist security info");
+
+			string user = Environment.UserName;
+			if (!Environment.UserDomainName.Equals(String.Empty))
+				user = Environment.UserDomainName + "\\" + Environment.UserName;
+			Console.WriteLine("Environment UserDomainName and UserName: " + user);
+			Console.WriteLine("Open connection using external authentication...");
+			OracleConnection con = new OracleConnection("Data Source=palis;Integrated Security=true");
+			Console.WriteLine("ConnectionString before open: " + con.ConnectionString);
+			try {
+				con.Open();
+				OracleCommand cmd = con.CreateCommand();
+				cmd.CommandText = "SELECT USER FROM DUAL";
+				OracleDataReader reader = cmd.ExecuteReader();
+				if (reader.Read())
+					Console.WriteLine("User: " + reader.GetString(reader.GetOrdinal("USER")));
+				con.Close();
+				Console.WriteLine("ConnectionString after close: " + con.ConnectionString);
+			}
+			catch (Exception e) {
+				Console.WriteLine("Exception caught: " + e.Message);
+				Console.WriteLine("Probably not setup for external authentication. This is fine.");
+			}
+			con.Dispose();
+			Console.WriteLine("ConnectionString after dispose: " + con.ConnectionString);
+			con = null;
+			Console.WriteLine("\n\n");
+		}
 
 		public static void ConnectionPoolingTest1 () 
 		{
@@ -2154,6 +2280,15 @@ namespace Test.OracleClient
 			con1.Close ();
 			Console.WriteLine("Closed.");
 
+			ExternalAuthenticationTest();
+
+			TestPersistSucurityInfo1();
+			TestPersistSucurityInfo2();
+			TestPersistSucurityInfo3();
+			TestPersistSucurityInfo4();
+			TestPersistSucurityInfo5();
+			TestPersistSucurityInfo6();
+
 			//conStr = conStr + ";pooling=true;min pool size=4;max pool size=" + MAX_CONNECTIONS.ToString ();
 			//ConnectionPoolingTest1 ();
 			//ConnectionPoolingTest2 ();