Merge pull request #25 from greygeek/d93b0991

Update object's key(s) after insert and array parameter support.

Dapper.Contrib/SqlMapperExtensions.cs

@@ -486,7 +486,15 @@ public int Insert(IDbConnection connection, IDbTransaction transaction, int? com
 
 		//NOTE: would prefer to use IDENT_CURRENT('tablename') or IDENT_SCOPE but these are not available on SQLCE
 		var r = connection.Query("select @@IDENTITY id", transaction: transaction, commandTimeout: commandTimeout);
-		return (int)r.First().id;
+		int id = 0;
+		foreach (var p in keyProperties)
+		{
+			var value = ((IDictionary<string, object>)r.First())[p.Name.ToLower()];
+			p.SetValue(entityToInsert, value, null);
+			if (id == 0)
+				id = Convert.ToInt32(value);
+		} 
+		return id;
 	}
 }
 
@@ -497,15 +505,22 @@ public int Insert(IDbConnection connection, IDbTransaction transaction, int? com
 		StringBuilder sb = new StringBuilder();
 		sb.AppendFormat("insert into {0} ({1}) values ({2})", tableName, columnList, parameterList);
 
-		sb.Append(" RETURNING ");
-		bool first = true;
-		foreach(var property in keyProperties)
+		// If no primary key then safe to assume a join table with not too much data to return
+		if (!keyProperties.Any())
+			sb.Append(" RETURNING *");
+		else
 		{
-			if (!first)
-				sb.Append(", ");
-			first = false;
-			sb.Append(property.Name);
+			sb.Append(" RETURNING ");
+			bool first = true;
+			foreach (var property in keyProperties)
+			{
+				if (!first)
+					sb.Append(", ");
+				first = false;
+				sb.Append(property.Name);
+			}
 		}
+
 		var results = connection.Query(sb.ToString(), entityToInsert, transaction: transaction, commandTimeout: commandTimeout);
 
 		// Return the key by assinging the corresponding property in the object - by product is that it supports compound primary keys

Dapper/SqlMapper.cs

@@ -1146,50 +1146,60 @@ public static void PackListParameters(IDbCommand command, string namePrefix, obj
 
             if (list != null)
             {
-                bool isString = value is IEnumerable<string>;
-                bool isDbString = value is IEnumerable<DbString>;
-                foreach (var item in list)
-                {
-                    count++;
-                    var listParam = command.CreateParameter();
-                    listParam.ParameterName = namePrefix + count;
-                    listParam.Value = item ?? DBNull.Value;
-                    if (isString)
-                    {
-                        listParam.Size = 4000;
-                        if (item != null && ((string)item).Length > 4000)
-                        {
-                            listParam.Size = -1;
-                        }
-                    }
-                    if (isDbString && item as DbString != null)
-                    {
-                        var str = item as DbString;
-                        str.AddParameter(command, listParam.ParameterName);
-                    }
-                    else
-                    {
-                        command.Parameters.Add(listParam);
-                    }
-                }
-
-                if (count == 0)
-                {
-                    command.CommandText = Regex.Replace(command.CommandText, @"[?@:]" + Regex.Escape(namePrefix), "(SELECT NULL WHERE 1 = 0)");
-                }
-                else
-                {
-                    command.CommandText = Regex.Replace(command.CommandText, @"[?@:]" + Regex.Escape(namePrefix), match =>
-                    {
-                        var grp = match.Value;
-                        var sb = new StringBuilder("(").Append(grp).Append(1);
-                        for (int i = 2; i <= count; i++)
-                        {
-                            sb.Append(',').Append(grp).Append(i);
-                        }
-                        return sb.Append(')').ToString();
-                    });
-                }
+				if (FeatureSupport.Get(command.Connection).Arrays)
+				{
+					var arrayParm = command.CreateParameter();
+					arrayParm.Value = list;
+					arrayParm.ParameterName = namePrefix;
+					command.Parameters.Add(arrayParm);
+				}
+				else
+				{
+					bool isString = value is IEnumerable<string>;
+					bool isDbString = value is IEnumerable<DbString>;
+					foreach (var item in list)
+					{
+						count++;
+						var listParam = command.CreateParameter();
+						listParam.ParameterName = namePrefix + count;
+						listParam.Value = item ?? DBNull.Value;
+						if (isString)
+						{
+							listParam.Size = 4000;
+							if (item != null && ((string) item).Length > 4000)
+							{
+								listParam.Size = -1;
+							}
+						}
+						if (isDbString && item as DbString != null)
+						{
+							var str = item as DbString;
+							str.AddParameter(command, listParam.ParameterName);
+						}
+						else
+						{
+							command.Parameters.Add(listParam);
+						}
+					}
+
+					if (count == 0)
+					{
+						command.CommandText = Regex.Replace(command.CommandText, @"[?@:]" + Regex.Escape(namePrefix), "(SELECT NULL WHERE 1 = 0)");
+					}
+					else
+					{
+						command.CommandText = Regex.Replace(command.CommandText, @"[?@:]" + Regex.Escape(namePrefix), match =>
+							{
+								var grp = match.Value;
+								var sb = new StringBuilder("(").Append(grp).Append(1);
+								for (int i = 2; i <= count; i++)
+								{
+									sb.Append(',').Append(grp).Append(i);
+								}
+								return sb.Append(')').ToString();
+							});
+					}
+				}
             }
 
         }
@@ -2202,4 +2212,34 @@ public void AddParameter(IDbCommand command, string name)
             command.Parameters.Add(param);
         }
     }
+
+	/// <summary>
+	/// Handles variances in features per DBMS
+	/// </summary>
+	public class FeatureSupport
+	{
+		/// <summary>
+		/// Dictionary of supported features index by connection type name
+		/// </summary>
+		private static readonly Dictionary<string, FeatureSupport> FeatureList = new Dictionary<string, FeatureSupport>() {
+				{"sqlserverconnection", new FeatureSupport { Arrays = false}},
+				{"npgsqlconnection", new FeatureSupport {Arrays = true}}
+		};
+
+		/// <summary>
+		/// Gets the featureset based on the passed connection
+		/// </summary>
+		public static FeatureSupport Get(IDbConnection connection)
+		{
+			string name = connection.GetType().Name.ToLower();
+			FeatureSupport features;
+			return FeatureList.TryGetValue(name, out features) ? features : FeatureList.Values.First();
+		}
+
+		/// <summary>
+		/// True if the db supports array columns e.g. Postgresql
+		/// </summary>
+		public bool Arrays { get; set; }
+	}
+
 }