Move AstNodes to FluentSQL.Compilation.Parser.Nodes

fluent-sql · Jul 25, 2019 · 44cc1e2 · 44cc1e2
1 parent e699f18
commit 44cc1e2
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 14 deletions.
diff --git a/src/FluentSQL.Tests/Compilation/Builders/QueryCompilerBuilder.cs b/src/FluentSQL.Tests/Compilation/Builders/QueryCompilerBuilder.cs
@@ -1,7 +1,7 @@
 using System;
 
 using FluentSQL.Compilation;
-using FluentSQL.Compilation.Parser;
+using FluentSQL.Compilation.Parser.Nodes;
 
 namespace FluentSQL.Tests.Compilation.Builders
 {

diff --git a/src/FluentSQL.Tests/Compilation/Parser/Assertions/AstNodeAssertions.cs b/src/FluentSQL.Tests/Compilation/Parser/Assertions/AstNodeAssertions.cs
@@ -4,7 +4,7 @@
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 
-using FluentSQL.Compilation.Parser;
+using FluentSQL.Compilation.Parser.Nodes;
 
 namespace FluentSQL.Tests.Compilation.Parser.Assertions
 {

diff --git a/src/FluentSQL.Tests/Compilation/Parser/Assertions/FromNodeAssertions.cs b/src/FluentSQL.Tests/Compilation/Parser/Assertions/FromNodeAssertions.cs
@@ -2,7 +2,7 @@
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 
-using FluentSQL.Compilation.Parser;
+using FluentSQL.Compilation.Parser.Nodes;
 
 namespace FluentSQL.Tests.Compilation.Parser.Assertions
 {
@@ -28,5 +28,16 @@ public AndConstraint<FromNodeAssertions> HaveAlias(string alias, string because
 
             return new AndConstraint<FromNodeAssertions>(this);
         }
+
+        public AndConstraint<FromNodeAssertions> NotHaveAnAlias(string because = "", params object[] becauseArgs)
+        {
+            Execute.Assertion
+                .BecauseOf(because, becauseArgs)
+                .Given(() => Subject.Alias)
+                .ForCondition(x => x == null)
+                .FailWith("Expected {context:FromNode} to not have an alias, but it had {0}", x => x);
+
+            return new AndConstraint<FromNodeAssertions>(this);
+        }
     }
 }
diff --git a/src/FluentSQL.Tests/Compilation/Parser/Extensions/AstNodeExtensions.cs b/src/FluentSQL.Tests/Compilation/Parser/Extensions/AstNodeExtensions.cs
@@ -1,4 +1,4 @@
-using FluentSQL.Compilation.Parser;
+using FluentSQL.Compilation.Parser.Nodes;
 using FluentSQL.Tests.Compilation.Parser.Assertions;
 
 namespace FluentSQL.Tests.Compilation.Parser.Extensions

diff --git a/src/FluentSQL.Tests/Compilation/Parser/Extensions/FromNodeExtensions.cs b/src/FluentSQL.Tests/Compilation/Parser/Extensions/FromNodeExtensions.cs
@@ -1,4 +1,4 @@
-using FluentSQL.Compilation.Parser;
+using FluentSQL.Compilation.Parser.Nodes;
 using FluentSQL.Tests.Compilation.Parser.Assertions;
 
 namespace FluentSQL.Tests.Compilation.Parser.Extensions

diff --git a/src/FluentSQL.Tests/Compilation/Parser/FromQueryParserTests.cs b/src/FluentSQL.Tests/Compilation/Parser/FromQueryParserTests.cs
@@ -3,10 +3,12 @@
 using FluentAssertions;
 
 using FluentSQL.Compilation.Parser;
+using FluentSQL.Compilation.Parser.Nodes;
 using FluentSQL.Querying;
 using FluentSQL.Querying.Statements.Extensions;
 using FluentSQL.Tests.Builders;
 using FluentSQL.Tests.Compilation.Parser.Builders;
+using FluentSQL.Tests.Compilation.Parser.Extensions;
 using FluentSQL.Tests.Examples;
 using FluentSQL.Tests.Examples.Builders;
 
@@ -47,7 +49,7 @@ public void It_should_add_the_from_clause()
             [Fact]
             public void It_should_have_no_alias()
             {
-                RootNode.ChildNodes.OfType<FromNode>().Single().Alias.Should().BeNull();
+                RootNode.ChildNodes.OfType<FromNode>().Single().Should().NotHaveAnAlias();
             }
         }
 
@@ -85,7 +87,7 @@ public void It_should_add_the_from_clause()
             [Fact]
             public void It_should_have_the_alias()
             {
-                RootNode.ChildNodes.OfType<FromNode>().Single().Alias.Should().Be(Alias);
+                RootNode.ChildNodes.OfType<FromNode>().Single().Should().HaveAlias(Alias);
             }
         }
     }

diff --git a/src/FluentSQL.Tests/Compilation/Parser/QueryParserTests.cs b/src/FluentSQL.Tests/Compilation/Parser/QueryParserTests.cs
@@ -1,4 +1,5 @@
 using FluentSQL.Compilation.Parser;
+using FluentSQL.Compilation.Parser.Nodes;
 using FluentSQL.Querying;
 using FluentSQL.Tests.Compilation.Parser.Builders;
 using FluentSQL.Tests.Compilation.Parser.Extensions;

diff --git a/src/FluentSQL.Tests/Compilation/Parser/UnionAllQueryParserTests.cs b/src/FluentSQL.Tests/Compilation/Parser/UnionAllQueryParserTests.cs
@@ -1,6 +1,7 @@
 using FluentAssertions;
 
 using FluentSQL.Compilation.Parser;
+using FluentSQL.Compilation.Parser.Nodes;
 using FluentSQL.Querying;
 using FluentSQL.Querying.Statements.Extensions;
 using FluentSQL.Tests.Builders;

diff --git a/src/FluentSQL.Tests/Compilation/Parser/UnionQueryParserTests.cs b/src/FluentSQL.Tests/Compilation/Parser/UnionQueryParserTests.cs
@@ -1,6 +1,7 @@
 using FluentAssertions;
 
 using FluentSQL.Compilation.Parser;
+using FluentSQL.Compilation.Parser.Nodes;
 using FluentSQL.Querying;
 using FluentSQL.Querying.Statements.Extensions;
 using FluentSQL.Tests.Builders;

diff --git a/src/FluentSQL/Compilation/Parser/AstNode.cs → ...ntSQL/Compilation/Parser/Nodes/AstNode.cs b/src/FluentSQL/Compilation/Parser/AstNode.cs → ...ntSQL/Compilation/Parser/Nodes/AstNode.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace FluentSQL.Compilation.Parser
+namespace FluentSQL.Compilation.Parser.Nodes
 {
     public class AstNode
     {

diff --git a/src/FluentSQL/Compilation/Parser/FromNode.cs → ...tSQL/Compilation/Parser/Nodes/FromNode.cs b/src/FluentSQL/Compilation/Parser/FromNode.cs → ...tSQL/Compilation/Parser/Nodes/FromNode.cs
@@ -1,4 +1,4 @@
-namespace FluentSQL.Compilation.Parser
+namespace FluentSQL.Compilation.Parser.Nodes
 {
     public sealed class FromNode : AstNode
     {

diff --git a/...entSQL/Compilation/Parser/UnionAllNode.cs → .../Compilation/Parser/Nodes/UnionAllNode.cs b/...entSQL/Compilation/Parser/UnionAllNode.cs → .../Compilation/Parser/Nodes/UnionAllNode.cs
@@ -1,4 +1,4 @@
-namespace FluentSQL.Compilation.Parser
+namespace FluentSQL.Compilation.Parser.Nodes
 {
     public sealed class UnionAllNode : AstNode
     {

diff --git a/...FluentSQL/Compilation/Parser/UnionNode.cs → ...SQL/Compilation/Parser/Nodes/UnionNode.cs b/...FluentSQL/Compilation/Parser/UnionNode.cs → ...SQL/Compilation/Parser/Nodes/UnionNode.cs
@@ -1,4 +1,4 @@
-namespace FluentSQL.Compilation.Parser
+namespace FluentSQL.Compilation.Parser.Nodes
 {
     public sealed class UnionNode : AstNode
     {

diff --git a/src/FluentSQL/Compilation/Parser/QueryParser.cs b/src/FluentSQL/Compilation/Parser/QueryParser.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq.Expressions;
 
+using FluentSQL.Compilation.Parser.Nodes;
 using FluentSQL.Querying;
 using FluentSQL.Querying.Statements;
 
@@ -112,7 +113,8 @@ internal void Select<TSqlExpression>(Expression<Func<TSqlExpression>> expression
         }
 
         private (AstNode firstResult, AstNode secondResult) ParseMultiple<TFirstParameters, TSecondParameters, TQueryResult>(
-            QueryComponent<TFirstParameters, TQueryResult> first, QueryComponent<TSecondParameters, TQueryResult> second)
+            QueryComponent<TFirstParameters, TQueryResult> first,
+            QueryComponent<TSecondParameters, TQueryResult> second)
         {
             var firstParser = new QueryParser();
             AstNode firstResult = firstParser.Parse(first.QueryContext);

diff --git a/src/FluentSQL/Compilation/QueryCompiler.cs b/src/FluentSQL/Compilation/QueryCompiler.cs
@@ -1,4 +1,4 @@
-using FluentSQL.Compilation.Parser;
+using FluentSQL.Compilation.Parser.Nodes;
 using FluentSQL.Querying;
 
 namespace FluentSQL.Compilation

diff --git a/src/FluentSQL/Databases/Database.cs b/src/FluentSQL/Databases/Database.cs
@@ -1,5 +1,6 @@
 using FluentSQL.Compilation;
 using FluentSQL.Compilation.Parser;
+using FluentSQL.Compilation.Parser.Nodes;
 using FluentSQL.Querying;
 
 namespace FluentSQL.Databases

diff --git a/src/FluentSQL/Databases/SqlServer/SqlServerQueryCompiler.cs b/src/FluentSQL/Databases/SqlServer/SqlServerQueryCompiler.cs
@@ -1,5 +1,5 @@
 using FluentSQL.Compilation;
-using FluentSQL.Compilation.Parser;
+using FluentSQL.Compilation.Parser.Nodes;
 using FluentSQL.Querying;
 
 namespace FluentSQL.Databases.SqlServer