Simplify JOIN aliases even further

Author: mythz

src/ServiceStack.OrmLite.SqlServer/SqlServerTableHint.cs

@@ -2,10 +2,10 @@
 {
     public class SqlServerTableHint
     {
-        public static JoinFormatDelegate ReadUncommitted = (table, expr) => "{0} WITH (READUNCOMMITTED) {1}".Fmt(table, expr);
-        public static JoinFormatDelegate ReadCommitted = (table, expr) => "{0} WITH (READCOMMITTED) {1}".Fmt(table, expr);
-        public static JoinFormatDelegate ReadPast = (table, expr) => "{0} WITH (READPAST) {1}".Fmt(table, expr);
-        public static JoinFormatDelegate Serializable = (table, expr) => "{0} WITH (SERIALIZABLE) {1}".Fmt(table, expr);
-        public static JoinFormatDelegate RepeatableRead = (table, expr) => "{0} WITH (REPEATABLEREAD) {1}".Fmt(table, expr);
+        public static JoinFormatDelegate ReadUncommitted = (dialect, tableDef, expr) => "{0} WITH (READUNCOMMITTED) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
+        public static JoinFormatDelegate ReadCommitted = (dialect, tableDef, expr) => "{0} WITH (READCOMMITTED) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
+        public static JoinFormatDelegate ReadPast = (dialect, tableDef, expr) => "{0} WITH (READPAST) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
+        public static JoinFormatDelegate Serializable = (dialect, tableDef, expr) => "{0} WITH (SERIALIZABLE) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
+        public static JoinFormatDelegate RepeatableRead = (dialect, tableDef, expr) => "{0} WITH (REPEATABLEREAD) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
     }
 }

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

@@ -7,6 +7,8 @@
 
 namespace ServiceStack.OrmLite
 {
+    public delegate string JoinFormatDelegate(IOrmLiteDialectProvider dialect, ModelDefinition tableDef, string joinExpr);
+
     public abstract partial class SqlExpression<T> : ISqlExpression
     {
         protected List<ModelDefinition> tableDefs = new List<ModelDefinition>();
@@ -188,7 +190,7 @@ private SqlExpression<T> InternalJoin(string joinType, Expression joinExpr, Mode
                 : targetDef;
 
             FromExpression += joinFormat != null
-                ? " {0} {1}".Fmt(joinType, joinFormat(SqlTable(joinDef), sqlExpr))
+                ? " {0} {1}".Fmt(joinType, joinFormat(DialectProvider, joinDef, sqlExpr))
                 : " {0} {1} {2}".Fmt(joinType, SqlTable(joinDef), sqlExpr);
 
             return this;

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -2235,8 +2235,6 @@ public interface ISqlExpression
         string SelectInto<TModel>();
     }
 
-    public delegate string JoinFormatDelegate(string table, string joinExpr);
-
     public class PartialSqlString
     {
         public PartialSqlString(string text)

src/ServiceStack.OrmLite/OrmLiteReadExpressionsApi.cs

@@ -70,12 +70,12 @@ public static SqlExpression<T> From<T>(this IDbConnection dbConn, string fromExp
             return expr;
         }
 
-        public static JoinFormatDelegate JoinAlias<T>(this IDbConnection dbConn, string alias)
+        public static JoinFormatDelegate JoinAlias(this IDbConnection dbConn, string alias)
         {
-            var dialectProvider = dbConn.GetDialectProvider();
-            var modelDef = typeof(T).GetModelDefinition();
-            return (table, expr) => "{0} {1} {2}".Fmt(table, alias,
-                expr.Replace(dialectProvider.GetQuotedTableName(modelDef), dialectProvider.GetQuotedTableName(alias)));
+            return (dialect, tableDef, expr) => string.Format("{0} {1} {2}",
+                dialect.GetQuotedTableName(tableDef), 
+                alias,
+                expr.Replace(dialect.GetQuotedTableName(tableDef), dialect.GetQuotedTableName(alias)));
         }
 
         /// <summary>

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

@@ -107,8 +107,8 @@ public void Can_use_cusom_SqlExpression_to_add_multiple_self_Left_Joins()
 
                 //Alternative
                 q = db.From<Sale>()
-                    .LeftJoin<ContactIssue>((s,c) => s.SellerId == c.Id, db.JoinAlias<ContactIssue>("seller"))
-                    .LeftJoin<ContactIssue>((s,c) => s.BuyerId == c.Id, db.JoinAlias<ContactIssue>("buyer"))
+                    .LeftJoin<ContactIssue>((s,c) => s.SellerId == c.Id, db.JoinAlias("seller"))
+                    .LeftJoin<ContactIssue>((s,c) => s.BuyerId == c.Id, db.JoinAlias("buyer"))
                     .Select<Sale, ContactIssue>((s,c) => new {
                         sale = Sql.AllFields(s),
                         BuyerFirstName = Sql.JoinAlias(c.FirstName, "buyer"),