CouchDB 1.2 → 1.2.1
raw patch · 4 files changed
+26/−5 lines, 4 filesdep +network-uridep ~networkdep ~utf8-stringnew-uploaderPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependencies added: network-uri
Dependency ranges changed: network, utf8-string
API changes (from Hackage documentation)
- Database.CouchDB: instance Eq Doc
- Database.CouchDB: instance Eq Rev
- Database.CouchDB: instance JSON DB
- Database.CouchDB: instance JSON Doc
- Database.CouchDB: instance Ord Doc
- Database.CouchDB: instance Ord Rev
- Database.CouchDB: instance Read Doc
- Database.CouchDB: instance Show DB
- Database.CouchDB: instance Show Doc
- Database.CouchDB: instance Show Rev
+ Database.CouchDB: instance GHC.Classes.Eq Database.CouchDB.Doc
+ Database.CouchDB: instance GHC.Classes.Eq Database.CouchDB.Rev
+ Database.CouchDB: instance GHC.Classes.Ord Database.CouchDB.Doc
+ Database.CouchDB: instance GHC.Classes.Ord Database.CouchDB.Rev
+ Database.CouchDB: instance GHC.Read.Read Database.CouchDB.Doc
+ Database.CouchDB: instance GHC.Show.Show Database.CouchDB.DB
+ Database.CouchDB: instance GHC.Show.Show Database.CouchDB.Doc
+ Database.CouchDB: instance GHC.Show.Show Database.CouchDB.Rev
+ Database.CouchDB: instance Text.JSON.JSON Database.CouchDB.DB
+ Database.CouchDB: instance Text.JSON.JSON Database.CouchDB.Doc
- Database.CouchDB: bulkUpdateDocs :: JSON a => DB -> [a] -> CouchMonad (Maybe [Either String (Doc, Rev)])
+ Database.CouchDB: bulkUpdateDocs :: (JSON a) => DB -> [a] -> CouchMonad (Maybe [Either String (Doc, Rev)])
- Database.CouchDB: getAndUpdateDoc :: JSON a => DB -> Doc -> (a -> IO a) -> CouchMonad (Maybe Rev)
+ Database.CouchDB: getAndUpdateDoc :: (JSON a) => DB -> Doc -> (a -> IO a) -> CouchMonad (Maybe Rev)
- Database.CouchDB: getDoc :: JSON a => DB -> Doc -> CouchMonad (Maybe (Doc, Rev, a))
+ Database.CouchDB: getDoc :: (JSON a) => DB -> Doc -> CouchMonad (Maybe (Doc, Rev, a))
- Database.CouchDB: newDoc :: JSON a => DB -> a -> CouchMonad (Doc, Rev)
+ Database.CouchDB: newDoc :: (JSON a) => DB -> a -> CouchMonad (Doc, Rev)
- Database.CouchDB: newNamedDoc :: JSON a => DB -> Doc -> a -> CouchMonad (Either String Rev)
+ Database.CouchDB: newNamedDoc :: (JSON a) => DB -> Doc -> a -> CouchMonad (Either String Rev)
- Database.CouchDB: queryView :: JSON a => DB -> Doc -> Doc -> [(String, JSValue)] -> CouchMonad [(Doc, a)]
+ Database.CouchDB: queryView :: (JSON a) => DB -> Doc -> Doc -> [(String, JSValue)] -> CouchMonad [(Doc, a)]
- Database.CouchDB: updateDoc :: JSON a => DB -> (Doc, Rev) -> a -> CouchMonad (Maybe (Doc, Rev))
+ Database.CouchDB: updateDoc :: (JSON a) => DB -> (Doc, Rev) -> a -> CouchMonad (Maybe (Doc, Rev))
- Database.CouchDB.JSON: jsonInt :: Integral n => JSValue -> Result n
+ Database.CouchDB.JSON: jsonInt :: (Integral n) => JSValue -> Result n
Files
- AUTHORS +1/−1
- CHANGES +5/−0
- CouchDB.cabal +17/−4
- src/Database/CouchDB/HTTP.hs +3/−0
AUTHORS view
@@ -1,4 +1,4 @@ Arjun Guha Brendan Hickey-Stephen Maka+Stephan Maka Simon Michael
+ CHANGES view
@@ -0,0 +1,5 @@+1.2.1 (2015/4/25)++* GHC 7.10 compatibility+* allow utf8-string 0.3.8++* fix compilation with network >= 2.6 (#18)
CouchDB.cabal view
@@ -1,5 +1,5 @@ Name: CouchDB-Version: 1.2+Version: 1.2.1 Cabal-Version: >= 1.8 Copyright: Copyright (c) 2008-2012. License: BSD3@@ -11,16 +11,25 @@ Category: Database Build-Type: Simple Synopsis: CouchDB interface-Extra-Source-Files: README LICENSE AUTHORS+Extra-Source-Files: README LICENSE AUTHORS CHANGES Description:+ An interface to CouchDB servers. +flag network-uri+ description: Get Network.URI from the new network-uri package ? A compatibility flag, cabal will toggle it as needed.+ default: True+ Test-Suite test-couchdb Hs-Source-Dirs: src Type: exitcode-stdio-1.0 Main-Is: Tests.hs Build-Depends:- base >= 4 && < 5, mtl, containers, network, HTTP>=4000.0.4, json>=0.4.3, utf8-string >= 0.3.6 && <= 0.3.7, HUnit, bytestring+ base >= 4 && < 5, mtl, containers, HTTP>=4000.0.4, json>=0.4.3, utf8-string >= 0.3.6 && <= 1.1, HUnit, bytestring+ if flag(network-uri)+ build-depends: network >= 2.6, network-uri >= 2.6+ else+ build-depends: network < 2.6, network-uri < 2.6 Extensions: FlexibleInstances ghc-options:@@ -29,7 +38,11 @@ Library Hs-Source-Dirs: src Build-Depends:- base >= 4 && < 5, mtl, containers, network, HTTP>=4000.0.4, json>=0.4.3, utf8-string >= 0.3.6 && <= 0.3.7, bytestring+ base >= 4 && < 5, mtl, containers, network, network-uri, HTTP>=4000.0.4, json>=0.4.3, utf8-string >= 0.3.6 && <= 1.1, bytestring+ if flag(network-uri)+ build-depends: network >= 2.6, network-uri >= 2.6+ else+ build-depends: network < 2.6, network-uri < 2.6 ghc-options: -fwarn-incomplete-patterns Extensions:
src/Database/CouchDB/HTTP.hs view
@@ -28,6 +28,7 @@ import qualified Data.ByteString as BS (ByteString, length) import qualified Data.ByteString.UTF8 as UTF8 (fromString, toString) import Network.HTTP.Auth+import Control.Applicative import Control.Monad (ap) -- |Describes a connection to a CouchDB database. This type is@@ -46,6 +47,8 @@ -- if it is closed. data CouchMonad a = CouchMonad (CouchConn -> IO (a,CouchConn)) +instance Applicative CouchMonad where+instance Functor CouchMonad where instance Monad CouchMonad where return a = CouchMonad $ \conn -> return (a,conn)