Add support for case-insensitive Select(fields)

ServiceStack · Mar 17, 2016 · 234fa52 · 234fa52
1 parent eb3eb80
commit 234fa52
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 4 deletions.
diff --git a/src/ServiceStack.OrmLite/Expressions/SqlExpression.cs b/src/ServiceStack.OrmLite/Expressions/SqlExpression.cs
@@ -21,7 +21,7 @@ public abstract partial class SqlExpression<T> : ISqlExpression, IHasUntypedSqlE
         private string groupBy = string.Empty;
         private string havingExpression;
         private string orderBy = string.Empty;
-        private string[] onlyFields = null;
+        private HashSet<string> onlyFields = null;
 
         public List<string> UpdateFields { get; set; }
         public List<string> InsertFields { get; set; }
@@ -72,7 +72,7 @@ protected virtual SqlExpression<T> CopyTo(SqlExpression<T> to)
             to.groupBy = groupBy;
             to.havingExpression = havingExpression;
             to.orderBy = orderBy;
-            to.onlyFields = onlyFields != null ? (string[])onlyFields.Clone() : null;
+            to.onlyFields = onlyFields != null ? new HashSet<string>(onlyFields) : null;
             to.UpdateFields = UpdateFields;
             to.InsertFields = InsertFields;
             to.modelDef = modelDef;
@@ -146,7 +146,7 @@ public virtual SqlExpression<T> Select(string[] fields)
             }
 
             UnsafeSelect(sb.ToString());
-            onlyFields = fields;
+            onlyFields = new HashSet<string>(fields, StringComparer.OrdinalIgnoreCase);
 
             return this;
         }

diff --git a/tests/ServiceStack.OrmLite.Tests/Expression/SelectFieldExpressionTests.cs b/tests/ServiceStack.OrmLite.Tests/Expression/SelectFieldExpressionTests.cs
@@ -76,6 +76,25 @@ public void Can_select_partial_list_of_fields()
             }
         }
 
+        [Test]
+        public void Can_select_partial_list_of_fields_case_insensitive()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<Person>();
+                db.InsertAll(Person.Rockstars);
+
+                var results = db.Select(db.From<Person>().Select(new[] { "id", "firstname", "age" }));
+
+                db.GetLastSql().Print();
+
+                Assert.That(results.All(x => x.Id > 0));
+                Assert.That(results.All(x => x.FirstName != null));
+                Assert.That(results.All(x => x.LastName == null));
+                Assert.That(results.Any(x => x.Age > 0));
+            }
+        }
+
         [Test]
         public void Does_ignore_invalid_fields()
         {
@@ -106,7 +125,7 @@ public void Can_select_fields_from_joined_table()
                 db.InsertAll(RockstarAlbum.SeedAlbums);
 
                 var q = db.From<Person>()
-                    .Join<RockstarAlbum>((p,a) => p.Id == a.RockstarId)
+                    .Join<RockstarAlbum>((p, a) => p.Id == a.RockstarId)
                     .Select(new[] { "Id", "FirstName", "Age", "RockstarAlbumName" });
 
                 var results = db.Select<PersonWithAlbum>(q);
@@ -121,5 +140,32 @@ public void Can_select_fields_from_joined_table()
                 Assert.That(results.All(x => x.RockstarAlbumName != null));
             }
         }
+
+        [Test]
+        public void Can_select_fields_from_joined_table_case_insensitive()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<Person>();
+                db.InsertAll(Person.Rockstars);
+                db.DropAndCreateTable<RockstarAlbum>();
+                db.InsertAll(RockstarAlbum.SeedAlbums);
+
+                var q = db.From<Person>()
+                    .Join<RockstarAlbum>((p, a) => p.Id == a.RockstarId)
+                    .Select(new[] { "id", "firstname", "age", "rockstaralbumname" });
+
+                var results = db.Select<PersonWithAlbum>(q);
+
+                db.GetLastSql().Print();
+
+                Assert.That(results.All(x => x.Id > 0));
+                Assert.That(results.All(x => x.FirstName != null));
+                Assert.That(results.All(x => x.LastName == null));
+                Assert.That(results.All(x => x.Age > 0));
+                Assert.That(results.All(x => x.RockstarId == 0));
+                Assert.That(results.All(x => x.RockstarAlbumName != null));
+            }
+        }
     }
 }