Remove cursor dereferencing

Closes #438
npgsql · Jun 3, 2015 · 567a05c · 567a05c
1 parent 642b3ce
commit 567a05c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 37 deletions.
diff --git a/src/Npgsql/NpgsqlCommand.cs b/src/Npgsql/NpgsqlCommand.cs
@@ -940,24 +940,7 @@ NpgsqlDataReader ExecuteDbDataReaderInternal(CommandBehavior behavior)
             try
             {
                 ValidateAndCreateMessages(behavior);
-                var reader = Execute(behavior);
-
-                // Transparently dereference cursors returned from functions
-                if (CommandType == CommandType.StoredProcedure &&
-                    reader.FieldCount == 1 &&
-                    reader.GetDataTypeName(0) == "refcursor")
-                {
-                    var sb = new StringBuilder();
-                    while (reader.Read()) {
-                        sb.AppendFormat(@"FETCH ALL FROM ""{0}"";", reader.GetString(0));
-                    }
-                    reader.Dispose();
-
-                    var dereferenceCmd = new NpgsqlCommand(sb.ToString(), Connection);
-                    return dereferenceCmd.ExecuteReader(behavior);
-                }
-
-                return reader;
+                return Execute(behavior);
             }
             catch
             {

diff --git a/test/Npgsql.Tests/FunctionTests.cs b/test/Npgsql.Tests/FunctionTests.cs
@@ -105,25 +105,6 @@ public void TooManyOutputParams()
             Assert.That(command.Parameters["c"].Value, Is.EqualTo(-1));
         }
 
-        [Test]
-        public void MultipleRefCursorSupport()
-        {
-            ExecuteNonQuery(@"CREATE FUNCTION pg_temp.func() RETURNS SETOF refcursor AS 'DECLARE ref1 refcursor; ref2 refcursor; BEGIN OPEN ref1 FOR SELECT 1; RETURN NEXT ref1; OPEN ref2 FOR SELECT 2; RETURN next ref2; RETURN; END;' LANGUAGE 'plpgsql';");
-            using (Conn.BeginTransaction())
-            {
-                var command = new NpgsqlCommand("pg_temp.func", Conn);
-                command.CommandType = CommandType.StoredProcedure;
-                using (var dr = command.ExecuteReader())
-                {
-                    dr.Read();
-                    Assert.That(dr.GetInt32(0), Is.EqualTo(1));
-                    dr.NextResult();
-                    dr.Read();
-                    Assert.That(dr.GetInt32(0), Is.EqualTo(2));
-                }
-            }
-        }
-
         [Test]
         public void SingleRow()
         {