second draft

Author: mota57

QueryBuilder.Tests/UpdateTests.cs

@@ -155,6 +155,10 @@ public void UpdateWithKeyAttribute()
             Assert.Equal(
                 "UPDATE [OrderProductComposite] SET [OrdId] = 'ORD01', [ProductId] = 'PROD02', [Quantity] = 20, [Faa] = 'baz' WHERE [OrdId] = 'ORD01' AND [ProductId] = 'PROD02'",
                 c[EngineCodes.SqlServer]);
+
+            Assert.Equal(
+              "UPDATE \"ORDERPRODUCTCOMPOSITE\" SET \"ORDID\" = 'ORD01', \"PRODUCTID\" = 'PROD02', \"QUANTITY\" = 20, \"FAA\" = 'baz' WHERE \"ORDID\" = 'ORD01' AND \"PRODUCTID\" = 'PROD02'",
+              c[EngineCodes.Firebird]);
         }
 
     }

QueryBuilder/Query.Insert.cs

@@ -9,26 +9,34 @@ public partial class Query
     {
         public Query AsInsert(object data, bool returnId = false)
         {
-            var dictionary = new Dictionary<string, object>();
+            var dictionary = BuildDictionaryOnInsert(data);
+
+            return AsInsert(dictionary, returnId);
+        }
 
-            var props = data.GetType()
-                        .GetRuntimeProperties()
-                        .Where(_ => _.GetCustomAttribute(typeof(IgnoreAttribute)) == null);
 
-            foreach (var item in props)
+        private Dictionary<string, object> BuildDictionaryOnInsert(object data)
+        {
+
+            var dictionary = new Dictionary<string, object>();
+            var props = data.GetType().GetRuntimeProperties();
+
+            foreach (PropertyInfo property in props)
             {
-                var attr = item.GetCustomAttribute(typeof(ColumnAttribute)) as ColumnAttribute;
-                if (attr != null)
-                {
-                    dictionary.Add(attr.Name, item.GetValue(data));
-                }
-                else
+                if (property.GetCustomAttribute(typeof(IgnoreAttribute)) != null)
                 {
-                    dictionary.Add(item.Name, item.GetValue(data));
+                    continue;
                 }
+
+                var value = property.GetValue(data);
+
+                var colAttr = property.GetCustomAttribute(typeof(ColumnAttribute)) as ColumnAttribute;
+                var name = colAttr?.Name ?? property.Name;
+                  
+                dictionary.Add(name, value);
             }
 
-            return AsInsert(dictionary, returnId);
+            return dictionary;
         }
 
         public Query AsInsert(IEnumerable<string> columns, IEnumerable<object> values)

QueryBuilder/Query.Update.cs

@@ -32,12 +32,11 @@ private Dictionary<string, object> BuildDictionaryOnUpdate(object data)
                 }
 
                 var value = property.GetValue(data);
-                var name = property.Name;
 
                 var colAttr = property.GetCustomAttribute(typeof(ColumnAttribute)) as ColumnAttribute;
+                var name = colAttr?.Name ?? property.Name;
                 if(colAttr != null)
                 {
-                    name = colAttr.Name;
                     if((colAttr as KeyAttribute) != null)
                     {
                         this.Where(name, value);