feat(tc): simplify tc api

veepee-oss · Jan 23, 2021 · 177cd33 · 177cd33
1 parent 625318b
commit 177cd33
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Vp.FSharp.Sql/Transaction.fs b/Vp.FSharp.Sql/Transaction.fs
@@ -1,9 +1,9 @@
 [<RequireQualifiedAccess>]
 module Vp.FSharp.Sql.Transaction
 
+open System.Data
 open System.Threading
 open System.Data.Common
-open System.Transactions
 open System.Threading.Tasks
 
 open Vp.FSharp.Sql.Helpers
@@ -14,7 +14,7 @@ let DefaultIsolationLevel = IsolationLevel.ReadCommitted
 
 let commit cancellationToken isolationLevel
     (connection: #DbConnection)
-    (beginTransaction: #DbConnection -> 'IsolationLevel -> CancellationToken -> ValueTask<#DbTransaction>)
+    (beginTransaction: #DbConnection -> IsolationLevel -> CancellationToken -> ValueTask<#DbTransaction>)
     (body: #DbConnection -> #DbTransaction -> Async<'Output>)=
     async {
         let wasClosed = DbConnection.isClosed connection
@@ -31,7 +31,7 @@ let commit cancellationToken isolationLevel
 
 let notCommit cancellationToken isolationLevel
     (connection: #DbConnection)
-    (beginTransaction: #DbConnection -> 'IsolationLevel -> CancellationToken -> ValueTask<#DbTransaction>)
+    (beginTransaction: #DbConnection -> IsolationLevel -> CancellationToken -> ValueTask<#DbTransaction>)
     (body: #DbConnection -> #DbTransaction -> Async<'Output>) =
     async {
         let wasClosed = DbConnection.isClosed connection
@@ -47,7 +47,7 @@ let notCommit cancellationToken isolationLevel
 
 let commitOnSome cancellationToken isolationLevel
     (connection: #DbConnection)
-    (beginTransaction: #DbConnection -> 'IsolationLevel -> CancellationToken -> ValueTask<#DbTransaction>)
+    (beginTransaction: #DbConnection -> IsolationLevel -> CancellationToken -> ValueTask<#DbTransaction>)
     (body: #DbConnection -> #DbTransaction -> Async<'Output option>) =
     async {
         let wasClosed = DbConnection.isClosed connection
@@ -67,7 +67,7 @@ let commitOnSome cancellationToken isolationLevel
 
 let commitOnOk cancellationToken isolationLevel
     (connection: #DbConnection)
-    (beginTransaction: #DbConnection -> 'IsolationLevel -> CancellationToken -> ValueTask<#DbTransaction>)
+    (beginTransaction: #DbConnection -> IsolationLevel -> CancellationToken -> ValueTask<#DbTransaction>)
     (body: #DbConnection -> #DbTransaction -> Async<Result<'Ok, 'Error>>) =
     async {
         let wasClosed = DbConnection.isClosed connection

diff --git a/Vp.FSharp.Sql/TransactionScope.fs b/Vp.FSharp.Sql/TransactionScope.fs
@@ -2,8 +2,8 @@
 module Vp.FSharp.Sql.TransactionScope
 
 open System
-open System.Data.Common
 open System.Threading
+open System.Data.Common
 open System.Transactions
 
 open Vp.FSharp.Sql.Helpers

diff --git a/Vp.FSharp.Sql/Types.fs b/Vp.FSharp.Sql/Types.fs
@@ -2,8 +2,8 @@
 
 open System
 open System.Data
-open System.Data.Common
 open System.Threading
+open System.Data.Common
 open System.Threading.Tasks
 
 open Vp.FSharp.Sql.Helpers
@@ -117,7 +117,7 @@ type SqlDependencies<'DbConnection, 'DbCommand, 'DbParameter, 'DbDataReader,
     and 'DbTransaction :> DbTransaction> =
         { CreateCommand: 'DbConnection -> 'DbCommand
           SetCommandTransaction: 'DbCommand -> 'DbTransaction -> unit
-          BeginTransactionAsync: 'DbConnection -> 'DbTransactionIsolationLevel -> CancellationToken -> ValueTask<'DbTransaction>
+          BeginTransactionAsync: 'DbConnection -> IsolationLevel -> CancellationToken -> ValueTask<'DbTransaction>
           ExecuteReaderAsync: 'DbCommand -> CancellationToken -> Task<'DbDataReader>
           DbValueToParameter: string -> 'DbType -> 'DbParameter }