Merge pull request paul-rouse#30 from k-bx/master

Add a Semigroup instance

.travis.yml

@@ -24,6 +24,8 @@ matrix:
     compiler: ": # lts-6"
   - env: ARGS="--resolver lts-7"
     compiler: ": # lts-7"
+  - env: ARGS="--resolver lts-10"
+    compiler: ": # lts-10"
   - env: ARGS="--resolver nightly"
     compiler: ": # nightly"
   - env: ARGS="--resolver lts"

Database/MySQL/Base/Types.hsc

@@ -54,6 +54,7 @@ import Data.ByteString.Internal (create, memcpy)
 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 @@ instance Show FieldFlags where
 
 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

mysql.cabal

@@ -51,6 +51,9 @@ library
     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)