Add RawSQLParameter union case.

Author: rspeele

src/Rezoom.SQL.Mapping/CommandBatch.fs

@@ -43,7 +43,8 @@ type private CommandBatchBuilder(conn : DbConnection, tran : DbTransaction) =
                     j <- j + 1
             | ScalarParameter(parameterType, o) ->
                 addParam (parameterName (parameterOffset + i)) parameterType o
-        for fragment in command.Fragments do
+            | RawSQLParameter _ -> ()
+        let rec addFragment fragment =
             let fragmentString =
                 match fragment with
                 | LocalName name -> localName commandIndex name
@@ -57,6 +58,10 @@ type private CommandBatchBuilder(conn : DbConnection, tran : DbTransaction) =
                             }
                         "(" + String.concat "," parNames + ")"
                     | ScalarParameter _ -> parameterName (parameterOffset + i)
+                    | RawSQLParameter frags ->
+                        for frag in frags do
+                            addFragment frag
+                        ""
                 | InlineParameter (dbType, value) ->
                     let name = dynamicParameterName dbCommand.Parameters.Count
                     addParam name dbType value
@@ -65,6 +70,8 @@ type private CommandBatchBuilder(conn : DbConnection, tran : DbTransaction) =
                 | Whitespace -> " "
                 | LineBreak -> "\n"
             ignore <| builder.Append(fragmentString)
+        for fragment in command.Fragments do
+            addFragment fragment
         match command.ResultSetCount with
         | Some _ -> () // no need to add terminator statement
         | None when commandIndex + 1 >= commands.Count -> ()
@@ -78,12 +85,22 @@ type private CommandBatchBuilder(conn : DbConnection, tran : DbTransaction) =
         dbCommand.CommandText <- builder.ToString()
 
     member __.BatchCommand(cmd : Command) =
-        let mutable count = 0
+        let countInlineParameters fragments =
+            let mutable i = 0
+            for fragment in fragments do
+                match fragment with
+                | InlineParameter _ -> i <- i + 1
+                | _ -> ()
+            i
+
+        let mutable count = countInlineParameters cmd.Fragments
         for par in cmd.Parameters do
             count <- count +
                 match par with
                 | ListParameter (_, os) -> os.Length
                 | ScalarParameter _ -> 1
+                | RawSQLParameter frags -> countInlineParameters frags
+
         if parameterCount + count > maxParameters then
             Nullable()
         else

src/Rezoom.SQL.Mapping/CommandParts.fs

@@ -91,6 +91,7 @@ type CommandCategory = CommandCategory of connectionName : string
 type CommandParameter =
     | ListParameter of DbType * Array
     | ScalarParameter of DbType * obj
+    | RawSQLParameter of CommandFragment list
     member this.Equals(other : CommandParameter) =
         match this, other with
         | ListParameter (ty1, arr1), ListParameter (ty2, arr2) ->
@@ -108,6 +109,8 @@ type CommandParameter =
         | ScalarParameter (ty1, obj1), ScalarParameter (ty2, obj2) ->
             ty1 = ty2 && EqualityComparer<obj>.Default.Equals(obj1, obj2)
 
+        | RawSQLParameter frags1, RawSQLParameter frags2 -> frags1 = frags2
+
         | _ -> false
     override this.Equals(other : obj) =
         match other with
@@ -122,6 +125,9 @@ type CommandParameter =
             h <- ((h <<< 5) + h) ^^^ hash ty
             for o in os do
                 h <- ((h <<< 5) + h) ^^^ hash o
+        | RawSQLParameter frags ->
+            for frag in frags do
+                h <- ((h <<< 5) + h) ^^^ hash frag
         h
     interface IEquatable<CommandParameter> with
         member this.Equals(other) = this.Equals(other)