persistent-mysql 2.1 → 2.1.1

raw patch · 2 files changed

+7/−1 lines, 2 files

Files

• Database/Persist/MySQL.hs +6/−0
• persistent-mysql.cabal +1/−1

@@ -807,12 +807,16 @@         database <- o .: "database"         host     <- o .: "host"         port     <- o .: "port"+        path     <- o .:? "path"         user     <- o .: "user"         password <- o .: "password"         pool     <- o .: "poolsize"         let ci = MySQL.defaultConnectInfo                    { MySQL.connectHost     = host                    , MySQL.connectPort     = port+                   , MySQL.connectPath     = case path of+                         Just p  -> p+                         Nothing -> MySQL.connectPath MySQL.defaultConnectInfo                    , MySQL.connectUser     = user                    , MySQL.connectPassword = password                    , MySQL.connectDatabase = database@@ -829,12 +833,14 @@                 MySQL.ConnectInfo                   { MySQL.connectHost     = host                   , MySQL.connectPort     = port+                  , MySQL.connectPath     = path                   , MySQL.connectUser     = user                   , MySQL.connectPassword = password                   , MySQL.connectDatabase = database                   } -> (myConnInfo conf)                          { MySQL.connectHost     = maybeEnv host "HOST"                          , MySQL.connectPort     = read $ maybeEnv (show port) "PORT"+                         , MySQL.connectPath     = maybeEnv path "PATH"                          , MySQL.connectUser     = maybeEnv user "USER"                          , MySQL.connectPassword = maybeEnv password "PASSWORD"                          , MySQL.connectDatabase = maybeEnv database "DATABASE"

@@ -1,5 +1,5 @@ name:            persistent-mysql-version:         2.1+version:         2.1.1 license:         MIT license-file:    LICENSE author:          Felipe Lessa <felipe.lessa@gmail.com>, Michael Snoyman