Change FirstMatchingField to return a tuple

Author: mythz

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

@@ -123,8 +123,6 @@ private SqlExpression<T> InternalJoin(string joinType,
 
             FromExpression = fromExpr + sbJoin;
 
-            if (tableDefs.Count == 0)
-                tableDefs.Add(modelDef);
             if (!tableDefs.Contains(sourceDef))
                 tableDefs.Add(sourceDef);
             if (!tableDefs.Contains(targetDef))
@@ -236,25 +234,25 @@ public virtual SqlExpression<T> Or<Source, Target>(Expression<Func<Source, Targe
             return this;
         }
 
-        public string QuoteFirstField(string fieldName)
+        public Tuple<ModelDefinition,FieldDefinition> FirstMatchingField(string fieldName)
         {
             foreach (var tableDef in tableDefs)
             {
                 var firstField = tableDef.FieldDefinitions.FirstOrDefault(x => x.Name == fieldName);
                 if (firstField != null)
                 {
-                    return DialectProvider.GetQuotedColumnName(tableDef, firstField);
+                    return Tuple.Create(tableDef, firstField);
                 }
             }
-            //Fallback to {Table}{Field} property convention
+            //Fallback to fully qualified '{Table}{Field}' property convention
             foreach (var tableDef in tableDefs)
             {
-                var firstField = tableDef.FieldDefinitions.FirstOrDefault(x => 
+                var firstField = tableDef.FieldDefinitions.FirstOrDefault(x =>
                     tableDef.Name + x.Name == fieldName);
 
                 if (firstField != null)
                 {
-                    return DialectProvider.GetQuotedColumnName(tableDef, firstField) + " as " + fieldName;
+                    return Tuple.Create(tableDef, firstField);
                 }
             }
             return null;

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -41,6 +41,7 @@ public SqlExpression(IOrmLiteDialectProvider dialectProvider)
             PrefixFieldWithTableName = false;
             WhereStatementWithoutWhereString = false;
             DialectProvider = dialectProvider;
+            tableDefs.Add(modelDef);
         }
 
         public SqlExpression<T> Clone()