Browse Source

[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
Vladimir Shchur 2 weeks ago
parent
commit
8abe032aae

+ 1 - 0
frameworks/FSharp/oxpecker/benchmark_config.json

@@ -1,5 +1,6 @@
 {
 {
   "framework": "oxpecker",
   "framework": "oxpecker",
+  "maintainers": ["Lanayx"],
   "tests": [
   "tests": [
     {
     {
       "default": {
       "default": {

+ 3 - 3
frameworks/FSharp/oxpecker/src/App/App.fsproj

@@ -14,9 +14,9 @@
 
 
   <ItemGroup>
   <ItemGroup>
     <PackageReference Update="FSharp.Core" Version="10.0.100" />
     <PackageReference Update="FSharp.Core" Version="10.0.100" />
-    <PackageReference Include="Oxpecker" Version="1.5.0" />
-    <PackageReference Include="Oxpecker.ViewEngine" Version="1.1.0" />
-    <PackageReference Include="Npgsql" Version="9.0.4" />
+    <PackageReference Include="Oxpecker" Version="2.0.0" />
+    <PackageReference Include="Oxpecker.ViewEngine" Version="2.0.0" />
+    <PackageReference Include="Npgsql" Version="10.0.0" />
     <PackageReference Include="SpanJson" Version="4.2.1" />
     <PackageReference Include="SpanJson" Version="4.2.1" />
   </ItemGroup>
   </ItemGroup>
 </Project>
 </Project>

+ 6 - 10
frameworks/FSharp/oxpecker/src/App/Db.fs

@@ -32,20 +32,15 @@ module Db =
         cmd.Parameters.Add(id) |> ignore
         cmd.Parameters.Add(id) |> ignore
         struct(cmd, id)
         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 () =
     let loadSingleRow () =
         task {
         task {
             use db = new NpgsqlConnection(ConnectionString)
             use db = new NpgsqlConnection(ConnectionString)
             let struct(cmd', _) = createReadCommand db
             let struct(cmd', _) = createReadCommand db
             use cmd = cmd'
             use cmd = cmd'
             do! db.OpenAsync()
             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) =
     let private readMultipleRows (count: int) (conn: NpgsqlConnection) =
@@ -54,8 +49,9 @@ module Db =
             let struct(cmd', idParam) = createReadCommand conn
             let struct(cmd', idParam) = createReadCommand conn
             use cmd = cmd'
             use cmd = cmd'
             for i in 0..result.Length-1 do
             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)
                 idParam.TypedValue <- Random.Shared.Next(1, 10001)
             return result
             return result
         }
         }

+ 1 - 1
frameworks/FSharp/oxpecker/src/App/RenderHelpers.fs

@@ -17,7 +17,7 @@
                 sb.Append(ht.Head) |> ignore
                 sb.Append(ht.Head) |> ignore
                 for fortune in fortunesData do
                 for fortune in fortunesData do
                     (tr() {
                     (tr() {
-                        td() { raw <| string fortune.id }
+                        td() { fortune.id }
                         td() { fortune.message }
                         td() { fortune.message }
                     }).Render(sb)
                     }).Render(sb)
                 sb.Append(ht.Tail) |> ignore
                 sb.Append(ht.Tail) |> ignore