From 61af54a5d090fa2f01453fb0b21fcfecbd366fee Mon Sep 17 00:00:00 2001
From: Marc Gravell <marc.gravell@gmail.com>
Date: Fri, 24 May 2013 12:10:55 +0100
Subject: [PATCH] (via lgsky) - multimap should auto-open/close as necessary

---
 Dapper NET40/SqlMapper.cs |  3 +++
 Tests/Tests.cs            | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/Dapper NET40/SqlMapper.cs b/Dapper NET40/SqlMapper.cs
index 8eb5bb63..04a7637a 100644
--- a/Dapper NET40/SqlMapper.cs	
+++ b/Dapper NET40/SqlMapper.cs	
@@ -1073,11 +1073,13 @@ this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TRetu
             IDbCommand ownedCommand = null;
             IDataReader ownedReader = null;
 
+            bool wasClosed = cnn.State == ConnectionState.Closed;
             try
             {
                 if (reader == null)
                 {
                     ownedCommand = SetupCommand(cnn, transaction, sql, cinfo.ParamReader, (object)param, commandTimeout, commandType);
+                    if (wasClosed) cnn.Open();
                     ownedReader = ownedCommand.ExecuteReader();
                     reader = ownedReader;
                 }
@@ -1118,6 +1120,7 @@ this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TRetu
                     {
                         ownedCommand.Dispose();
                     }
+                    if (wasClosed) cnn.Close();
                 }
             }
         }
diff --git a/Tests/Tests.cs b/Tests/Tests.cs
index d2202789..1e295c4a 100644
--- a/Tests/Tests.cs
+++ b/Tests/Tests.cs
@@ -2186,6 +2186,38 @@ end");
                 conn.State.IsEqualTo(ConnectionState.Closed);
             }
         }
+        class Multi1
+        {
+            public int Id { get; set; }
+        }
+        class Multi2
+        {
+            public int Id { get; set; }
+        }
+        public void QueryMultimapFromClosed()
+        {
+            using (var conn = GetClosedConnection())
+            {
+                conn.State.IsEqualTo(ConnectionState.Closed);
+                var i = conn.Query<Multi1, Multi2, int>("select 2 as [Id], 3 as [Id]", (x, y) => x.Id + y.Id).Single();
+                conn.State.IsEqualTo(ConnectionState.Closed);
+                i.IsEqualTo(5);
+            }
+        }
+        public void QueryMultiple2FromClosed()
+        {
+            using (var conn = GetClosedConnection())
+            {
+                conn.State.IsEqualTo(ConnectionState.Closed);
+                using (var multi = conn.QueryMultiple("select 1 select 2 select 3"))
+                {
+                    multi.Read<int>().Single().IsEqualTo(1);
+                    multi.Read<int>().Single().IsEqualTo(2);
+                    // not reading 3 is intentional here
+                }
+                conn.State.IsEqualTo(ConnectionState.Closed);
+            }
+        }
         public void ExecuteInvalidFromClosed()
         {
             using (var conn = GetClosedConnection())