Prefer IDocumentSession as last arg

TheAngryByrd · Jul 27, 2017 · 50754fc · 50754fc
1 parent baa78c4
commit 50754fc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/src/Marten.FSharp/Marten.FSharp.fs b/src/Marten.FSharp/Marten.FSharp.fs
@@ -155,12 +155,13 @@ module Session =
     let query<'a> (session : IQuerySession) =
         session.Query<'a>()
 
-    let sql<'a> (session : IQuerySession) string parameters =
+    let sql<'a> string parameters (session : IQuerySession)  =
         session.Query<'a>(string, parameters)
-    let sqlTask<'a> (session : IQuerySession) string parameters =
+    let sqlTask<'a> string parameters  (session : IQuerySession)=
         session.QueryAsync<'a>(string, parameters=parameters)
-    let sqlAsync<'a> (session : IQuerySession) string parameters =
-        sqlTask<'a> session string parameters
+    let sqlAsync<'a> string parameters (session : IQuerySession) =
+        session
+        |> sqlTask<'a>  string parameters
         |> Async.AwaitTask
 
 
@@ -173,9 +174,9 @@ module Session =
         |> saveChangesTask
         |> Async.AwaitTask
 
-    let storeSingle (session : IDocumentSession) entity  =
+    let storeSingle entity (session : IDocumentSession) =
         session.Store([|entity|])
-    let storeMany (session : IDocumentSession) (entities : #seq<_>)  =
+    let storeMany (entities : #seq<_>) (session : IDocumentSession) =
         entities
         |> Seq.toArray
         |> session.Store

diff --git a/tests/Marten.FSharp.Tests/Tests.fs b/tests/Marten.FSharp.Tests/Tests.fs
@@ -488,7 +488,7 @@ let CRUDTests = [
                 let sparky = newDog "Sparky" "Shoes"
 
                 use session = store.OpenSession()
-                sparky |> Session.storeSingle session
+                session |> Session.storeSingle  sparky
                 session |> Session.saveChanges
                 let actualDogs =
                     session
@@ -504,7 +504,7 @@ let CRUDTests = [
                 let spot = newDog "Spot" "Macbook"
 
                 use session = store.OpenSession()
-                [sparky ; spot] |> Session.storeMany session
+                session |> Session.storeMany [sparky ; spot]
                 session |> Session.saveChanges
                 let actualDogs =
                     session
@@ -536,7 +536,7 @@ let CRUDTests = [
                 let sparky = newDog "Sparky" "Shoes"
 
                 use session = store.OpenSession()
-                sparky |> Session.storeSingle session
+                session |> Session.storeSingle sparky
                 do! session |> Session.saveChangesAsync
                 let! actualDogs =
                     session
@@ -552,7 +552,7 @@ let CRUDTests = [
                 let spot = newDog "Spot" "Macbook"
 
                 use session = store.OpenSession()
-                [sparky ; spot] |> Session.storeMany session
+                session |> Session.storeMany [sparky ; spot]
                 do! session |> Session.saveChangesAsync
                 let! actualDogs =
                     session
@@ -647,7 +647,7 @@ let LinQQueryTests = [
                 let maffeoPolo = newPerson "Maffeo Polo" 801
                 use session = store.OpenSession ()
 
-                Session.storeMany session [ marcoPolo; niccoloPolo; maffeoPolo ]
+                session |> Session.storeMany [ marcoPolo; niccoloPolo; maffeoPolo ]
                 Session.saveChanges session
 
                 let peopleCount =
@@ -681,7 +681,7 @@ let LinQQueryTests = [
                 let people = [ marcoPolo; niccoloPolo; maffeoPolo; magellan; columbus ]
                 let peopleGeneric = new System.Collections.Generic.List<Person>([ niccoloPolo; maffeoPolo; magellan ])
 
-                Session.storeMany session people
+                session |> Session.storeMany  people
                 Session.saveChanges session
 
                 let paged =
@@ -714,7 +714,7 @@ let LinQQueryTests = [
                     |> List.rev
                     |> fun x -> Collections.Generic.List<Person>(x)
 
-                Session.storeMany session people
+                session |> Session.storeMany people
                 Session.saveChanges session
 
                 let ordered =
@@ -749,12 +749,12 @@ let sqlTests = [
                 let maffeoPolo = newPerson "Maffeo Polo" 801
                 use session = store.OpenSession ()
 
-                Session.storeMany session [ marcoPolo; niccoloPolo; maffeoPolo ]
+                session |> Session.storeMany  [ marcoPolo; niccoloPolo; maffeoPolo ]
                 Session.saveChanges session
 
                 use session2 = store.OpenSession()
                 let personNameParameter =  { name = "Marco Polo"}
-                let person = Session.sql<Person> session2 "select data from mt_doc_tests_person where data->>'Name' = :name" [|personNameParameter|] |> Seq.head
+                let person = session2 |> Session.sql<Person>  "select data from mt_doc_tests_person where data->>'Name' = :name" [|personNameParameter|] |> Seq.head
                 Expect.equal person marcoPolo "Not marco"
     testCaseAsync'
         "sql with string paramter async" <|
@@ -764,12 +764,12 @@ let sqlTests = [
                 let maffeoPolo = newPerson "Maffeo Polo" 801
                 use session = store.OpenSession ()
 
-                Session.storeMany session [ marcoPolo; niccoloPolo; maffeoPolo ]
+                session |> Session.storeMany  [ marcoPolo; niccoloPolo; maffeoPolo ]
                 Session.saveChanges session
 
                 use session2 = store.OpenSession()
                 let personNameParameter =  { name = "Marco Polo"}
-                let! person = Session.sqlAsync<Person> session2 "select data from mt_doc_tests_person where data->>'Name' = :name" [|personNameParameter|] |> Async.map(Seq.head)
+                let! person = session2 |>Session.sqlAsync<Person>  "select data from mt_doc_tests_person where data->>'Name' = :name" [|personNameParameter|] |> Async.map(Seq.head)
                 Expect.equal person marcoPolo "Not marco"
             }
 ]