Skip to content

Handle IEnumerable<int> parameter #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
franciscojunior merged 2 commits into from
May 8, 2014
Merged

Handle IEnumerable<int> parameter #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57f5202
Add a test for IEnumerable<int> as a parameter. refs #222
danzel May 4, 2014
cf8dd2c
Always use Curly braces here (matches the WriteArray method), fixes #222
danzel May 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions Npgsql/NpgsqlTypes/ArrayHandling.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -309,7 +304,7 @@ private bool WriteEnumeration(NpgsqlNativeTypeInfo TypeInfo, IEnumerable col, Me

if (writtenSomething)
{
array.WriteByte(closeElement);
array.WriteByte((byte)ASCIIBytes.BraceCurlyRight);

}

Expand Down
15 changes: 15 additions & 0 deletions tests/CommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

using System;
using System.Diagnostics;
using System.Linq;
using Npgsql;
using NUnit.Framework;
using System.Data;
Expand Down Expand Up @@ -3700,5 +3701,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);
}
}
}
}