2009-11-20 Veerapuram Varadhan <vvaradhan@novell.com>

        * Npgsql.dll.sources: Add
        Npgsql{Factory,ConnectionStringBuilder}.cs
        * Npgsql/NpgsqlConnectionString.cs: Comment out redefinition of
        SslMode.
	* Npgsql/NpgsqlConnectionStringBuilder.cs: Mark it for 2.x profile
        onwards.
        * Npgsql/NpgsqlFactory.cs: Make methods to work also on 2.x profile

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

5 files changed, 38 insertions, 10 deletions

diff --git a/mcs/class/Npgsql/ChangeLog b/mcs/class/Npgsql/ChangeLog
index 6d3ec4026af..a91ba40c6b3 100644
--- a/mcs/class/Npgsql/ChangeLog
+++ b/mcs/class/Npgsql/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-20  Veerapuram Varadhan  <vvaradhan@novell.com>
+
+	* Npgsql.dll.sources: Add
+	Npgsql{Factory,ConnectionStringBuilder}.cs
+	* Npgsql/NpgsqlConnectionString.cs: Comment out redefinition of
+	SslMode.
+	* Npgsql/NpgsqlConnectionStringBuilder.cs: Mark it for 2.x profile
+	onwards.
+	* Npgsql/NpgsqlFactory.cs: Make methods to work also on 2.x profile
+	
 2008-11-05  Francisco Figueiredo Jr.  <francisco@npgsql.org>
 
 	Undone update as it breaks the svn tree. 
diff --git a/mcs/class/Npgsql/Npgsql.dll.sources b/mcs/class/Npgsql/Npgsql.dll.sources
index 29c1d0c19e8..631031c771f 100755
--- a/mcs/class/Npgsql/Npgsql.dll.sources
+++ b/mcs/class/Npgsql/Npgsql.dll.sources
@@ -15,6 +15,7 @@ Npgsql/NpgsqlCommandBuilder.cs
 Npgsql/NpgsqlConnectedState.cs
 Npgsql/NpgsqlConnection.cs
 Npgsql/NpgsqlConnectionString.cs
+Npgsql/NpgsqlConnectionStringBuilder.cs
 Npgsql/NpgsqlConnector.cs
 Npgsql/NpgsqlConnectorPool.cs
 Npgsql/NpgsqlDataAdapter.cs
@@ -24,6 +25,7 @@ Npgsql/NpgsqlError.cs
 Npgsql/NpgsqlEventLog.cs
 Npgsql/NpgsqlException.cs
 Npgsql/NpgsqlExecute.cs
+Npgsql/NpgsqlFactory.cs
 Npgsql/NpgsqlFlush.cs
 Npgsql/NpgsqlMediator.cs
 Npgsql/NpgsqlMessageTypes.cs
diff --git a/mcs/class/Npgsql/Npgsql/NpgsqlConnectionString.cs b/mcs/class/Npgsql/Npgsql/NpgsqlConnectionString.cs
index df57055777b..9251c117158 100644
--- a/mcs/class/Npgsql/Npgsql/NpgsqlConnectionString.cs
+++ b/mcs/class/Npgsql/Npgsql/NpgsqlConnectionString.cs
@@ -4,11 +4,14 @@
 //
 // Author:
 //	Glen Parker (glenebob@nwlink.com)
+//	Veerapuram Varadhan  (vvaradhan@novell.com)
 //
 //	Copyright (C) 2002 The Npgsql Development Team
 //	npgsql-general@gborg.postgresql.org
 //	http://gborg.postgresql.org/project/npgsql/projdisplay.php
 //
+//	Copyright (C) 2009 Novell Inc
+//
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
@@ -446,7 +449,8 @@ namespace Npgsql
         public static readonly Boolean SyncNotification     = false;
         public static readonly Int32 CommandTimeout         = 20; // Seconds
     }
-    
+
+    /*
     internal enum SslMode
     {
         Disable = 1 << 0,
@@ -454,6 +458,7 @@ namespace Npgsql
         Prefer =  1 << 2,
         Require = 1 << 3
     }
+    */
 
 
 
diff --git a/mcs/class/Npgsql/Npgsql/NpgsqlConnectionStringBuilder.cs b/mcs/class/Npgsql/Npgsql/NpgsqlConnectionStringBuilder.cs
index 2870d90f32e..ce51262c781 100644
--- a/mcs/class/Npgsql/Npgsql/NpgsqlConnectionStringBuilder.cs
+++ b/mcs/class/Npgsql/Npgsql/NpgsqlConnectionStringBuilder.cs
@@ -13,6 +13,8 @@
 
 //	Tao Wang (dancefire@gmail.com)
 
+//	Veerapuram Varadhan  (vvaradhan@novell.com)
+
 //
 
 //	Copyright (C) 2007 The Npgsql Development Team
@@ -23,6 +25,8 @@
 
 //
 
+//	Copyright (C) 2009 Novell Inc
+
 // Permission to use, copy, modify, and distribute this software and its
 
 // documentation for any purpose, without fee, and without a written
@@ -55,7 +59,7 @@
 
 // TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-
+#if NET_2_0
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
@@ -1053,4 +1057,6 @@ namespace Npgsql
 
 		Require = 1 << 3
 	}
-}
\ No newline at end of file
+	
+#endif
+}
diff --git a/mcs/class/Npgsql/Npgsql/NpgsqlFactory.cs b/mcs/class/Npgsql/Npgsql/NpgsqlFactory.cs
index e754caede13..446cb6609b9 100755
--- a/mcs/class/Npgsql/Npgsql/NpgsqlFactory.cs
+++ b/mcs/class/Npgsql/Npgsql/NpgsqlFactory.cs
@@ -2,8 +2,10 @@
 //
 // Author:
 //	Francisco Jr. (fxjrlists@yahoo.com.br)
+//	Veerapuram Varadhan  (vvaradhan@novell.com)
 //
 //	Copyright (C) 2002-2006 The Npgsql Development Team
+//	Copyright (C) 2009 Novell Inc
 //
 // Permission to use, copy, modify, and distribute this software and its
 // documentation for any purpose, without fee, and without a written
@@ -23,6 +25,8 @@
 // TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
 using System;
+using System.ComponentModel;
+using System.Data;
 using System.Data.Common;
 
 namespace Npgsql
@@ -46,35 +50,36 @@ namespace Npgsql
 		/// </summary>
 		public override DbCommand CreateCommand()
 		{
-			return new NpgsqlCommand();
+			return (DbCommand) (IDbCommand) new NpgsqlCommand();
 		}
 
 
 		public override DbCommandBuilder CreateCommandBuilder()
 		{
-			return new NpgsqlCommandBuilder();
+			return (DbCommandBuilder) (Component) new NpgsqlCommandBuilder();
 		}
 
 		public override DbConnection CreateConnection()
 		{
-			return new NpgsqlConnection();
+		    return (DbConnection) (IDbConnection) new NpgsqlConnection();
 		}
 
 		public override DbDataAdapter CreateDataAdapter()
 		{
-			return new NpgsqlDataAdapter();
+		    return (DbDataAdapter) (IDbDataAdapter) new NpgsqlDataAdapter();
 		}
 
 		public override DbParameter CreateParameter()
 		{
-			return new NpgsqlParameter();
+		    return (DbParameter) (IDbDataParameter) new NpgsqlParameter();
 		}
 
+#if NET_2_0
 		public override DbConnectionStringBuilder CreateConnectionStringBuilder()
 		{
 			return new NpgsqlConnectionStringBuilder();
 		}
-
+#endif
 		#region IServiceProvider Members
 
 		public object GetService(Type serviceType)
@@ -89,4 +94,4 @@ namespace Npgsql
 
 		#endregion
 	}
-}
\ No newline at end of file
+}