1 files changed, 10 insertions, 41 deletions

diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs
index 64c4fcfe661..fe242f3bf8f 100644
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs
@@ -223,14 +223,7 @@ namespace System.Data.Odbc
 				return (IDbTransaction) Transaction;

 			}

 			set {

-				 if (value is OdbcTransaction)
-                                {
-                                        Transaction = (OdbcTransaction)value;
-                                }
-                                else
-                                {
-                                        throw new ArgumentException ();
-                                }
+				throw new NotImplementedException ();

 			}

 		}

 

@@ -292,12 +285,6 @@ namespace System.Data.Odbc
 

 		public int ExecuteNonQuery ()

 		{

-			return ExecuteNonQuery (true);
-		}

-

-		private int ExecuteNonQuery (bool freeHandle) 
-		{
-			int records = 0;
 			if (connection == null)

 				throw new InvalidOperationException ();

 			if (connection.State == ConnectionState.Closed)

@@ -305,29 +292,12 @@ namespace System.Data.Odbc
 			// FIXME: a third check is mentioned in .NET docs

 

 			ExecSQL(CommandText);

-
-			// .NET documentation says that except for INSERT, UPDATE and
-                        // DELETE  where the return value is the number of rows affected
-                        // for the rest of the commands the return value is -1.
-                        if ((CommandText.ToUpper().IndexOf("UPDATE")!=-1) ||
-                                    (CommandText.ToUpper().IndexOf("INSERT")!=-1) ||
-                                    (CommandText.ToUpper().IndexOf("DELETE")!=-1)) {
-                                                                                                    
-                                        int numrows = 0;
-                                        OdbcReturn ret = libodbc.SQLRowCount(hstmt,ref numrows);
-                                        records = numrows;
-                        }
-                        else
-                                        records = -1;
-

-			if (freeHandle && !prepared) {

-				OdbcReturn ret = libodbc.SQLFreeHandle( (ushort) OdbcHandleType.Stmt, hstmt);

-				if ((ret!=OdbcReturn.Success) && (ret!=OdbcReturn.SuccessWithInfo)) 

-					throw new OdbcException(new OdbcError("SQLFreeHandle",OdbcHandleType.Stmt,hstmt));

-			}
-			return records;

-		}
-
+

+//			if (!prepared)

+//				libodbc.SQLFreeHandle( (ushort) OdbcHandleType.Stmt, hstmt);

+			return 0;

+		}

+

 		public void Prepare()

 		{

 			OdbcReturn ret=libodbc.SQLAllocHandle(OdbcHandleType.Stmt, Connection.hDbc, ref hstmt);

@@ -360,7 +330,7 @@ namespace System.Data.Odbc
 

 		public OdbcDataReader ExecuteReader (CommandBehavior behavior)

 		{

-			ExecuteNonQuery(false);

+			ExecuteNonQuery();

 			dataReader=new OdbcDataReader(this,behavior);

 			return dataReader;

 		}

@@ -372,12 +342,11 @@ namespace System.Data.Odbc
 		

 		public object ExecuteScalar ()

 		{

-			object val = null;

+			object val;

 			OdbcDataReader reader=ExecuteReader();

 			try

 			{

-				if (reader.Read ())

-					val=reader[0];

+				val=reader[0];

 			}

 			finally

 			{