Merge pull request haskellari#36 from haskellari/atleast-ghc-8.6

Drop support for GHCs prior GHC-8.6

Author: phadej

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.15.20220826
+# version: 0.15.20221225
 #
-# REGENDATA ("0.15.20220826",["github","postgresql-libpq.cabal"])
+# REGENDATA ("0.15.20221225",["github","postgresql-libpq.cabal"])
 #
 name: Haskell-CI
 on:
@@ -30,7 +30,7 @@ jobs:
       image: buildpack-deps:bionic
     services:
       postgres:
-        image: postgres:10
+        image: postgres:14
         env:
           POSTGRES_PASSWORD: postgres
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
@@ -68,51 +68,6 @@ jobs:
             compilerVersion: 8.6.5
             setup-method: hvr-ppa
             allow-failure: false
-          - compiler: ghc-8.4.4
-            compilerKind: ghc
-            compilerVersion: 8.4.4
-            setup-method: hvr-ppa
-            allow-failure: false
-          - compiler: ghc-8.2.2
-            compilerKind: ghc
-            compilerVersion: 8.2.2
-            setup-method: hvr-ppa
-            allow-failure: false
-          - compiler: ghc-8.0.2
-            compilerKind: ghc
-            compilerVersion: 8.0.2
-            setup-method: hvr-ppa
-            allow-failure: false
-          - compiler: ghc-7.10.3
-            compilerKind: ghc
-            compilerVersion: 7.10.3
-            setup-method: hvr-ppa
-            allow-failure: false
-          - compiler: ghc-7.8.4
-            compilerKind: ghc
-            compilerVersion: 7.8.4
-            setup-method: hvr-ppa
-            allow-failure: false
-          - compiler: ghc-7.6.3
-            compilerKind: ghc
-            compilerVersion: 7.6.3
-            setup-method: hvr-ppa
-            allow-failure: false
-          - compiler: ghc-7.4.2
-            compilerKind: ghc
-            compilerVersion: 7.4.2
-            setup-method: hvr-ppa
-            allow-failure: false
-          - compiler: ghc-7.2.2
-            compilerKind: ghc
-            compilerVersion: 7.2.2
-            setup-method: hvr-ppa
-            allow-failure: false
-          - compiler: ghc-7.0.4
-            compilerKind: ghc
-            compilerVersion: 7.0.4
-            setup-method: hvr-ppa
-            allow-failure: false
       fail-fast: false
     steps:
       - name: apt
@@ -239,8 +194,8 @@ jobs:
           touch cabal.project
           touch cabal.project.local
           echo "packages: ${PKGDIR_postgresql_libpq}" >> cabal.project
-          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package postgresql-libpq" >> cabal.project ; fi
-          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
+          echo "package postgresql-libpq" >> cabal.project
+          echo "    ghc-options: -Werror=missing-methods" >> cabal.project
           cat >> cabal.project <<EOF
           EOF
           $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(postgresql-libpq)$/; }' >> cabal.project.local

.github/workflows/simple.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, windows-latest]
-        ghc: ['8.10','9.0','9.2','9.4.2']
+        ghc: ['8.10','9.0','9.2','9.4.4']
       fail-fast: false
     timeout-minutes:
       60

CHANGELOG.md

@@ -1,3 +1,8 @@
+0.9.5.0
+-------
+
+- Drop support for GHCs prior 8.6
+
 0.9.4.3
 -------
 

Setup.hs

@@ -1,8 +1,4 @@
-{-# LANGUAGE CPP #-}
-
-#ifndef MIN_VERSION_Cabal
-#define MIN_VERSION_Cabal(x,y,z) 0
-#endif
+module Main (main) where
 
 import Distribution.Simple
 import Distribution.Simple.Setup
@@ -16,30 +12,15 @@ import Distribution.Verbosity
 import Data.Char (isSpace)
 import Data.List (dropWhile,reverse)
 
-#if MIN_VERSION_Cabal(2,0,0)
 import Distribution.Types.UnqualComponentName
-#endif
 
 flag :: String -> FlagName
-#if MIN_VERSION_Cabal(2,0,0)
 flag = mkFlagName
-#else
-flag = FlagName
-#endif
 
-#if MIN_VERSION_Cabal(2,0,0)
 unqualComponentName :: String -> UnqualComponentName
 unqualComponentName = mkUnqualComponentName
-#else
-unqualComponentName :: String -> String
-unqualComponentName = id
-#endif
-
-#if !MIN_VERSION_Cabal(2,2,0)
-unFlagAssignment :: [(FlagName, Bool)] -> [(FlagName, Bool)]
-unFlagAssignment = id
-#endif
 
+main :: IO ()
 main = defaultMainWithHooks simpleUserHooks {
   confHook = \pkg flags -> do
     if lookup (flag "use-pkg-config")

postgresql-libpq.cabal

@@ -1,6 +1,6 @@
+cabal-version:      2.4
 name:               postgresql-libpq
-version:            0.9.4.3
-x-revision:         3
+version:            0.9.5.0
 synopsis:           low-level binding to libpq
 description:
   This is a binding to libpq: the C application
@@ -12,7 +12,7 @@ description:
 
 homepage:           https://github.com/haskellari/postgresql-libpq
 bug-reports:        https://github.com/haskellari/postgresql-libpq/issues
-license:            BSD3
+license:            BSD-3-Clause
 license-file:       LICENSE
 author:             Grant Monroe, Leon P Smith, Joey Adams
 maintainer:         Oleg Grenrus <[email protected]>
@@ -23,30 +23,15 @@ copyright:
 category:           Database
 build-type:         Custom
 extra-source-files: cbits/noticehandlers.h
-cabal-version:      >=1.10
 tested-with:
-  GHC ==7.0.4
-   || ==7.2.2
-   || ==7.4.2
-   || ==7.6.3
-   || ==7.8.4
-   || ==7.10.3
-   || ==8.0.2
-   || ==8.2.2
-   || ==8.4.4
-   || ==8.6.5
-   || ==8.8.4
-   || ==8.10.7
-   || ==9.0.2
-   || ==9.2.4
-   || ==9.4.2
+  GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.2
 
 extra-source-files: CHANGELOG.md
 
 custom-setup
   setup-depends:
-      base   >=4.3  && <5
-    , Cabal  >=1.10 && <3.9
+    , base   >=4.12.0.0 && <5
+    , Cabal  >=2.4      && <3.9
 
 -- If true,  use pkg-config,  otherwise use the pg_config based build
 -- configuration
@@ -55,10 +40,10 @@ flag use-pkg-config
   manual:  True
 
 library
-  default-language: Haskell2010
-  hs-source-dirs:   src
-  c-sources:        cbits/noticehandlers.c
-  include-dirs:     cbits
+  default-language:   Haskell2010
+  hs-source-dirs:     src
+  c-sources:          cbits/noticehandlers.c
+  include-dirs:       cbits
   exposed-modules:
     Database.PostgreSQL.LibPQ
     Database.PostgreSQL.LibPQ.Internal
@@ -71,19 +56,19 @@ library
     Database.PostgreSQL.LibPQ.Oid
 
   build-depends:
-      base        >=4.3     && <4.18
-    , bytestring  >=0.9.1.0 && <0.12
+    , base        >=4.12.0.0 && <4.18
+    , bytestring  >=0.10.8.2 && <0.12
 
   if !os(windows)
-    build-depends: unix >=2.4.2.0 && <2.8
+    build-depends: unix >=2.7.2.2 && <2.8
 
   if os(windows)
     build-depends: Win32 >=2.2.0.2 && <2.14
 
-  ghc-options:      -Wall
+  ghc-options:        -Wall
 
   if flag(use-pkg-config)
-    pkgconfig-depends: libpq ==9.3 || >9.3
+    pkgconfig-depends: libpq >=9.3
 
   else
     if os(windows)
@@ -102,16 +87,15 @@ library
           crypto
           ssl
 
-  -- Other-modules:
-  build-tools:      hsc2hs -any
+  build-tool-depends: hsc2hs:hsc2hs >=0.68.5
 
 test-suite smoke
   default-language: Haskell2010
   type:             exitcode-stdio-1.0
   main-is:          Smoke.hs
   hs-source-dirs:   test
   build-depends:
-      base
+    , base
     , bytestring
     , postgresql-libpq
 

src/Database/PostgreSQL/LibPQ.hs

@@ -43,8 +43,8 @@
 {-# LANGUAGE OverloadedStrings          #-}
 {-# LANGUAGE ScopedTypeVariables        #-}
 {-# LANGUAGE BangPatterns               #-}
+{-# LANGUAGE DerivingStrategies         #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE DeriveDataTypeable         #-}
 
 module Database.PostgreSQL.LibPQ
     (
@@ -213,23 +213,18 @@ module Database.PostgreSQL.LibPQ
     )
 where
 
-import Prelude hiding ( print )
+import Control.Exception (try, IOException, mask_)
 import Foreign
 import Foreign.C.Types
 import Foreign.C.String
-#if __GLASGOW_HASKELL__ >= 702
 import qualified Foreign.ForeignPtr.Unsafe as Unsafe
-#endif
 import qualified Foreign.Concurrent as FC
 import System.Posix.Types ( Fd(..) )
 import System.IO ( IOMode(..), SeekMode(..) )
 
-#if __GLASGOW_HASKELL__ >= 700
 import GHC.Conc ( closeFdWith )  -- Won't work with GHC 7.0.1
-#endif
 import System.Posix.Types ( CPid )
 
-import Data.ByteString.Char8 ()
 import qualified Data.ByteString.Unsafe as B
 import qualified Data.ByteString.Internal as B ( fromForeignPtr
                                                , c_strlen
@@ -246,14 +241,6 @@ import Database.PostgreSQL.LibPQ.Marshal
 import Database.PostgreSQL.LibPQ.Notify
 import Database.PostgreSQL.LibPQ.Oid
 
-#if __GLASGOW_HASKELL__ >= 700
-import Control.Exception (mask_)
-#else
-import qualified Control.Exception
-mask_ = Control.Exception.block
-#endif
-
-import Control.Exception (try, IOException)
 
 #ifndef mingw32_HOST_OS
 import System.Posix.DynamicLinker
@@ -311,7 +298,6 @@ connectStart connStr =
 
 pqfinish :: Ptr PGconn -> MVar NoticeBuffer -> IO ()
 pqfinish conn noticeBuffer = do
-#if __GLASGOW_HASKELL__ >= 700
 --   This covers the case when a connection is closed while other Haskell
 --   threads are using GHC's IO manager to wait on the descriptor.  This is
 --   commonly the case with asynchronous notifications, for example.  Since
@@ -324,9 +310,7 @@ pqfinish conn noticeBuffer = do
            -- This case may be worth investigating further
            c_PQfinish conn
      fd -> closeFdWith (\_ -> c_PQfinish conn) (Fd fd)
-#else
-   c_PQfinish conn
-#endif
+
    nb <- swapMVar noticeBuffer nullPtr
    c_free_noticebuffer nb
 
@@ -350,11 +334,7 @@ newNullConnection = do
 
 -- | Test if a connection is the Null Connection.
 isNullConnection :: Connection -> Bool
-#if __GLASGOW_HASKELL__ >= 702
 isNullConnection (Conn x _) = Unsafe.unsafeForeignPtrToPtr x == nullPtr
-#else
-isNullConnection (Conn x _) = unsafeForeignPtrToPtr x == nullPtr
-#endif
 {-# INLINE isNullConnection #-}
 
 -- | If 'connectStart' succeeds, the next stage is to poll libpq so
@@ -1039,8 +1019,12 @@ nfields :: Result
 nfields res = withResult res (return . toColumn . c_PQnfields)
 
 
-newtype Column = Col CInt  deriving (Eq, Ord, Show, Enum, Num)
-newtype Row    = Row CInt  deriving (Eq, Ord, Show, Enum, Num)
+newtype Column = Col CInt
+  deriving stock (Eq, Ord, Show)
+  deriving newtype (Enum, Num)
+newtype Row    = Row CInt
+  deriving stock (Eq, Ord, Show)
+  deriving newtype (Enum, Num)
 
 toColumn :: (Integral a) => a -> Column
 toColumn = Col . fromIntegral
@@ -2173,13 +2157,8 @@ foreign import ccall unsafe "libpq-fe.h PQsocket"
 foreign import ccall        "libpq-fe.h PQerrorMessage"
     c_PQerrorMessage :: Ptr PGconn -> IO CString
 
-#if __GLASGOW_HASKELL__ >= 700
 foreign import ccall        "libpq-fe.h PQfinish"
     c_PQfinish :: Ptr PGconn -> IO ()
-#else
-foreign import ccall        "libpq-fe.h &PQfinish"
-    p_PQfinish :: FunPtr (Ptr PGconn -> IO ())
-#endif
 
 foreign import ccall        "libpq-fe.h PQreset"
     c_PQreset :: Ptr PGconn -> IO ()

src/Database/PostgreSQL/LibPQ/Notify.hsc

@@ -19,9 +19,6 @@ data Notify = Notify {
     , notifyExtra   :: {-# UNPACK #-} !B.ByteString -- ^ notification payload string
     } deriving Show
 
-#if __GLASGOW_HASKELL__ < 800
-#let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__)
-#endif
 instance Storable Notify where
   sizeOf _ = #{size PGnotify}
 

src/Database/PostgreSQL/LibPQ/Oid.hsc

@@ -1,14 +1,15 @@
-{-# LANGUAGE DeriveDataTypeable         #-}
+{-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 module Database.PostgreSQL.LibPQ.Oid where
 
 #include <libpq-fe.h>
 
-import Data.Typeable (Typeable)
 import Foreign.C.Types (CUInt)
 import Foreign.Storable (Storable)
 
-newtype Oid = Oid CUInt deriving (Eq, Ord, Read, Show, Storable, Typeable)
+newtype Oid = Oid CUInt
+  deriving stock (Eq, Ord, Read, Show)
+  deriving newtype (Storable)
 
 invalidOid :: Oid
 invalidOid = Oid (#const InvalidOid)