Add UseSelectPropertiesAsAliases + options API to allow fluent config of SqlExpr

Author: mythz

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -49,6 +49,7 @@ public abstract partial class SqlExpression<T> : ISqlExpression, IHasUntypedSqlE
         public static Action<SqlExpression<T>> SelectFilter { get; set; }
         public int? Rows { get; set; }
         public int? Offset { get; set; }
+        public bool UseSelectPropertiesAsAliases { get; set; }
 
         protected string Sep => sep;
 
@@ -98,6 +99,7 @@ protected virtual SqlExpression<T> CopyTo(SqlExpression<T> to)
             to.Offset = Offset;
             to.Rows = Rows;
             to.tableDefs = tableDefs;
+            to.UseSelectPropertiesAsAliases = UseSelectPropertiesAsAliases;
             return to;
         }
 
@@ -1922,7 +1924,8 @@ private object SetAnonTypePropertyNamesForSelectExpression(object expr, Expressi
             // When selecting a column use the anon type property name, rather than the table property name, as the returned column name
             if (arg is MemberExpression propExpr && IsLambdaArg(propExpr.Expression))
             {
-                if (propExpr.Member.Name != member.Name ||           // Use anon property alias when names don't match 
+                if (UseSelectPropertiesAsAliases ||                    // Use anon property alias when explicitly requested
+                    propExpr.Member.Name != member.Name ||           // or when names don't match 
                     propExpr.Expression.Type != ModelDef.ModelType)  // or when selecting a field from a different table
                     return new SelectItemExpression(DialectProvider, expr.ToString(), member.Name);
 
@@ -1975,7 +1978,9 @@ private object SetAnonTypePropertyNamesForSelectExpression(object expr, Expressi
                 return new PartialSqlString(strExpr + " AS " + member.Name);
             } 
 
-            return expr;
+            return UseSelectPropertiesAsAliases
+                ? new SelectItemExpression(DialectProvider, expr.ToString(), member.Name)
+                : expr;
         }
 
         private static void StripAliases(SelectList selectList)

src/ServiceStack.OrmLite/OrmLiteReadExpressionsApi.cs

@@ -53,6 +53,13 @@ public static SqlExpression<T> From<T>(this IDbConnection dbConn)
             return dbConn.GetExecFilter().SqlExpression<T>(dbConn);
         }
 
+        public static SqlExpression<T> From<T>(this IDbConnection dbConn, Action<SqlExpression<T>> options)
+        {
+            var q = dbConn.GetExecFilter().SqlExpression<T>(dbConn);
+            options(q);
+            return q;
+        }
+
         public static SqlExpression<T> From<T, JoinWith>(this IDbConnection dbConn, Expression<Func<T, JoinWith, bool>> joinExpr=null)
         {
             var sql = dbConn.GetExecFilter().SqlExpression<T>(dbConn);
@@ -70,16 +77,24 @@ public static SqlExpression<T> From<T>(this IDbConnection dbConn, string fromExp
             return expr;
         }
 
-        public static SqlExpression<T> From<T>(this IDbConnection dbConn, TableOptions options)
+        public static SqlExpression<T> From<T>(this IDbConnection dbConn, TableOptions tableOptions)
         {
             var expr = dbConn.GetExecFilter().SqlExpression<T>(dbConn);
-            if (!string.IsNullOrEmpty(options.Expression))
-                expr.From(options.Expression);
-            if (!string.IsNullOrEmpty(options.Alias))
-                expr.SetTableAlias(options.Alias);
+            if (!string.IsNullOrEmpty(tableOptions.Expression))
+                expr.From(tableOptions.Expression);
+            if (!string.IsNullOrEmpty(tableOptions.Alias))
+                expr.SetTableAlias(tableOptions.Alias);
             return expr;
         }
 
+        public static SqlExpression<T> From<T>(this IDbConnection dbConn, TableOptions tableOptions,
+            Action<SqlExpression<T>> options)
+        {
+            var q = dbConn.From<T>(tableOptions);
+            options(q);
+            return q;
+        }
+
         [Obsolete("Use TableAlias")]
         public static JoinFormatDelegate JoinAlias(this IDbConnection db, string alias) => OrmLiteUtils.JoinAlias(alias);
 

tests/ServiceStack.OrmLite.Tests/Issues/LRAIssues.cs

@@ -215,7 +215,6 @@ private static void DropTables(IDbConnection db)
 
         private static void InitAliasTables(IDbConnection db)
         {
-            OrmLiteUtils.PrintSql();
             db.DropTable<LRDProfiloAnalisi>();
             db.DropTable<LRDAnalisi>();
             db.DropTable<LRDContenitore>();
@@ -238,6 +237,7 @@ private static void InitAliasTables(IDbConnection db)
                 ProfiloAnalisiId = null
             });
 
+            OrmLiteUtils.PrintSql();
         }
 
         [Test]
@@ -247,7 +247,10 @@ public void Table_Alias()
             {
                 InitAliasTables(db);
 
-                var q = db.From<LRDAnalisi>(db.TableAlias("dana"))
+                var q = db.From<LRDAnalisi>(options => {
+                        options.SetTableAlias("dana");
+                        options.UseSelectPropertiesAsAliases = true;
+                    })
                     .Join<LRDAnalisi, LRDContenitore>((dana, dcont) => dana.ContenitoreId == dcont.Id, db.TableAlias("c"))
                     .Join<LRDAnalisi, LRDProfiloAnalisi>((dana, dprofana) => dana.Id == dprofana.AnalisiId, db.TableAlias("dprofana"))
                     .Where<LRDProfiloAnalisi>(dprofana => Sql.TableAlias(dprofana.ProfiloAnalisiId, "dprofana") == null)
@@ -258,7 +261,7 @@ public void Table_Alias()
                             AnalisiId = dana.Id,
                             Codice = dana.Codice,
                             Descrizione = dana.Descrizione,
-                            ContenitoreId = Sql.TableAlias(dcont.Id, "c"),
+                            ContenitoreId = dana.ContenitoreId,
                             ContenitoreCodice = Sql.TableAlias(dcont.Codice, "c"),
                             ContenitoreDescrizione = Sql.TableAlias(dcont.Descrizione, "c"),
                             VersioneRecord = Sql.TableAlias(dprofana.VersioneRecord, "dprofana")