Merge pull request #57 from SubSonic-Core/dev/main

#56 when selector returnType is class find the dbTableExpression from…

Author: kccarter76

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

@@ -624,7 +624,25 @@ private Expression BuildSelectWithExpression(MethodCallExpression expression)
                 switch (selector.Body.NodeType)
                 {
                     case ExpressionType.MemberAccess:
-                        columns = select.Columns.Where(column => column.PropertyName.Equals(selector.GetProperty().Name, StringComparison.CurrentCulture));
+                        if (selector.ReturnType.IsClass)
+                        {
+                            IEnumerable<DbTableExpression> tables = select.From.ToTableList();
+
+                            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
+                        {
+                            columns = select.Columns.Where(column => column.PropertyName.Equals(selector.GetProperty().Name, StringComparison.CurrentCulture));
+                        }
                         break;
                     case ExpressionType.MemberInit:
                         columns = BuildColumnDeclarationList(selector.Body, select);

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
@@ -1092,5 +1093,59 @@ 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()
+        {
+            string expected = @"SELECT [T1].[ID], [T1].[Bedrooms] AS [NumberOfBedrooms], [T1].[StatusID], [T1].[RealEstatePropertyID]
+FROM [dbo].[Renter] AS [T2]
+	INNER JOIN [dbo].[Unit] AS [T1]
+		ON ([T1].[ID] = [T2].[UnitID])
+WHERE (([T2].[PersonID] = @personid_1) AND @dt_value_2 BETWEEN [T2].[StartDate] AND COALESCE([T2].[EndDate], @dt_value_3))";
+
+            Person person = Context.People.First();
+
+            Expression select = person
+                .Renters
+                .Where((Renter) =>
+                    DateTime.Today.Between(Renter.StartDate, Renter.EndDate.GetValueOrDefault(DateTime.Today.AddDays(1))))
+                .Include(x => x.Unit)
+                .Select(x => x.Unit)
+                .Expression;
+
+            IDbQuery query = null;
+
+            var logging = Context.Instance.GetService<ISubSonicLogger<DbSelectPageExpression>>();
+
+            using (var perf = logging.Start("SQL Query Writer"))
+            {
+                FluentActions.Invoking(() =>
+                {
+                    ISubSonicQueryProvider<Status> builder = Context.Instance.GetService<ISubSonicQueryProvider<Status>>();
+
+                    query = builder.ToQuery(select);
+                }).Should().NotThrow();
+            }
+
+            query.Sql.Should().NotBeNullOrEmpty();
+
+            query.Sql.Should().Be(expected);
+        }
     }
 }