Make every QueryComponent a SqlExpression

fluent-sql · Jun 26, 2019 · 923b23b · 923b23b
1 parent 6bccbcf
commit 923b23b
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 90 deletions.
diff --git a/src/FluentSQL/Modelling/SqlExpression.cs b/src/FluentSQL/Modelling/SqlExpression.cs
@@ -1,4 +1,5 @@
 using System;
+// ReSharper disable UnusedParameter.Global
 
 namespace FluentSQL.Modelling
 {

diff --git a/src/FluentSQL/Modelling/Table.cs b/src/FluentSQL/Modelling/Table.cs
@@ -3,7 +3,7 @@
     /// <summary>
     ///     Represents a table.
     /// </summary>
-    public abstract class Table
+    public abstract class Table : SqlExpression<Table>
     {
     }
 }
diff --git a/src/FluentSQL/Query.cs b/src/FluentSQL/Query.cs
@@ -1,4 +1,5 @@
 using FluentSQL.Compilation;
+using FluentSQL.Modelling;
 
 namespace FluentSQL
 {
@@ -9,7 +10,7 @@ namespace FluentSQL
     /// <typeparam name="TParameters">
     ///     The parameters required for executing this query.
     /// </typeparam>
-    public class Query<TParameters, TQueryResult> where TParameters : new()
+    public class Query<TParameters, TQueryResult> : SqlExpression<TQueryResult> where TParameters : new()
     {
         /// <summary>
         ///     Create a new query.
@@ -27,7 +28,7 @@ internal Query(CompilationResult compilationResult)
     ///     The compiled query to execute.
     /// </summary>
     /// <typeparam name="TQueryResult">The result type.</typeparam>
-    public class Query<TQueryResult>
+    public class Query<TQueryResult> : SqlExpression<TQueryResult>
     {
         /// <summary>
         ///     Create a new query.

diff --git a/src/FluentSQL/Querying/QueryComponent.cs b/src/FluentSQL/Querying/QueryComponent.cs
@@ -1,4 +1,6 @@
-namespace FluentSQL.Querying
+using FluentSQL.Modelling;
+
+namespace FluentSQL.Querying
 {
     /// <summary>
     ///     A component of a query.
@@ -7,11 +9,20 @@
     ///     The parameters required for executing the query.
     /// </typeparam>
     /// <typeparam name="TQueryResult">The result type of the query.</typeparam>
-    public interface QueryComponent<TParameters, TQueryResult> where TParameters : new()
+    public abstract class QueryComponent<TParameters, TQueryResult> : SqlExpression<TQueryResult> where TParameters : new()
     {
         /// <summary>
-        ///     Gets the underlying <see cref="QueryContext{TParameters, TQueryResult} " />.
+        ///     Create a new <see cref="QueryComponent{TParameters, TQueryResult}" />.
         /// </summary>
-        QueryContext<TParameters, TQueryResult> QueryContext { get; }
+        /// <param name="queryContext">The underlying <see cref="QueryContext{TParameters, TQueryResult}" />.</param>
+        protected QueryComponent(QueryContext<TParameters, TQueryResult> queryContext)
+        {
+            QueryContext = queryContext;
+        }
+
+        /// <summary>
+        ///     Gets the underlying <see cref="QueryContext{TParameters, TQueryResult}" />.
+        /// </summary>
+        internal QueryContext<TParameters, TQueryResult> QueryContext { get; }
     }
 }
diff --git a/src/FluentSQL/Querying/Statements/Distinct.cs b/src/FluentSQL/Querying/Statements/Distinct.cs
@@ -14,18 +14,9 @@
         /// </summary>
         /// <param name="queryContext">The <see cref="QueryContext{TParameters, TResult}" />.</param>
         internal Distinct(QueryContext<TParameters, TQueryResult> queryContext)
+            : base(queryContext)
         {
-            QueryContext = queryContext;
-
             QueryContext.Modifiers.Add(this);
         }
-
-        /// <inheritdoc />
-        QueryContext<TParameters, TQueryResult> QueryComponent<TParameters, TQueryResult>.QueryContext
-        {
-            get { return QueryContext; }
-        }
-
-        private QueryContext<TParameters, TQueryResult> QueryContext { get; }
     }
 }
diff --git a/src/FluentSQL/Querying/Statements/From.cs b/src/FluentSQL/Querying/Statements/From.cs
@@ -23,20 +23,13 @@ namespace FluentSQL.Querying.Statements
         /// <param name="queryContext">The <see cref="QueryContext{TParameters, TResult}" />.</param>
         /// <param name="expression">The expression for selecting <typeparamref name="TTable" />.</param>
         internal From(QueryContext<TParameters, TQueryResult> queryContext, Expression<Func<TTable>> expression)
+            : base(queryContext)
         {
-            QueryContext = queryContext;
             Expression = expression;
 
             QueryContext.FromComponents.Add(this);
         }
 
-        /// <inheritdoc />
-        QueryContext<TParameters, TQueryResult> QueryComponent<TParameters, TQueryResult>.QueryContext
-        {
-            get { return QueryContext; }
-        }
-
-        private QueryContext<TParameters, TQueryResult> QueryContext { get; }
         private Expression<Func<TTable>> Expression { get; }
     }
 }
diff --git a/src/FluentSQL/Querying/Statements/GroupBy.cs b/src/FluentSQL/Querying/Statements/GroupBy.cs
@@ -21,20 +21,13 @@ public class GroupBy<TParameters, TQueryResult, TSqlExpression> :
         /// <param name="queryContext">The <see cref="QueryContext{TParameters, TResult}" />.</param>
         /// <param name="expression">The <see cref="Expression{TDelegate}" /> to select.</param>
         internal GroupBy(QueryContext<TParameters, TQueryResult> queryContext, Expression<Func<TSqlExpression>> expression)
+            : base(queryContext)
         {
-            QueryContext = queryContext;
             Expression = expression;
 
-            queryContext.GroupByComponents.Add(this);
+            QueryContext.GroupByComponents.Add(this);
         }
 
-        /// <inheritdoc />
-        QueryContext<TParameters, TQueryResult> QueryComponent<TParameters, TQueryResult>.QueryContext
-        {
-            get { return QueryContext; }
-        }
-
-        private QueryContext<TParameters, TQueryResult> QueryContext { get; }
         private Expression<Func<TSqlExpression>> Expression { get; }
     }
 }
diff --git a/src/FluentSQL/Querying/Statements/Join.cs b/src/FluentSQL/Querying/Statements/Join.cs
@@ -21,11 +21,11 @@ namespace FluentSQL.Querying.Statements
         ///     The <see cref="Expression{TDelegate}">Expression&lt;Func&lt;TTable&gt;&gt;</see> that selects the child to join with.
         /// </param>
         protected Join(QueryContext<TParameters, TQueryResult> queryContext, Expression<Func<TTable>> child)
+            : base(queryContext)
         {
-            QueryContext = queryContext;
             Child = child;
 
-            queryContext.JoinComponents.Add(this);
+            QueryContext.JoinComponents.Add(this);
         }
 
         /// <summary>
@@ -56,13 +56,6 @@ public Join<TParameters, TQueryResult, TTable> On(Expression<Func<TTable, bool>>
             return this;
         }
 
-        /// <inheritdoc />
-        QueryContext<TParameters, TQueryResult> QueryComponent<TParameters, TQueryResult>.QueryContext
-        {
-            get { return QueryContext; }
-        }
-
-        private QueryContext<TParameters, TQueryResult> QueryContext { get; }
         private Expression<Func<TTable>> Child { get; }
         private Expression<Func<bool>> ImplicitTableExpression { get; set; }
         private Expression<Func<TTable, bool>> ExplicitTableExpression { get; set; }

diff --git a/src/FluentSQL/Querying/Statements/Limit.cs b/src/FluentSQL/Querying/Statements/Limit.cs
@@ -16,20 +16,13 @@ namespace FluentSQL.Querying.Statements
         /// <param name="queryContext">The <see cref="QueryContext{TParameters, TResult}" />.</param>
         /// <param name="count">The number of rows.</param>
         internal Limit(QueryContext<TParameters, TQueryResult> queryContext, int count)
+            : base(queryContext)
         {
-            QueryContext = queryContext;
             Count = count;
 
             QueryContext.Modifiers.Add(this);
         }
 
-        /// <inheritdoc />
-        QueryContext<TParameters, TQueryResult> QueryComponent<TParameters, TQueryResult>.QueryContext
-        {
-            get { return QueryContext; }
-        }
-
-        private QueryContext<TParameters, TQueryResult> QueryContext { get; }
         private int Count { get; }
     }
 }
diff --git a/src/FluentSQL/Querying/Statements/OrderBy.cs b/src/FluentSQL/Querying/Statements/OrderBy.cs
@@ -23,11 +23,11 @@ public class OrderBy<TParameters, TQueryResult, TSqlExpression> :
         ///     The <see cref="Expression{TDelegate}">Expression&lt;Func&lt;TSqlExpression&gt;&gt;</see> to select.
         /// </param>
         internal OrderBy(QueryContext<TParameters, TQueryResult> queryContext, Expression<Func<TSqlExpression>> expression)
+            : base(queryContext)
         {
-            QueryContext = queryContext;
             Expression = expression;
 
-            queryContext.OrderByComponents.Add(this);
+            QueryContext.OrderByComponents.Add(this);
         }
 
         /// <summary>
@@ -46,13 +46,6 @@ public OrderBy<TParameters, TQueryResult, TSqlExpression> Descending
             get { return this; }
         }
 
-        /// <inheritdoc />
-        QueryContext<TParameters, TQueryResult> QueryComponent<TParameters, TQueryResult>.QueryContext
-        {
-            get { return QueryContext; }
-        }
-
-        private QueryContext<TParameters, TQueryResult> QueryContext { get; }
         private Expression<Func<TSqlExpression>> Expression { get; }
     }
 }
diff --git a/src/FluentSQL/Querying/Statements/Select.cs b/src/FluentSQL/Querying/Statements/Select.cs
@@ -23,11 +23,11 @@ public class Select<TParameters, TQueryResult, TSqlExpression> :
         ///     The <see cref="Expression{TDelegate}">Expression&lt;Func&lt;TSqlExpression&gt;&gt;</see> to select.
         /// </param>
         internal Select(QueryContext<TParameters, TQueryResult> queryContext, Expression<Func<TSqlExpression>> expression)
+            : base(queryContext)
         {
-            QueryContext = queryContext;
             Expression = expression;
 
-            queryContext.SelectComponents.Add(this);
+            QueryContext.SelectComponents.Add(this);
         }
 
         /// <summary>
@@ -53,13 +53,6 @@ public Select<TParameters, TQueryResult, TSqlExpression> As(Expression<Func<TQue
             return this;
         }
 
-        /// <inheritdoc />
-        QueryContext<TParameters, TQueryResult> QueryComponent<TParameters, TQueryResult>.QueryContext
-        {
-            get { return QueryContext; }
-        }
-
-        private QueryContext<TParameters, TQueryResult> QueryContext { get; }
         private Expression<Func<TSqlExpression>> Expression { get; }
         private Alias Alias { get; set; }
     }

diff --git a/src/FluentSQL/Querying/Statements/Union.cs b/src/FluentSQL/Querying/Statements/Union.cs
@@ -21,17 +21,12 @@ public class Union<TParameters1, TParameters2, TQueryResult> : QueryComponent<TP
         /// <param name="first">The first query.</param>
         /// <param name="second">The second query.</param>
         internal Union(QueryComponent<TParameters1, TQueryResult> first, QueryComponent<TParameters2, TQueryResult> second)
+            : base(first.QueryContext)
         {
             First = first;
             Second = second;
         }
 
-        /// <inheritdoc />
-        QueryContext<TParameters1, TQueryResult> QueryComponent<TParameters1, TQueryResult>.QueryContext
-        {
-            get { return First.QueryContext; }
-        }
-
         private QueryComponent<TParameters1, TQueryResult> First { get; }
         private QueryComponent<TParameters2, TQueryResult> Second { get; }
     }

diff --git a/src/FluentSQL/Querying/Statements/UnionAll.cs b/src/FluentSQL/Querying/Statements/UnionAll.cs
@@ -21,17 +21,12 @@ public class UnionAll<TParameters1, TParameters2, TQueryResult> : QueryComponent
         /// <param name="first">The first query.</param>
         /// <param name="second">The second query.</param>
         internal UnionAll(QueryComponent<TParameters1, TQueryResult> first, QueryComponent<TParameters2, TQueryResult> second)
+            : base(first.QueryContext)
         {
             First = first;
             Second = second;
         }
 
-        /// <inheritdoc />
-        QueryContext<TParameters1, TQueryResult> QueryComponent<TParameters1, TQueryResult>.QueryContext
-        {
-            get { return First.QueryContext; }
-        }
-
         private QueryComponent<TParameters1, TQueryResult> First { get; }
         private QueryComponent<TParameters2, TQueryResult> Second { get; }
     }

diff --git a/src/FluentSQL/Querying/Statements/Where.cs b/src/FluentSQL/Querying/Statements/Where.cs
@@ -18,20 +18,13 @@ namespace FluentSQL.Querying.Statements
         /// <param name="queryContext">The <see cref="QueryContext{TParameters, TResult}" />.</param>
         /// <param name="expression">The expression that represents the condition.</param>
         internal Where(QueryContext<TParameters, TQueryResult> queryContext, Expression<Func<TParameters, bool>> expression)
+            : base(queryContext)
         {
-            QueryContext = queryContext;
             Expression = expression;
 
-            queryContext.WhereComponents.Add(this);
+            QueryContext.WhereComponents.Add(this);
         }
 
-        /// <inheritdoc />
-        QueryContext<TParameters, TQueryResult> QueryComponent<TParameters, TQueryResult>.QueryContext
-        {
-            get { return QueryContext; }
-        }
-
-        private QueryContext<TParameters, TQueryResult> QueryContext { get; }
         private Expression<Func<TParameters, bool>> Expression { get; }
     }
 }