Allow include to be case-insensitive

Author: mythz

src/ServiceStack.OrmLite/OrmLiteReadCommandExtensions.cs

@@ -901,12 +901,13 @@ public static void LoadReferences<T>(this IDbCommand dbCmd, T instance, string[]
             if (include != null)
             {
                 // Check that any include values aren't reference fields of the specified type
-                var fields = fieldDefs.Select(q => q.FieldName);
-                var invalid = include.Except(fields).ToList();
+                var includeLower = include.Map(x => x.ToLower());
+                var fieldNames = fieldDefs.ConvertAll(q => q.FieldName.ToLower());
+                var invalid = includeLower.Except(fieldNames).ToList();
                 if (invalid.Count > 0)
                     throw new ArgumentException("Fields '{0}' are not Reference Properties of Type '{1}'".Fmt(invalid.Join("', '"), typeof(T).Name));
 
-                fieldDefs = fieldDefs.Where(f => include.Contains(f.FieldName)).ToList();
+                fieldDefs = fieldDefs.Where(f => includeLower.Contains(f.FieldName.ToLower())).ToList();
             }
 
             foreach (var fieldDef in fieldDefs)
@@ -932,12 +933,13 @@ internal static List<Into> LoadListWithReferences<Into, From>(this IDbCommand db
             if (include != null)
             {
                 // Check that any include values aren't reference fields of the specified From type
-                var fields = fieldDefs.Select(q => q.FieldName);
-                var invalid = include.Except(fields).ToList();
+                var includeLower = include.Map(x => x.ToLower());
+                var fieldNames = fieldDefs.ConvertAll(q => q.FieldName.ToLower());
+                var invalid = includeLower.Except(fieldNames).ToList();
                 if (invalid.Count > 0)
-                    throw new ArgumentException("Fields '{0}' are not Reference Properties of Type '{1}'".Fmt(invalid.Join("', '"), typeof(From).Name));
+                    throw new ArgumentException("Fields '{0}' are not Reference Properties of Type '{1}'".Fmt(invalid.Join("', '"), typeof(T).Name));
 
-                fieldDefs = loadList.FieldDefs.Where(f => include.Contains(f.FieldName)).ToList();
+                fieldDefs = fieldDefs.Where(f => includeLower.Contains(f.FieldName.ToLower())).ToList();
             }
 
             foreach (var fieldDef in fieldDefs)

tests/ServiceStack.OrmLite.Tests/LoadReferencesTests.cs

@@ -652,7 +652,12 @@ public void Can_load_only_included_references()
             var dbCustomers = db.LoadSelect<Customer>(q => q.Id == customer.Id, include: new[] { "PrimaryAddress" });
             Assert.That(dbCustomers.Count, Is.EqualTo(1));
             Assert.That(dbCustomers[0].Name, Is.EqualTo("Customer 1"));
+            Assert.That(dbCustomers[0].Orders, Is.Null);
+            Assert.That(dbCustomers[0].PrimaryAddress, Is.Not.Null);
 
+            dbCustomers = db.LoadSelect<Customer>(q => q.Id == customer.Id, include: new[] { "primaryaddress" });
+            Assert.That(dbCustomers.Count, Is.EqualTo(1));
+            Assert.That(dbCustomers[0].Name, Is.EqualTo("Customer 1"));
             Assert.That(dbCustomers[0].Orders, Is.Null);
             Assert.That(dbCustomers[0].PrimaryAddress, Is.Not.Null);
 
@@ -662,6 +667,11 @@ public void Can_load_only_included_references()
             Assert.That(dbCustomer.Orders, Is.Null);
             Assert.That(dbCustomer.PrimaryAddress, Is.Not.Null);
 
+            dbCustomer = db.LoadSingleById<Customer>(customer.Id, include: new[] { "primaryaddress" });
+            Assert.That(dbCustomer.Name, Is.EqualTo("Customer 1"));
+            Assert.That(dbCustomer.Orders, Is.Null);
+            Assert.That(dbCustomer.PrimaryAddress, Is.Not.Null);
+
             dbCustomer = db.LoadSingleById<Customer>(customer.Id, include: x => new { x.PrimaryAddress });
             Assert.That(dbCustomer.Name, Is.EqualTo("Customer 1"));
             Assert.That(dbCustomer.Orders, Is.Null);