allow raw expressions on Insert/Update/Delete operations

Author: ahmad-moussawi

QueryBuilder.Tests/InsertTests.cs

@@ -118,9 +118,9 @@ public void InsertWithEmptyString()
         [Fact]
         public void InsertWithByteArray()
         {
-            var fauxImagebytes = new byte[] {0x1, 0x3, 0x3, 0x7};
+            var fauxImagebytes = new byte[] { 0x1, 0x3, 0x3, 0x7 };
             var query = new Query("Books")
-                .AsInsert(new[]{"Id", "CoverImageBytes"},
+                .AsInsert(new[] { "Id", "CoverImageBytes" },
                     new object[]
                     {
                         1,
@@ -169,5 +169,40 @@ public void InsertWithIgnoreAndColumnProperties()
                  c[EngineCodes.Firebird]);
         }
 
+        [Fact]
+        public void InsertFromRaw()
+        {
+            var query = new Query().FromRaw("Table.With.Dots").AsInsert(new
+            {
+                Name = "The User",
+                Age = new DateTime(2018, 1, 1),
+            });
+
+            var c = Compile(query);
+
+            Assert.Equal(
+                "INSERT INTO Table.With.Dots ([Name], [Age]) VALUES ('The User', '2018-01-01')",
+                c[EngineCodes.SqlServer]
+            );
+
+        }
+
+
+        [Fact]
+        public void InsertFromQueryShouldFail()
+        {
+            var query = new Query().From(new Query("InnerTable")).AsInsert(new
+            {
+                Name = "The User",
+                Age = new DateTime(2018, 1, 1),
+            });
+
+            Assert.Throws<InvalidOperationException>(() =>
+            {
+                Compile(query);
+            });
+
+        }
+
     }
 }

QueryBuilder.Tests/UpdateTests.cs

@@ -161,5 +161,38 @@ public void UpdateWithKeyAttribute()
               c[EngineCodes.Firebird]);
         }
 
+
+        [Fact]
+        public void UpdateFromRaw()
+        {
+            var query = new Query().FromRaw("Table.With.Dots").AsUpdate(new
+            {
+                Name = "The User",
+            });
+
+            var c = Compile(query);
+
+            Assert.Equal(
+                "UPDATE Table.With.Dots SET [Name] = 'The User'",
+                c[EngineCodes.SqlServer]
+            );
+        }
+
+
+        [Fact]
+        public void UpdateFromQueryShouldFail()
+        {
+            var query = new Query().From(new Query("InnerTable")).AsUpdate(new
+            {
+                Name = "The User",
+            });
+
+            Assert.Throws<InvalidOperationException>(() =>
+            {
+                Compile(query);
+            });
+
+        }
+
     }
 }

QueryBuilder/Compilers/Compiler.cs

@@ -221,9 +221,22 @@ private SqlResult CompileDeleteQuery(Query query)
                 throw new InvalidOperationException("No table set to delete");
             }
 
-            var from = ctx.Query.GetOneComponent<AbstractFrom>("from", EngineCode);
+            var fromClause = ctx.Query.GetOneComponent<AbstractFrom>("from", EngineCode);
+
+            string table = null;
+
+            if (fromClause is FromClause fromClauseCast)
+            {
+                table = Wrap(fromClauseCast.Table);
+            }
+
+            if (fromClause is RawFromClause rawFromClause)
+            {
+                table = WrapIdentifiers(rawFromClause.Expression);
+                ctx.Bindings.AddRange(rawFromClause.Bindings);
+            }
 
-            if (!(from is FromClause))
+            if (table is null)
             {
                 throw new InvalidOperationException("Invalid table expression");
             }
@@ -235,7 +248,7 @@ private SqlResult CompileDeleteQuery(Query query)
                 where = " " + where;
             }
 
-            ctx.RawSql = "DELETE FROM " + CompileTableExpression(ctx, from) + where;
+            ctx.RawSql = $"DELETE FROM {table}{where}";
 
             return ctx;
         }
@@ -252,9 +265,22 @@ private SqlResult CompileUpdateQuery(Query query)
                 throw new InvalidOperationException("No table set to update");
             }
 
-            var from = ctx.Query.GetOneComponent<AbstractFrom>("from", EngineCode);
+            var fromClause = ctx.Query.GetOneComponent<AbstractFrom>("from", EngineCode);
 
-            if (!(from is FromClause))
+            string table = null;
+
+            if (fromClause is FromClause fromClauseCast)
+            {
+                table = Wrap(fromClauseCast.Table);
+            }
+
+            if (fromClause is RawFromClause rawFromClause)
+            {
+                table = WrapIdentifiers(rawFromClause.Expression);
+                ctx.Bindings.AddRange(rawFromClause.Bindings);
+            }
+
+            if (table is null)
             {
                 throw new InvalidOperationException("Invalid table expression");
             }
@@ -277,9 +303,9 @@ private SqlResult CompileUpdateQuery(Query query)
                 where = " " + where;
             }
 
-            ctx.RawSql = "UPDATE " + CompileTableExpression(ctx, from)
-                + " SET " + string.Join(", ", parts)
-                + where;
+            var sets = string.Join(", ", parts);
+
+            ctx.RawSql = $"UPDATE {table} SET {sets}{where}";
 
             return ctx;
         }
@@ -296,14 +322,30 @@ protected virtual SqlResult CompileInsertQuery(Query query)
                 throw new InvalidOperationException("No table set to insert");
             }
 
-            var fromClause = ctx.Query.GetOneComponent<FromClause>("from", EngineCode);
+            var fromClause = ctx.Query.GetOneComponent<AbstractFrom>("from", EngineCode);
 
             if (fromClause is null)
             {
                 throw new InvalidOperationException("Invalid table expression");
             }
 
-            var table = Wrap(fromClause.Table);
+            string table = null;
+
+            if (fromClause is FromClause fromClauseCast)
+            {
+                table = Wrap(fromClauseCast.Table);
+            }
+
+            if (fromClause is RawFromClause rawFromClause)
+            {
+                table = WrapIdentifiers(rawFromClause.Expression);
+                ctx.Bindings.AddRange(rawFromClause.Bindings);
+            }
+
+            if (table is null)
+            {
+                throw new InvalidOperationException("Invalid table expression");
+            }
 
             var inserts = ctx.Query.GetComponents<AbstractInsertClause>("insert", EngineCode);