Check for field in all tables

Author: mythz

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -1309,10 +1309,16 @@ protected string RemoveQuoteFromAlias(string exp)
         protected bool IsFieldName(object quotedExp)
         {
             var fieldExpr = quotedExp.ToString().StripTablePrefixes();
-            var fieldNames = modelDef.FieldDefinitions.Map(x =>
-                DialectProvider.GetQuotedColumnName(x.FieldName));
+            var unquotedExpr = fieldExpr.StripQuotes();
 
-            return fieldNames.Any(x => x == fieldExpr);
+            var isTableField = modelDef.FieldDefinitionsArray.Any(x => x.FieldName == unquotedExpr);
+            if (isTableField)
+                return true;
+
+            var isJoinedField = tableDefs.Any(t => t.FieldDefinitionsArray
+                .Any(x => x.FieldName == unquotedExpr));
+
+            return isJoinedField;
         }
 
         protected object GetTrueExpression()

src/ServiceStack.OrmLite/OrmLiteUtils.cs

@@ -172,7 +172,7 @@ public static string SqlTable(this string tableName, IOrmLiteDialectProvider dia
             return (dialect ?? OrmLiteConfig.DialectProvider).GetQuotedTableName(tableName);
         }
 
-        public static string SqlTableRaw(this string tableName, IOrmLiteDialectProvider dialect=null)
+        public static string SqlTableRaw(this string tableName, IOrmLiteDialectProvider dialect = null)
         {
             return (dialect ?? OrmLiteConfig.DialectProvider).NamingStrategy.GetTableName(tableName);
         }
@@ -264,7 +264,7 @@ public static string SqlJoin(IEnumerable values, IOrmLiteDialectProvider dialect
             return sb.ToString();
         }
 
-        public static SqlInValues SqlInValues<T>(this T[] values, IOrmLiteDialectProvider dialect=null)
+        public static SqlInValues SqlInValues<T>(this T[] values, IOrmLiteDialectProvider dialect = null)
         {
             return new SqlInValues(values, dialect);
         }
@@ -318,6 +318,13 @@ public static string StripTablePrefixes(this string selectExpression)
             return sb.ToString().Trim();
         }
 
+        public static char[] QuotedChars = new[] { '"', '`', '[', ']' };
+
+        public static string StripQuotes(this string quotedExpr)
+        {
+            return quotedExpr.Trim(QuotedChars);
+        }
+
         private const int NotFound = -1;
 
         public static ModelDefinition GetModelDefinition(Type modelType)
@@ -352,9 +359,9 @@ public static ulong ConvertToULong(byte[] bytes)
 
         public static List<Parent> Merge<Parent, Child>(this Parent parent, List<Child> children)
         {
-            return new List<Parent>{ parent}.Merge(children);
+            return new List<Parent> { parent }.Merge(children);
         }
-    
+
         public static List<Parent> Merge<Parent, Child>(this List<Parent> parents, List<Child> children)
         {
             var modelDef = ModelDefinition<Parent>.Definition;
@@ -397,7 +404,7 @@ public static List<Parent> Merge<Parent, Child>(this List<Parent> parents, List<
             return parents;
         }
 
-        internal static void SetListChildResults<Parent>(List<Parent> parents, ModelDefinition modelDef, 
+        internal static void SetListChildResults<Parent>(List<Parent> parents, ModelDefinition modelDef,
             FieldDefinition fieldDef, Type refType, IList childResults, FieldDefinition refField)
         {
             var map = new Dictionary<object, List<object>>();
@@ -466,6 +473,6 @@ internal static void SetRefFieldChildResults<Parent>(List<Parent> parents, Model
                 }
             }
         }
-        
+
     }
 }

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

@@ -546,5 +546,58 @@ public void Can_perform_a_crossjoin_with_a_join_expression()
                 Assert.That(result, Is.EquivalentTo(expected));
             }
         }
+
+        class JoinTest
+        {
+            public int Id { get; set; }
+        }
+
+        class JoinTestChild
+        {
+            public int Id { get; set; }
+
+            public int ParentId { get; set; }
+
+            public bool IsActive { get; set; }
+        }
+
+        [Test]
+        public void Issue_Bool_JoinTable_Expression()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<JoinTest>();
+                db.DropAndCreateTable<JoinTestChild>();
+
+                db.InsertAll(new[] {
+                    new JoinTest { Id = 1, },
+                    new JoinTest { Id = 2, }
+                });
+
+                db.InsertAll(new[] {
+                    new JoinTestChild
+                    {
+                        Id = 1,
+                        ParentId = 1,
+                        IsActive = true
+                    },
+                    new JoinTestChild
+                    {
+                        Id = 2,
+                        ParentId = 2,
+                        IsActive = false
+                    }
+                });
+
+                var q = db.From<JoinTestChild>();
+                q.Where(x => !x.IsActive);
+                Assert.That(db.Select(q).Count, Is.EqualTo(1));
+
+                var qSub = db.From<JoinTest>();
+                qSub.Join<JoinTestChild>((x, y) => x.Id == y.ParentId);
+                qSub.Where<JoinTestChild>(x => !x.IsActive); // This line is a bug!
+                Assert.That(db.Select(qSub).Count, Is.EqualTo(1));
+            }
+        }
     }
 }