mysql-haskell-openssl 0.7.0.0 → 0.8.0.0
raw patch · 3 files changed
+10/−5 lines, 3 filesdep ~mysql-haskellPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: mysql-haskell
API changes (from Hackage documentation)
Files
- ChangeLog.md +5/−0
- Database/MySQL/OpenSSL.hs +3/−3
- mysql-haskell-openssl.cabal +2/−2
ChangeLog.md view
@@ -1,5 +1,10 @@ # Revision history for mysql-haskell-openssl +## 0.8.0.0 -- 2016-11-09++* Add `ciCharset` field to support `utf8mb4` charset.+* Add `BitMap` field to `COM_STMT_EXECUTE`, and [#8](https://github.com/winterland1989/mysql-haskell/pull/8) by [alexbiehl](https://github.com/alexbiehl).+ ## 0.7.0.0 -- 2016-11-09 * Split from mysql-haskell.
Database/MySQL/OpenSSL.hs view
@@ -41,7 +41,7 @@ connect c cp = fmap snd (connectDetail c cp) connectDetail :: ConnectInfo -> (Session.SSLContext, String) -> IO (Greeting, MySQLConn)-connectDetail (ConnectInfo host port db user pass) (ctx, subname) =+connectDetail (ConnectInfo host port db user pass charset) (ctx, subname) = bracketOnError (TCP.connectWithBufferSize host port bUFSIZE) (\(_, _, sock) -> N.close sock) $ \ (is, os, sock) -> do is' <- decodeInputStream is@@ -50,7 +50,7 @@ greet <- decodeFromPacket p if supportTLS (greetingCaps greet) then SSL.withOpenSSL $ do- Stream.write (Just (encodeToPacket 1 sslRequest)) os'+ Stream.write (Just (encodeToPacket 1 $ sslRequest charset)) os' bracketOnError (Session.connection ctx sock) SSL.close $ \ ssl -> do Session.connect ssl trusted <- Session.getVerifyResult ssl@@ -62,7 +62,7 @@ (sslIs, sslOs) <- SSL.sslToStreams ssl sslIs' <- decodeInputStream sslIs sslOs' <- Binary.encodeOutputStream sslOs- let auth = mkAuth db user pass greet+ let auth = mkAuth db user pass charset greet Stream.write (Just (encodeToPacket 2 auth)) sslOs' q <- readPacket sslIs' if isOK q
mysql-haskell-openssl.cabal view
@@ -1,5 +1,5 @@ name: mysql-haskell-openssl-version: 0.7.0.0+version: 0.8.0.0 synopsis: TLS support for mysql-haskell package using openssl description: TLS support for mysql-haskell package using openssl license: BSD3@@ -26,7 +26,7 @@ , tcp-streams >= 0.6 && < 0.7 , tcp-streams-openssl >= 0.6 && < 0.7 , wire-streams >= 0.1- , mysql-haskell >= 0.7+ , mysql-haskell >= 0.8 , HsOpenSSL >=0.10.3 && <0.12 default-language: Haskell2010