mysql-simple 0.1.0.0 → 0.1.0.1

raw patch · 2 files changed

+37/−16 lines, 2 filesPVP: minor bump suggested

API additions: PVP suggests at least a minor version bump

API changes (from Hackage documentation)

Files

• Database/MySQL/Simple.hs +36/−15
• mysql-simple.cabal +1/−1

@@ -1,6 +1,10 @@+{-# LANGUAGE DeriveDataTypeable #-}+ module Database.MySQL.Simple     (-      execute+      FormatError(fmtMessage, fmtQuery, fmtParams)+    , Only(..)+    , execute     , query     , query_     , formatQuery@@ -9,31 +13,42 @@ import Blaze.ByteString.Builder (fromByteString, toByteString) import Control.Applicative ((<$>), pure) import Control.DeepSeq (NFData(..))+import Control.Exception (Exception, throw) import Control.Monad.Fix (fix) import Data.ByteString (ByteString) import Data.Int (Int64)-import Data.Monoid (mappend, mempty)+import Data.Monoid (mappend)+import Data.Typeable (Typeable) import Database.MySQL.Base (Connection) import Database.MySQL.Simple.Param (Action(..), inQuotes) import Database.MySQL.Simple.QueryParams (QueryParams(..)) import Database.MySQL.Simple.QueryResults (QueryResults(..))-import Database.MySQL.Simple.Types (Query(..))+import Database.MySQL.Simple.Types (Only(..), Query(..)) import qualified Data.ByteString.Char8 as B import qualified Database.MySQL.Base as Base +data FormatError = FormatError {+      fmtMessage :: String+    , fmtQuery :: Query+    , fmtParams :: [ByteString]+    } deriving (Eq, Show, Typeable)++instance Exception FormatError+ formatQuery :: QueryParams q => Connection -> Query -> q -> IO ByteString-formatQuery conn (Query template) qs-    | '?' `B.notElem` template = return template-    | otherwise =-        toByteString . zipParams (split template) <$> mapM sub (renderParams qs)-  where sub (Plain b)  = pure b+formatQuery conn q@(Query template) qs+    | null xs && '?' `B.notElem` template = return template+    | otherwise = toByteString . zipParams (split template) <$> mapM sub xs+  where xs = renderParams qs+        sub (Plain b)  = pure b         sub (Escape s) = (inQuotes . fromByteString) <$> Base.escape conn s-        split q = fromByteString h : if B.null t then [] else split (B.tail t)-            where (h,t) = B.break (=='?') q+        split s = fromByteString h : if B.null t then [] else split (B.tail t)+            where (h,t) = B.break (=='?') s         zipParams (t:ts) (p:ps) = t `mappend` p `mappend` zipParams ts ps-        zipParams [] []         = mempty-        zipParams [] _ = fmtError "more parameters than '?' characters"-        zipParams _ [] = fmtError "more '?' characters than parameters"+        zipParams [t] []        = t+        zipParams _ _ = fmtError (show (B.count '?' template) +++                                  " '?' characters, but " +++                                  show (length xs) ++ " parameters") q xs  execute :: (QueryParams q) => Connection -> Query -> q -> IO Int64 execute conn template qs = do@@ -68,5 +83,11 @@           _  -> let c = convertResults fs row                 in rnf c `seq` loop (c:acc) -fmtError :: String -> a-fmtError msg = error $ "Database.MySQL.formatQuery: " ++ msg+fmtError :: String -> Query -> [Action] -> a+fmtError msg q xs = throw FormatError {+                      fmtMessage = msg+                    , fmtQuery = q+                    , fmtParams = map twiddle xs+                    }+  where twiddle (Plain b)  = toByteString b+        twiddle (Escape s) = s

@@ -1,5 +1,5 @@ name:           mysql-simple-version:        0.1.0.0+version:        0.1.0.1 homepage:       https://github.com/mailrank/mysql-simple bug-reports:    https://github.com/mailrank/mysql-simple/issues synopsis:       A mid-level MySQL client library.