Merge pull request npgsql#225 from danzel/fix-222

franciscojunior · franciscojunior · commit fe7fba2cbe6f · 2014-05-08T12:58:29.000-03:00
Handle IEnumerable&lt;int&gt; parameter
diff --git a/Npgsql/NpgsqlTypes/ArrayHandling.cs b/Npgsql/NpgsqlTypes/ArrayHandling.cs
@@ -282,15 +282,10 @@ private void WriteBinaryArrayData(NpgsqlNativeTypeInfo TypeInfo, Array nativeDat
 
         private bool WriteEnumeration(NpgsqlNativeTypeInfo TypeInfo, IEnumerable col, MemoryStream array, Boolean forExtendedQuery, NativeToBackendTypeConverterOptions options)
         {
-            // As this prcedure handles both prepared and plain query representations, in order to not keep if's inside the loops
-            // we simply set a placeholder here for both openElement ( '{' or '[' ) and closeElement ( '}', or ']' )
-            byte openElement = (byte)(forExtendedQuery ? ASCIIBytes.BraceCurlyLeft : ASCIIBytes.BraceSquareLeft);
-            byte closeElement = (byte)(forExtendedQuery ? ASCIIBytes.BraceCurlyRight : ASCIIBytes.BraceSquareRight);
-
             bool writtenSomething = false;
             bool firstItem = true;
 
-            array.WriteByte(openElement);
+            array.WriteByte((byte)ASCIIBytes.BraceCurlyLeft);
 
             //write each item with a comma between them.
             foreach (object item in col)
@@ -309,7 +304,7 @@ private bool WriteEnumeration(NpgsqlNativeTypeInfo TypeInfo, IEnumerable col, Me
 
             if (writtenSomething)
             {
-                array.WriteByte(closeElement);
+                array.WriteByte((byte)ASCIIBytes.BraceCurlyRight);
 
             }
 
diff --git a/tests/CommandTests.cs b/tests/CommandTests.cs
@@ -28,6 +28,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Linq;
 using Npgsql;
 using NUnit.Framework;
 using System.Data;
@@ -3757,5 +3758,19 @@ public void TestCommentInQuery03()
                 Assert.AreEqual(1, command.ExecuteScalar());
             }
         }
+
+        [Test]
+        public void TestIEnumerableAsArray()
+        {
+            using (var command = new NpgsqlCommand("SELECT :array", Conn))
+            {
+                var expected = new[] { 1, 2, 3, 4 };
+                command.Parameters.AddWithValue("array", expected.Select(x => x));
+                var res = command.ExecuteScalar() as int[];
+
+                Assert.NotNull(res);
+                CollectionAssert.AreEqual(expected, res);
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -282,15 +282,10 @@ private void WriteBinaryArrayData(NpgsqlNativeTypeInfo TypeInfo, Array nativeDat`
`282`	`282`
`283`	`283`	`private bool WriteEnumeration(NpgsqlNativeTypeInfo TypeInfo, IEnumerable col, MemoryStream array, Boolean forExtendedQuery, NativeToBackendTypeConverterOptions options)`
`284`	`284`	`{`
`285`		`- // As this prcedure handles both prepared and plain query representations, in order to not keep if's inside the loops`
`286`		`- // we simply set a placeholder here for both openElement ( '{' or '[' ) and closeElement ( '}', or ']' )`
`287`		`- byte openElement = (byte)(forExtendedQuery ? ASCIIBytes.BraceCurlyLeft : ASCIIBytes.BraceSquareLeft);`
`288`		`- byte closeElement = (byte)(forExtendedQuery ? ASCIIBytes.BraceCurlyRight : ASCIIBytes.BraceSquareRight);`
`289`		`-`
`290`	`285`	`bool writtenSomething = false;`
`291`	`286`	`bool firstItem = true;`
`292`	`287`
`293`		`- array.WriteByte(openElement);`
	`288`	`+ array.WriteByte((byte)ASCIIBytes.BraceCurlyLeft);`
`294`	`289`
`295`	`290`	`//write each item with a comma between them.`
`296`	`291`	`foreach (object item in col)`
`@@ -309,7 +304,7 @@ private bool WriteEnumeration(NpgsqlNativeTypeInfo TypeInfo, IEnumerable col, Me`
`309`	`304`
`310`	`305`	`if (writtenSomething)`
`311`	`306`	`{`
`312`		`- array.WriteByte(closeElement);`
	`307`	`+ array.WriteByte((byte)ASCIIBytes.BraceCurlyRight);`
`313`	`308`
`314`	`309`	`}`
`315`	`310`