diff --git a/frameworks/FSharp/oxpecker/benchmark_config.json b/frameworks/FSharp/oxpecker/benchmark_config.json index 562c9514420..4c8cd1bb59e 100644 --- a/frameworks/FSharp/oxpecker/benchmark_config.json +++ b/frameworks/FSharp/oxpecker/benchmark_config.json @@ -1,5 +1,6 @@ { "framework": "oxpecker", + "maintainers": ["Lanayx"], "tests": [ { "default": { diff --git a/frameworks/FSharp/oxpecker/src/App/App.fsproj b/frameworks/FSharp/oxpecker/src/App/App.fsproj index c19d5d614ac..a3e2378df54 100644 --- a/frameworks/FSharp/oxpecker/src/App/App.fsproj +++ b/frameworks/FSharp/oxpecker/src/App/App.fsproj @@ -14,9 +14,9 @@ - - - + + + \ No newline at end of file diff --git a/frameworks/FSharp/oxpecker/src/App/Db.fs b/frameworks/FSharp/oxpecker/src/App/Db.fs index e4466dc08c8..7c0a4635fa0 100644 --- a/frameworks/FSharp/oxpecker/src/App/Db.fs +++ b/frameworks/FSharp/oxpecker/src/App/Db.fs @@ -32,20 +32,15 @@ module Db = cmd.Parameters.Add(id) |> ignore struct(cmd, id) - let private readSingleRow (cmd: NpgsqlCommand) = - task { - use! rdr = cmd.ExecuteReaderAsync(CommandBehavior.SingleRow) - let! _ = rdr.ReadAsync() - return { id = rdr.GetInt32(0); randomnumber = rdr.GetInt32(1) } - } - let loadSingleRow () = task { use db = new NpgsqlConnection(ConnectionString) let struct(cmd', _) = createReadCommand db use cmd = cmd' do! db.OpenAsync() - return! readSingleRow cmd + use! rdr = cmd.ExecuteReaderAsync(CommandBehavior.SingleRow) + let! _ = rdr.ReadAsync() + return { id = rdr.GetInt32(0); randomnumber = rdr.GetInt32(1) } } let private readMultipleRows (count: int) (conn: NpgsqlConnection) = @@ -54,8 +49,9 @@ module Db = let struct(cmd', idParam) = createReadCommand conn use cmd = cmd' for i in 0..result.Length-1 do - let! row = readSingleRow cmd - result[i] <- row + use! rdr = cmd.ExecuteReaderAsync(CommandBehavior.SingleRow) + let! _ = rdr.ReadAsync() + result[i] <- { id = rdr.GetInt32(0); randomnumber = rdr.GetInt32(1) } idParam.TypedValue <- Random.Shared.Next(1, 10001) return result } diff --git a/frameworks/FSharp/oxpecker/src/App/RenderHelpers.fs b/frameworks/FSharp/oxpecker/src/App/RenderHelpers.fs index 7a94b2552ba..c26eb0ed93b 100644 --- a/frameworks/FSharp/oxpecker/src/App/RenderHelpers.fs +++ b/frameworks/FSharp/oxpecker/src/App/RenderHelpers.fs @@ -17,7 +17,7 @@ sb.Append(ht.Head) |> ignore for fortune in fortunesData do (tr() { - td() { raw <| string fortune.id } + td() { fortune.id } td() { fortune.message } }).Render(sb) sb.Append(ht.Tail) |> ignore