rethinkdb 2.2.0.5 → 2.2.0.6

raw patch · 4 files changed

+12/−6 lines, 4 filesdep ~data-default

Dependency ranges changed: data-default

Files

Database/RethinkDB/Functions.hs +2/−2
Database/RethinkDB/Network.hs +1/−1
bench/Bench.hs +1/−1
rethinkdb.cabal +8/−2

Database/RethinkDB/Functions.hs view

@@ -554,7 +554,7 @@ -- | Abort the query with an error -- -- >>> run' h $ R.error (str "haha") R./ 2 + 1--- *** Exception: RethinkDB: Runtime error: "haha"+-- *** Exception: RethinkDB: Runtime error: haha --   in add(div({- HERE -} error("haha"), 2), 1) error :: (Expr s) => s -> ReQL error m = op ERROR [m]@@ -1042,7 +1042,7 @@ -- | Optional argument for non-atomic writes -- -- >>> run' h $ table "users" # get "sabrina" # update (merge ["lucky_number" := random])--- *** Exception: RethinkDB: Runtime error: "Could not prove argument deterministic.  Maybe you want to use the non_atomic flag?"+-- *** Exception: RethinkDB: Runtime error: Could not prove argument deterministic.  Maybe you want to use the non_atomic flag? --   in --     {- HERE -} --     update(

Database/RethinkDB/Network.hs view

@@ -193,7 +193,7 @@  instance Show RethinkDBError where   show (RethinkDBError code term message backtrace) =-    show code ++ ": " ++ show message +++    show code ++ ": " ++ message ++     if term == Datum Null        then ""        else "\n" ++ indent ("in " ++ show (annotate backtrace term))

bench/Bench.hs view

@@ -3,7 +3,7 @@ module Main where  import Control.Exception-import Database.RethinkDB.NoClash+import Database.RethinkDB.NoClash hiding (wait) import qualified Database.RethinkDB as R import Criterion.Main import Control.Monad

rethinkdb.cabal view

@@ -1,5 +1,5 @@ name: rethinkdb-version: 2.2.0.5+version: 2.2.0.6 cabal-version: >=1.8 build-type: Simple license: Apache@@ -12,6 +12,12 @@ category: Database author: Etienne Laurin, Brandon Martin +tested-with:+  GHC==7.6.3,+  GHC==7.8.4,+  GHC==7.10.3,+  GHC==8.0.1+ source-repository head     type: git     location: https://github.com/atnnn/haskell-rethinkdb@@ -28,7 +34,7 @@         aeson >=0.7 && <0.12,         bytestring ==0.10.*,         containers ==0.5.*,-        data-default >=0.5 && <0.7,+        data-default >=0.5 && <0.8,         network >=2.4 && <2.7,         mtl >=2.1 && <2.3,         vector >=0.10 && <0.12,