Skip to content
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.

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

Make DapperRow implement IReadOnlyDictionary<string, object> #913

Merged
merged 1 commit into from
Mar 7, 2018
Merged
Changes from all commits
Commits
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
36 changes: 36 additions & 0 deletions Dapper/SqlMapper.DapperRow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public static partial class SqlMapper
private sealed class DapperRow
: System.Dynamic.IDynamicMetaObjectProvider
, IDictionary<string, object>
, IReadOnlyDictionary<string, object>
{
private readonly DapperTable table;
private object[] values;
Expand Down Expand Up @@ -208,6 +209,41 @@ ICollection<object> IDictionary<string, object>.Values
}

#endregion


#region Implementation of IReadOnlyDictionary<string,object>


int IReadOnlyCollection<KeyValuePair<string, object>>.Count
{
get
{
return values.Count(t => !(t is DeadValue));
}
}

bool IReadOnlyDictionary<string, object>.ContainsKey(string key)
{
int index = table.IndexOfName(key);
return index >= 0 && index < values.Length && !(values[index] is DeadValue);
}

object IReadOnlyDictionary<string, object>.this[string key]
{
get { TryGetValue(key, out object val); return val; }
}

IEnumerable<string> IReadOnlyDictionary<string, object>.Keys
{
get { return this.Select(kv => kv.Key); }
Copy link
Member

@mgravell mgravell Jan 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

possibly return table.FieldNames; ? although this would expose the field-names to abuse... slightly probematic; oh, and this array might be over-sized? hmmm, probably just ignore me

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

edit: yeah, this (my code, not yours) also wouldn't take dead values into account; probably best to leave it alone

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a bad idea. I pretty much copied this from the existing IDictionary implementation, however so it really might be best to leave alone, for the sake of consistency.
(The only difference in the implementation is me skipping the .ToArray() at the end because for this interface it is enough to return an IEnumerable)

}

IEnumerable<object> IReadOnlyDictionary<string, object>.Values
{
get { return this.Select(kv => kv.Value); }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

possibly return values;, although similar concerns to Keys - probably best to leave this "as is", too!

}

#endregion
}
}
}