Add support for wildcards in Select(fields) API

Author: mythz

src/ServiceStack.OrmLite/Expressions/SqlExpression.Join.cs

@@ -161,8 +161,8 @@ public string SelectInto<TModel>()
             }
 
             var sbSelect = new StringBuilder();
-            var selectDef = typeof(TModel).GetModelDefinition();
 
+            var selectDef = typeof(TModel).GetModelDefinition();
             var orderedDefs = tableDefs;
             if (selectDef != modelDef && tableDefs.Contains(selectDef))
             {

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -130,9 +130,38 @@ public virtual SqlExpression<T> Select(string[] fields)
             if (fields == null || fields.Length == 0)
                 return Select(string.Empty);
 
+            var allTableDefs = new List<ModelDefinition> { modelDef };
+            allTableDefs.AddRange(tableDefs);
+
+            var fieldsList = new List<string>();
             var sb = new StringBuilder();
             foreach (var field in fields)
             {
+                if (string.IsNullOrEmpty(field))
+                    continue;
+
+                if (field.EndsWith(".*"))
+                {
+                    var tableName = field.Substring(0, field.Length - 2);
+                    var tableDef = allTableDefs.FirstOrDefault(x => string.Equals(x.Name, tableName, StringComparison.OrdinalIgnoreCase));
+                    if (tableDef != null)
+                    {
+                        foreach (var fieldDef in tableDef.FieldDefinitionsArray)
+                        {
+                            var qualifiedField = DialectProvider.GetQuotedColumnName(tableDef, fieldDef);
+
+                            if (sb.Length > 0)
+                                sb.Append(", ");
+
+                            sb.Append(qualifiedField);
+                            fieldsList.Add(fieldDef.Name);
+                        }
+                    }
+                    continue;
+                }
+
+                fieldsList.Add(field); //Could be non-matching referenced property
+
                 var match = FirstMatchingField(field);
                 if (match == null)
                     continue;
@@ -146,7 +175,7 @@ public virtual SqlExpression<T> Select(string[] fields)
             }
 
             UnsafeSelect(sb.ToString());
-            OnlyFields = new HashSet<string>(fields, StringComparer.OrdinalIgnoreCase);
+            OnlyFields = new HashSet<string>(fieldsList, StringComparer.OrdinalIgnoreCase);
 
             return this;
         }

tests/ServiceStack.OrmLite.Tests/AutoQueryTests.cs

@@ -59,7 +59,7 @@ public class Employee
         [References(typeof(Department))]
         public int DepartmentId { get; set; }
 
-        [DataAnnotations.Ignore]
+        [Reference]
         public Department Department { get; set; }
     }
 
@@ -227,6 +227,50 @@ public void Does_only_populate_Select_fields()
             }
         }
 
+        [Test]
+        public void Does_only_populate_Select_fields_wildcard()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropTable<Employee>();
+                db.DropTable<Department>();
+                db.CreateTable<Department>();
+                db.CreateTable<Employee>();
+
+                db.InsertAll(SeedDepartments);
+                db.InsertAll(SeedEmployees);
+
+                var q = db.From<Employee>()
+                    .Join<Department>()
+                    .Select(new[] { "departmentid", "employee.*" });
+
+                Assert.That(q.OnlyFields, Is.EquivalentTo(new[] {
+                    "departmentid", "Id", "FirstName", "LastName"
+                }));
+
+                var results = db.Select(q);
+                Assert.That(results.All(x => x.Id >= 0));
+                Assert.That(results.All(x => x.DepartmentId >= 10));
+                Assert.That(results.All(x => x.FirstName != null));
+                Assert.That(results.All(x => x.LastName != null));
+
+                q = db.From<Employee>()
+                    .Join<Department>()
+                    .Select(new[] { "departmentid", "department", "department.*" });
+
+                Assert.That(q.OnlyFields, Is.EquivalentTo(new[] {
+                    "departmentid", "department", "Id", "Name"
+                }));
+
+                results = db.LoadSelect(q, include:q.OnlyFields);
+
+                Assert.That(results.All(x => x.Id > 0 && x.Id < 10));
+                Assert.That(results.All(x => x.DepartmentId >= 10));
+                Assert.That(results.All(x => x.Department.Id >= 10));
+                Assert.That(results.All(x => x.Department.Name != null));
+            }
+        }
+
         [Test]
         public void Does_only_populate_LoadSelect_fields()
         {