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);
 
+		// 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
+		{
 			sb.Append(" RETURNING ");
 			bool first = true;
-		foreach(var property in keyProperties)
+			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

@@ -1145,6 +1145,15 @@ public static void PackListParameters(IDbCommand command, string namePrefix, obj
             var count = 0;
 
             if (list != null)
+            {
+				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>;
@@ -1157,7 +1166,7 @@ public static void PackListParameters(IDbCommand command, string namePrefix, obj
 						if (isString)
 						{
 							listParam.Size = 4000;
-                        if (item != null && ((string)item).Length > 4000)
+							if (item != null && ((string) item).Length > 4000)
 							{
 								listParam.Size = -1;
 							}
@@ -1191,6 +1200,7 @@ public static void PackListParameters(IDbCommand command, string namePrefix, obj
 							});
 					}
 				}
+            }
 
         }
 
@@ -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; }
+	}
+
 }