Added support for selecting all of a table's columns in SqlExpression via .Select<TableA, TableB>((a, b) => new { a })

Author: shift-evgeny

src/ServiceStack.OrmLite.Firebird/FirebirdOrmLiteDialectProvider.cs

@@ -657,10 +657,10 @@ public override string EscapeWildcards(string value)
                 .Replace("%", @"^%");
         }
 
-        public override string GetColumnNames(ModelDefinition modelDef)
+        public override string GetColumnNames(ModelDefinition modelDef, bool tableQualified = false)
         {
             if (QuoteNames)
-                return modelDef.GetColumnNames(this);
+                return modelDef.GetColumnNames(this); // Calls this.GetColumnNames(modelDef) - infinite loop?
 
             var sqlColumns = StringBuilderCache.Allocate();
             foreach (var field in modelDef.FieldDefinitions)

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -1465,6 +1465,10 @@ protected virtual object VisitNew(NewExpression nex)
 
         protected virtual object VisitParameter(ParameterExpression p)
         {
+            var paramModelDef = p.Type.GetModelDefinition();
+            if (paramModelDef != null)
+                return DialectProvider.GetColumnNames(paramModelDef, true);
+
             return p.Name;
         }
 

src/ServiceStack.OrmLite/IOrmLiteDialectProvider.cs

@@ -159,7 +159,7 @@ string ToSelectFromProcedureStatement(object fromObjWithProperties,
         ulong FromDbRowVersion(object value);
         string GetRowVersionColumnName(FieldDefinition field);
 
-        string GetColumnNames(ModelDefinition modelDef);
+        string GetColumnNames(ModelDefinition modelDef, bool tableQualified = false);
 
         SqlExpression<T> SqlExpression<T>();
 

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

@@ -551,21 +551,32 @@ public virtual string GetRowVersionColumnName(FieldDefinition field)
             return GetQuotedColumnName(field.FieldName);
         }
 
-        public virtual string GetColumnNames(ModelDefinition modelDef)
+        public virtual string GetColumnNames(ModelDefinition modelDef, bool tableQualified = false)
         {
+            var tablePrefix = "";
+            if (tableQualified)
+            {
+                tablePrefix = GetQuotedTableName(modelDef) + ".";
+            }
+
             var sqlColumns = StringBuilderCache.Allocate();
             foreach (var field in modelDef.FieldDefinitions)
             {
                 if (sqlColumns.Length > 0)
                     sqlColumns.Append(", ");
 
-                if (field.CustomSelect == null)
+                if (field.CustomSelect != null)
                 {
-                    sqlColumns.Append(field.GetQuotedName(this));
+                    sqlColumns.Append(field.CustomSelect + " AS " + field.FieldName);
+                }
+                else if (field.IsRowVersion)
+                {
+                    sqlColumns.Append(GetRowVersionColumnName(field));
                 }
                 else
                 {
-                    sqlColumns.Append(field.CustomSelect + " AS " + field.FieldName);
+                    sqlColumns.Append(tablePrefix);
+                    sqlColumns.Append(GetQuotedColumnName(field.FieldName));
                 }
             }
 

tests/ServiceStack.OrmLite.Tests/Expression/SqlExpressionTests.cs

@@ -838,5 +838,59 @@ public void Can_select_individual_columns()
                 Assert.That(result.Extra, Is.Null);
             }
         }
+
+        private class JoinSelectResults1
+        {
+            // From TableA
+            public int Id { get; set; }
+            public bool Bool { get; set; }
+            public string Name { get; set; }
+
+            // From TableB
+            public int TableAId { get; set; }
+
+            public override bool Equals(object obj)
+            {
+                var other = (JoinSelectResults1)obj;
+                return Id == other.Id && Bool == other.Bool && Name == other.Name && TableAId == other.TableAId;
+            }
+        }
+
+        [Test]
+        public void Can_select_entire_tables()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<TableA>();
+                db.DropAndCreateTable<TableB>();
+
+                db.Insert(new TableA { Id = 1, Bool = false, Name = "NameA1" });
+                db.Insert(new TableA { Id = 2, Bool = true, Name = "NameA2" });
+                db.Insert(new TableB { Id = 1, TableAId = 1, Name = "NameB1" });
+                db.Insert(new TableB { Id = 2, TableAId = 2, Name = "NameB2" });
+                db.Insert(new TableB { Id = 3, TableAId = 2, Name = "NameB3" });
+
+                var q = db.From<TableA>()
+                    .Join<TableB>()
+                    .Select<TableA, TableB>((a, b) => new { a, b.TableAId })
+                    .OrderBy(x => x.Id);
+
+                try
+                {
+                    var rows = db.Select<JoinSelectResults1>(q);
+                    var expected = new[]
+                    {
+                        new JoinSelectResults1 { Id = 1, Bool = false, Name = "NameA1", TableAId = 1 },
+                        new JoinSelectResults1 { Id = 2, Bool = true, Name = "NameA2", TableAId = 2 },
+                        new JoinSelectResults1 { Id = 2, Bool = true, Name = "NameA2", TableAId = 2 },
+                    };
+                    Assert.That(rows, Is.EqualTo(expected));
+                }
+                finally
+                {
+                    db.GetLastSql().Print();
+                }
+            }
+        }
     }
 }