#56 enhanced to provide error feedback

Author: kccarter76

SubSonic.Core.DataAccessLayer/src/Builders/DbSqlQueryBuilder/DbSqlQueryBuilderBuildMethods.cs

@@ -626,9 +626,18 @@ private Expression BuildSelectWithExpression(MethodCallExpression expression)
                     case ExpressionType.MemberAccess:
                         if (selector.ReturnType.IsClass)
                         {
-                            DbTableExpression dbTable = select.From.ToTableList().Single(x => x.Type.GenericTypeArguments[0] == selector.ReturnType);
+                            IEnumerable<DbTableExpression> tables = select.From.ToTableList();
 
-                            columns = dbTable.Columns;
+                            if (tables.Any(x => x.Type.GenericTypeArguments[0] == selector.ReturnType))
+                            {
+                                DbTableExpression dbTable = tables.Single(x => x.Type.GenericTypeArguments[0] == selector.ReturnType);
+
+                                columns = dbTable.Columns;
+                            }
+                            else
+                            {
+                                throw Error.InvalidOperation(SubSonicErrorMessages.MissingTableReferenceFor.Format(selector.ReturnType.Name));
+                            }
                         }
                         else
                         {

SubSonic.Tests/DAL/SqlQueryProvider/SqlGeneratorTests.cs

@@ -16,6 +16,7 @@ namespace SubSonic.Tests.DAL.SqlQueryProvider
     using Linq;
     using Linq.Expressions;
     using Tests.DAL.SUT;
+    using SubSonic.src;
 
     [TestFixture]
     public partial class SqlQueryProviderTests
@@ -1093,6 +1094,22 @@ INNER JOIN page
             query.Sql.Should().Be(expected);
         }
 
+        [Test]
+        public void ThrowMissingReferenceForSelectStatementForIncludedEntityWhenMissingInclude()
+        {
+            FluentActions.Invoking(() =>
+            {
+                Person person = Context.People.First();
+
+                Expression select = person
+                .Renters
+                .Where((Renter) =>
+                    DateTime.Today.Between(Renter.StartDate, Renter.EndDate.GetValueOrDefault(DateTime.Today.AddDays(1))))
+                .Select(x => x.Unit)
+                .Expression;
+            }).Should().Throw<InvalidOperationException>().WithMessage(SubSonicErrorMessages.MissingTableReferenceFor.Format(typeof(Unit).Name));
+        }
+
         [Test]
         public void CanGenerateSelectStatementForIncludedEntity()
         {