Add RawSQL type to compiler and unsafe_inject_raw erased function.

Author: rspeele

src/Rezoom.SQL.Compiler/DefaultFunctions.fs

@@ -1,12 +1,4 @@
 module Rezoom.SQL.Compiler.DefaultFunctions
-open System
-open System.Data
-open System.Collections.Generic
-open System.Globalization
-open Rezoom.SQL
-open Rezoom.SQL.Mapping
-open Rezoom.SQL.Compiler.BackendUtilities
-open Rezoom.SQL.Compiler.Translators
 open Rezoom.SQL.Compiler.FunctionDeclarations
 
 /// Functions that are supported by EVERY database. Surprisingly there aren't many of these.
@@ -27,6 +19,7 @@ let builtins =
         // Ignore the inferred type (but not inferred nullability) of its argument.
         // Lets you override the typechecker and treat values like whatever you feel they should be.
         erased "unsafe_coerce" (infect scalar) scalar
+        erased "unsafe_inject_raw" rawsql any
     |]
 
 let extendedBy backendFunctions =

src/Rezoom.SQL.Compiler/FunctionDeclarations.fs

@@ -36,6 +36,7 @@ let inline private concrete ty =
         VarArg = None
     }
 
+let any = concrete AnyTypeClass
 let scalar = concrete ScalarTypeClass
 let boolean = concrete BooleanType
 let string = concrete StringType
@@ -53,6 +54,7 @@ let datetimeoffset = concrete DateTimeOffsetType
 let datetimey = concrete DateTimeishTypeClass
 let decimal = concrete DecimalType
 let guid = concrete GuidType
+let rawsql = concrete RawSQLType
 
 let nullable arg =
     { arg with

src/Rezoom.SQL.Compiler/TypeSystem.fs

@@ -1,8 +1,8 @@
 namespace Rezoom.SQL.Compiler
 open System
 open System.Data
-open System.Data.Common
 open System.Collections.Generic
+open Rezoom.SQL.Mapping
 
 type CoreColumnType =
     | BooleanType
@@ -22,6 +22,7 @@ type CoreColumnType =
     | ScalarTypeClass
     | AnyTypeClass
     | ListType of CoreColumnType
+    | RawSQLType
     member this.ParentType =
         match this with
         | IntegerType Integer16 -> IntegralTypeClass
@@ -42,6 +43,7 @@ type CoreColumnType =
         | NumericTypeClass
         | StringishTypeClass -> ScalarTypeClass
         | ScalarTypeClass
+        | RawSQLType
         | AnyTypeClass -> AnyTypeClass
         | ListType element ->
             let elementParent = element.ParentType
@@ -80,6 +82,7 @@ type CoreColumnType =
         | StringishTypeClass -> "<stringish>"
         | ScalarTypeClass -> "<scalar>"
         | AnyTypeClass -> "<any>"
+        | RawSQLType -> "<rawsql>"
         | ListType t -> "[" + string t + "]"
     member this.ApproximateTypeName() =
         match this with
@@ -89,6 +92,7 @@ type CoreColumnType =
         | ScalarTypeClass
         | AnyTypeClass 
         | ListType _
+        | RawSQLType
         | StringType -> StringTypeName(None)
         | IntegerType Integer16 -> IntegerTypeName Integer16
         | IntegerType Integer32 -> IntegerTypeName Integer32
@@ -154,6 +158,9 @@ type ColumnType =
         | ListType t ->
             let dbType, clrType = { Type = t; Nullable = ty.Nullable }.TypeInfo(useOptional)
             dbType, clrType.MakeArrayType()
+        | RawSQLType ->
+            // DbType part is not really used here
+            Unchecked.defaultof<DbType>, typeof<CommandFragment array>
     member ty.CLRType(useOptional) = snd <| ty.TypeInfo(useOptional)
     member ty.DbType = fst <| ty.TypeInfo(false)
     override ty.ToString() =

src/Rezoom.SQL.Mapping/CommandParts.fs

@@ -91,7 +91,7 @@ type CommandCategory = CommandCategory of connectionName : string
 type CommandParameter =
     | ListParameter of DbType * Array
     | ScalarParameter of DbType * obj
-    | RawSQLParameter of CommandFragment list
+    | RawSQLParameter of CommandFragment array
     member this.Equals(other : CommandParameter) =
         match this, other with
         | ListParameter (ty1, arr1), ListParameter (ty2, arr2) ->

src/Rezoom.SQL.Provider/TypeGeneration.fs

@@ -225,6 +225,8 @@ let private generateCommandMethod
                             let arr =
                                 <@@ [| for ex in ((%%inputArr) : Array) -> ((%%lambda) : obj -> obj) ex |] @@>
                             <@@ ListParameter(%%dbType, %%Expr.Coerce(arr, typeof<Array>)) @@>
+                        | RawSQLType ->
+                            <@@ RawSQLParameter %%ex @@>
                         | _ ->
                             let tx = backend.ParameterTransform(ty)
                             let dbType = Quotations.Expr.Value(tx.ParameterType)

src/TypeProviderUsers/TypeProviderUser.Postgres/TestSelects.fs

@@ -50,7 +50,7 @@ select * from Users where Created > @created
 
 [<Test>]
 let ``test datetime parameter`` () =
-    let results = TestDateTimeParameter.Command(DateTime.UtcNow)
+    let results = TestDateTimeParameter.Command(DateTime.UtcNow) |> runOnTestData
     printfn "%A" results
 
 type TestOptionalDateTimeParameter = SQL<"""
@@ -59,7 +59,7 @@ select * from Users where Created > @created or @created is null
 
 [<Test>]
 let ``test optional datetime parameter`` () =
-    let results = TestOptionalDateTimeParameter.Command(Some DateTime.UtcNow)
+    let results = TestOptionalDateTimeParameter.Command(Some DateTime.UtcNow) |> runOnTestData
     printfn "%A" results
 
 type TestGuidParameter = SQL<"""
@@ -70,7 +70,7 @@ drop table temp.bar;
 
 [<Test>]
 let ``test guid parameter`` () =
-    let results = TestGuidParameter.Command(Guid.NewGuid())
+    let results = TestGuidParameter.Command(Guid.NewGuid()) |> runOnTestData
     printfn "%A" results
 
 type TestOptionalGuidParameter = SQL<"""
@@ -79,7 +79,7 @@ select * from Users where RandomId = @id or @id is null
 
 [<Test>]
 let ``test optional guid parameter`` () =
-    let results = TestOptionalGuidParameter.Command(Some (Guid.NewGuid()))
+    let results = TestOptionalGuidParameter.Command(Some (Guid.NewGuid())) |> runOnTestData
     printfn "%A" results
 
 

src/TypeProviderUsers/TypeProviderUser.SQLite/TestSelects.fs

@@ -51,7 +51,7 @@ select * from Users where Created > @created
 
 [<Test>]
 let ``test datetime parameter`` () =
-    let results = TestDateTimeParameter.Command(DateTime.UtcNow)
+    let results = TestDateTimeParameter.Command(DateTime.UtcNow) |> runOnTestData
     printfn "%A" results
 
 type TestOptionalDateTimeParameter = SQL<"""
@@ -60,7 +60,7 @@ select * from Users where Created > @created or @created is null
 
 [<Test>]
 let ``test optional datetime parameter`` () =
-    let results = TestOptionalDateTimeParameter.Command(Some DateTime.UtcNow)
+    let results = TestOptionalDateTimeParameter.Command(Some DateTime.UtcNow) |> runOnTestData
     printfn "%A" results
 
 type TestGuidParameter = SQL<"""
@@ -71,7 +71,7 @@ drop table temp.bar;
 
 [<Test>]
 let ``test guid parameter`` () =
-    let results = TestGuidParameter.Command(Guid.NewGuid())
+    let results = TestGuidParameter.Command(Guid.NewGuid()) |> runOnTestData
     printfn "%A" results
 
 type TestOptionalGuidParameter = SQL<"""
@@ -80,7 +80,7 @@ select * from Users where RandomId = @id or @id is null
 
 [<Test>]
 let ``test optional guid parameter`` () =
-    let results = TestOptionalGuidParameter.Command(Some (Guid.NewGuid()))
+    let results = TestOptionalGuidParameter.Command(Some (Guid.NewGuid())) |> runOnTestData
     printfn "%A" results
 
 [<Test>]
@@ -116,3 +116,17 @@ let ``replay works`` () =
             ()
         else failwith "not equal"
 
+open Rezoom.SQL.Mapping
+open System.Data
+
+type RawSQLQuery = SQL<"""
+    select * from Users where unsafe_inject_raw(@whereClause)
+""">
+
+[<Test>]
+let ``test raw sql parameter`` () =
+    let results =
+        RawSQLQuery.Command(whereClause = [| CommandText "1="; InlineParameter(DbType.Int32, 1) |]) |> runOnTestData
+    for result in results do
+        printfn "%A" result.Email
+