mysql 0.1.4 → 0.1.5

raw patch · 4 files changed

+22/−2 lines, 4 filesdep +semigroupssetup-changedPVP ok

version bump matches the API change (PVP)

Dependencies added: semigroups

API changes (from Hackage documentation)

+ Database.MySQL.Base.Types: instance Data.Semigroup.Semigroup Database.MySQL.Base.Types.FieldFlags

Files

ChangeLog.md +6/−0
Database/MySQL/Base/Types.hsc +7/−1
Setup.hs +5/−0
mysql.cabal +4/−1

ChangeLog.md view

@@ -1,3 +1,9 @@+## 0.1.5++* Add Semigroup instance for FieldFlags+* Fix some warnings+* Drop testing under GHC 7.8 / lts-2+ ## 0.1.4  * Expose mysql_thread_end() as `endThread`

Database/MySQL/Base/Types.hsc view

@@ -54,6 +54,7 @@ import Data.List (intercalate) import Data.Maybe (catMaybes) import Data.Monoid (Monoid(..))+import Data.Semigroup (Semigroup(..)) import Data.Typeable (Typeable) import Data.Word (Word, Word8) import Foreign.C.Types (CChar, CInt, CUInt, CULong)@@ -171,10 +172,14 @@  type FieldFlag = FieldFlags +instance Semigroup FieldFlags where+    (<>) (FieldFlags a) (FieldFlags b) = FieldFlags (a .|. b)+    {-# INLINE (<>) #-}+ instance Monoid FieldFlags where     mempty = FieldFlags 0     {-# INLINE mempty #-}-    mappend (FieldFlags a) (FieldFlags b) = FieldFlags (a .|. b)+    mappend = (<>)     {-# INLINE mappend #-}  flagNotNull, flagPrimaryKey, flagUniqueKey, flagMultipleKey :: FieldFlag@@ -229,6 +234,7 @@     sizeOf _    = #{size MYSQL_FIELD}     alignment _ = alignment (undefined :: Ptr CChar)     peek = peekField+    poke _ _ = return ()   -- Unused, but define it to avoid a warning  type Seconds = Word

Setup.hs view

@@ -57,8 +57,13 @@  mysqlBuildInfo :: LocalBuildInfo -> IO BuildInfo mysqlBuildInfo lbi = do+#if MIN_VERSION_Cabal(2,0,0)+  let mysqlConfig = fmap words . getDbProgramOutput normal+                    mysqlConfigProgram (withPrograms lbi)+#else   let mysqlConfig = fmap words . rawSystemProgramStdoutConf normal                     mysqlConfigProgram (withPrograms lbi)+#endif    include <- mysqlConfig ["--include"]   libs <- mysqlConfig ["--libs"]

mysql.cabal view

@@ -1,5 +1,5 @@ name:           mysql-version:        0.1.4+version:        0.1.5 homepage:       https://github.com/paul-rouse/mysql bug-reports:    https://github.com/paul-rouse/mysql/issues synopsis:       A low-level MySQL client library.@@ -51,6 +51,9 @@     base       < 5,     bytestring >= 0.9 && < 1.0,     containers+  if !impl(ghc >= 8.0)+    build-depends:+      semigroups >= 0.11 && < 0.19    ghc-options: -Wall   if impl(ghc >= 6.8)