Skip to content

Commit 8abe032

Browse files
authored
[F#/Oxpecker] Upgraded packages to the latest versions (#10347)
* [F#/Oxpecker] Upgraded packages to the latest versions * [F#/Oxpecker] Added maintainers field * [F#/Oxpecker] Inlined readSingleRow directly in calling functions
1 parent 8012df6 commit 8abe032

File tree

4 files changed

+11
-14
lines changed

4 files changed

+11
-14
lines changed

frameworks/FSharp/oxpecker/benchmark_config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"framework": "oxpecker",
3+
"maintainers": ["Lanayx"],
34
"tests": [
45
{
56
"default": {

frameworks/FSharp/oxpecker/src/App/App.fsproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
<ItemGroup>
1616
<PackageReference Update="FSharp.Core" Version="10.0.100" />
17-
<PackageReference Include="Oxpecker" Version="1.5.0" />
18-
<PackageReference Include="Oxpecker.ViewEngine" Version="1.1.0" />
19-
<PackageReference Include="Npgsql" Version="9.0.4" />
17+
<PackageReference Include="Oxpecker" Version="2.0.0" />
18+
<PackageReference Include="Oxpecker.ViewEngine" Version="2.0.0" />
19+
<PackageReference Include="Npgsql" Version="10.0.0" />
2020
<PackageReference Include="SpanJson" Version="4.2.1" />
2121
</ItemGroup>
2222
</Project>

frameworks/FSharp/oxpecker/src/App/Db.fs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,15 @@ module Db =
3232
cmd.Parameters.Add(id) |> ignore
3333
struct(cmd, id)
3434

35-
let private readSingleRow (cmd: NpgsqlCommand) =
36-
task {
37-
use! rdr = cmd.ExecuteReaderAsync(CommandBehavior.SingleRow)
38-
let! _ = rdr.ReadAsync()
39-
return { id = rdr.GetInt32(0); randomnumber = rdr.GetInt32(1) }
40-
}
41-
4235
let loadSingleRow () =
4336
task {
4437
use db = new NpgsqlConnection(ConnectionString)
4538
let struct(cmd', _) = createReadCommand db
4639
use cmd = cmd'
4740
do! db.OpenAsync()
48-
return! readSingleRow cmd
41+
use! rdr = cmd.ExecuteReaderAsync(CommandBehavior.SingleRow)
42+
let! _ = rdr.ReadAsync()
43+
return { id = rdr.GetInt32(0); randomnumber = rdr.GetInt32(1) }
4944
}
5045

5146
let private readMultipleRows (count: int) (conn: NpgsqlConnection) =
@@ -54,8 +49,9 @@ module Db =
5449
let struct(cmd', idParam) = createReadCommand conn
5550
use cmd = cmd'
5651
for i in 0..result.Length-1 do
57-
let! row = readSingleRow cmd
58-
result[i] <- row
52+
use! rdr = cmd.ExecuteReaderAsync(CommandBehavior.SingleRow)
53+
let! _ = rdr.ReadAsync()
54+
result[i] <- { id = rdr.GetInt32(0); randomnumber = rdr.GetInt32(1) }
5955
idParam.TypedValue <- Random.Shared.Next(1, 10001)
6056
return result
6157
}

frameworks/FSharp/oxpecker/src/App/RenderHelpers.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
sb.Append(ht.Head) |> ignore
1818
for fortune in fortunesData do
1919
(tr() {
20-
td() { raw <| string fortune.id }
20+
td() { fortune.id }
2121
td() { fortune.message }
2222
}).Render(sb)
2323
sb.Append(ht.Tail) |> ignore

0 commit comments

Comments
 (0)