Fixed INSERT from SELECT CTE

Author: glecchi

Lib/CSQLQueryExpress/Compiler/SQLQueryFragmentComparer.cs

@@ -38,6 +38,7 @@ public int Compare(ISQLQueryFragment x, ISQLQueryFragment y)
         private static void AddFragmentOrders(IDictionary<SQLQueryFragmentType, IDictionary<SQLQueryFragmentType, int>> order)
         {
             order.Add(SQLQueryFragmentType.Insert, GetInsertOrder());
+            order.Add(SQLQueryFragmentType.InsertBySelect, GetDefaultOrder());
             order.Add(SQLQueryFragmentType.Delete, GetDeleteOrder());
             order.Add(SQLQueryFragmentType.Update, GetUpdateOrder());
             order.Add(SQLQueryFragmentType.Truncate, GetTruncateOrder());

Lib/CSQLQueryExpress/Compiler/SQLQueryTranslator.cs

@@ -823,17 +823,25 @@ private Expression VisitQuerySelectionMethodCall(MethodCallExpression node)
             }
             else if (node.Method.Name == nameof(SQLQuerySelectionExtension.As))
             {
-                this.Visit(node.Arguments[0]);
-                _queryBuilder.Append(" AS ");
-                if (node.Arguments[1] is MemberExpression memberExp)
+                if (_fragmentType == SQLQueryFragmentType.InsertValues &&
+                    node.Arguments.Count == 2)
                 {
-                    _queryBuilder.Append(_aliasBuilder.ResolveColumnName(memberExp.Type, memberExp.Member));
+                    this.Visit(node.Arguments[1]);
                 }
                 else
                 {
-                    var unaryExp = (UnaryExpression)node.Arguments[1];
-                    var opMemberExp = (MemberExpression)unaryExp.Operand;
-                    _queryBuilder.Append(_aliasBuilder.ResolveColumnName(opMemberExp.Type, opMemberExp.Member));
+                    this.Visit(node.Arguments[0]);
+                    _queryBuilder.Append(" AS ");
+                    if (node.Arguments[1] is MemberExpression memberExp)
+                    {
+                        _queryBuilder.Append(_aliasBuilder.ResolveColumnName(memberExp.Type, memberExp.Member));
+                    }
+                    else
+                    {
+                        var unaryExp = (UnaryExpression)node.Arguments[1];
+                        var opMemberExp = (MemberExpression)unaryExp.Operand;
+                        _queryBuilder.Append(_aliasBuilder.ResolveColumnName(opMemberExp.Type, opMemberExp.Member));
+                    }
                 }
 
                 return node;

Lib/CSQLQueryExpress/Fragments/SQLQueryFrom.cs

@@ -168,7 +168,7 @@ public string Translate(ISQLQueryTranslator expressionTranslator)
 
             if (_select != null)
             {
-                if (_fragments.All(f => f.FragmentType != SQLQueryFragmentType.Insert))
+                if (_fragments.All(f => f.FragmentType != SQLQueryFragmentType.Insert && f.FragmentType != SQLQueryFragmentType.InsertBySelect))
                 {
                     if (_select.FragmentType == SQLQueryFragmentType.SelectCte)
                     {
@@ -180,7 +180,7 @@ public string Translate(ISQLQueryTranslator expressionTranslator)
                     }
                 }
             }
-            else if (_fragments.All(f => f.FragmentType != SQLQueryFragmentType.Insert && f.FragmentType != SQLQueryFragmentType.Update))
+            else if (_fragments.All(f => f.FragmentType != SQLQueryFragmentType.Insert && f.FragmentType != SQLQueryFragmentType.InsertBySelect && f.FragmentType != SQLQueryFragmentType.Update))
             {
                 if (_fragments.Any(f => f.FragmentType == SQLQueryFragmentType.Select || f.FragmentType == SQLQueryFragmentType.SelectCte))
                 {

Tests/CSQLQueryExpress.Tests/UnitTests/QueryInsertUnitTest.cs

@@ -92,6 +92,26 @@ public void TestInsertFromSelect()
                 Is.EqualTo(@"INSERT INTO [dbo].[Shippers] ([CompanyName], [Phone]) SELECT _t1.[CompanyName], @p0 FROM [dbo].[Customers] AS _t1"));
         }
 
+        [Test]
+        public void TestInsertFromSelectCte()
+        {
+            var selectQuery = new SQLQuery()
+                .From<dbo.Customers>()
+                .Select(s => s.CompanyName, s => "Ciao".As(s.Phone))
+                .ToCteTable();
+
+            var query = new SQLQuery()
+                .Insert<dbo.Shippers>(selectQuery, s => s.CompanyName, s => s.Phone);
+
+            var compiledQuery = query.Compile();
+
+            Assert.That(compiledQuery.Parameters.Count, Is.EqualTo(1));
+            Assert.That(compiledQuery.Parameters[0].Value, Is.EqualTo("Ciao"));
+
+            Assert.That(compiledQuery.Statement.Replace(Environment.NewLine, string.Empty),
+                Is.EqualTo(@"WITH _t0 AS (SELECT _t0.[CompanyName], @p0 AS [Phone] FROM [dbo].[Customers] AS _t0) INSERT INTO [dbo].[Shippers] ([CompanyName], [Phone]) SELECT _t0.[CompanyName], _t0.[Phone] FROM _t1"));
+        }
+
         [Test]
         public void TestInsertParameters()
         {