Fix incorrect column name mapping and format command

src/NPoco.JsonNet/NPoco.JsonNet.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Provides an implementation to use Json.NET as the serializer for serialized columns</Description>
-    <VersionPrefix>5.3.1</VersionPrefix>
+    <VersionPrefix>5.3.2</VersionPrefix>
     <TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
     <AssemblyName>NPoco.JsonNet</AssemblyName>
     <PackageId>NPoco.JsonNet</PackageId>

src/NPoco.SqlServer/DatabaseTypes/SqlServerDatabaseType.cs

@@ -119,7 +119,7 @@ public override string FormatCommand(string sql, object[] args)
                     }
 
                     var p = new SqlParameter();
-                    ParameterHelper.SetParameterValue(this, p, args[i]);
+                    ParameterHelper.SetParameterValue(this, p, value);
                     if (p.Size == 0 || p.SqlDbType == SqlDbType.UniqueIdentifier)
                     {
                         if (value == null && (p.SqlDbType == SqlDbType.NVarChar || p.SqlDbType == SqlDbType.VarChar))

src/NPoco.SqlServer/NPoco.SqlServer.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
 	<Description>An extremely easy to use Micro-ORM supporting Sql Server.</Description>
-	<VersionPrefix>5.3.1</VersionPrefix>
+	<VersionPrefix>5.3.2</VersionPrefix>
 	<TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
 	<AssemblyName>NPoco.SqlServer</AssemblyName>
 	<PackageId>NPoco.SqlServer</PackageId>

src/NPoco/IBaseDatabase.cs

@@ -5,7 +5,7 @@
 
 namespace NPoco
 {
-    public interface IBaseDatabase : IDisposable
+    public interface IBaseDatabase : IDisposable, IDatabaseConfig
     {
         /// <summary>
         /// The underlying connection object

src/NPoco/IDatabase.cs

@@ -7,7 +7,7 @@
 
 namespace NPoco
 {
-    public interface IDatabase : IAsyncDatabase, IDatabaseQuery, IDatabaseConfig
+    public interface IDatabase : IAsyncDatabase, IDatabaseQuery
     {
         /// <summary>
         /// Insert POCO into the table, primary key and autoincrement specified

src/NPoco/NPoco.csproj

@@ -5,7 +5,7 @@
     <TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
     <AssemblyName>NPoco</AssemblyName>
     <PackageId>NPoco</PackageId>
-    <VersionPrefix>5.3.1</VersionPrefix>
+    <VersionPrefix>5.3.2</VersionPrefix>
     <Authors>Adam Schröder</Authors>
     <PackageTags>orm;sql;micro-orm;database;mvc</PackageTags>
     <PackageProjectUrl>https://github.com/schotime/NPoco</PackageProjectUrl>

src/NPoco/RowMappers/PropertyMapperNameConvention.cs

@@ -83,7 +83,7 @@ internal static PocoMember FindMember(IEnumerable<PocoMember> pocoMembers, strin
         {
             return pocoMembers
                 .Where(x => x.ReferenceType == ReferenceType.None)
-                .FirstOrDefault(x => IsPocoMemberEqual(x, prefix, name));
+                .FirstOrDefault(x => x.PocoColumn?.MemberInfoKey == name || IsPocoMemberEqual(x, prefix, name));
         }
 
         private static bool IsPocoMemberEqual(PocoMember pocoMember, string prefix, string name)
@@ -91,9 +91,6 @@ private static bool IsPocoMemberEqual(PocoMember pocoMember, string prefix, stri
             if (pocoMember.PocoColumn == null)
                 return PropertyMapper.IsEqual(name, pocoMember.Name, false);
 
-            if (pocoMember.PocoColumn.MemberInfoKey == name)
-                return true;
-
             if (string.Equals(pocoMember.PocoColumn.ColumnName, PocoDataBuilder.JoinStrings(prefix, name), StringComparison.OrdinalIgnoreCase))
                 return true;
 

src/NPoco/Snapshotter.cs

 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace NPoco
 {
     public static class Snapshotter
     {
-        public static Snapshot<T> StartSnapshot<T>(this IDatabase d, T obj)
+        public static Snapshot<T> StartSnapshot<T>(this IDatabaseConfig d, T obj)
         {
             return new Snapshot<T>(d.PocoDataFactory.ForType(obj.GetType()), obj);
         }
@@ -15,6 +16,11 @@ public static int Update<T>(this IDatabase d, T obj, Snapshot<T> snapshot)
         {
             return d.Update(obj, snapshot.UpdatedColumns());
         }
+
+        public static Task<int> UpdateAsync<T>(this IAsyncDatabase d, T obj, Snapshot<T> snapshot)
+        {
+            return d.UpdateAsync(obj, snapshot.UpdatedColumns());
+        }
     }
 
     public class Snapshot<T>

test/NPoco.Tests/FluentTests/QueryTests/QueryProviderTests.cs

@@ -106,6 +106,13 @@ public void QueryWithWhereFalse()
             Assert.AreEqual(0, users.Count);
         }
 
+        [Test]
+        public void QueryWithWhereContainsNoValues()
+        {
+            var users = Database.Query<User>().Where(x => new int[] {}.Contains(x.UserId)).ToList();
+            Assert.AreEqual(0, users.Count);
+        }
+
         [Test]
         public void QueryWithWhereUserIdAndTrue()
         {