Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,8 @@ jobs:
if [ $((HCNUMVER < 90800)) -ne 0 ] ; then echo "package hpqtypes-extras" >> cabal.project ; fi
if [ $((HCNUMVER < 90800)) -ne 0 ] ; then echo " ghc-options: -j4" >> cabal.project ; fi
cat >> cabal.project <<EOF
package hpqtypes-extras
ghc-options: -Werror
EOF
cat cabal.project
cat cabal.project.local
Expand Down
4 changes: 4 additions & 0 deletions cabal.haskell-ci
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@ doctest: False
tests: True
postgresql: True
installed: -all

raw-project
package hpqtypes-extras
ghc-options: -Werror
5 changes: 2 additions & 3 deletions src/Database/PostgreSQL/PQTypes/SQL/Builder.hs
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ import Data.List
import Data.Maybe
import Data.Monoid.Utils
import Data.String
import Data.Typeable
import Database.PostgreSQL.PQTypes

class Sqlable a where
Expand Down Expand Up @@ -204,7 +203,7 @@ data AscDesc a = Asc a | Desc a
deriving (Eq, Show)

data Multiplicity a = Single a | Many [a]
deriving (Eq, Ord, Show, Typeable)
deriving (Eq, Ord, Show)

-- | 'SqlCondition' are clauses that are part of the WHERE block in
-- SQL statements. Each statement has a list of conditions, all of
Expand All @@ -215,7 +214,7 @@ data Multiplicity a = Single a | Many [a]
data SqlCondition
= SqlPlainCondition SQL
| SqlExistsCondition SqlSelect
deriving (Typeable, Show)
deriving (Show)

instance Sqlable SqlCondition where
toSQLCommand (SqlPlainCondition a) = a
Expand Down
4 changes: 1 addition & 3 deletions src/Database/PostgreSQL/PQTypes/Utils/NubList.hs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ module Database.PostgreSQL.PQTypes.Utils.NubList
, overNubList
) where

import Data.Typeable

import Data.Semigroup qualified as SG
import Data.Set qualified as Set
import Text.Read qualified as R
Expand All @@ -21,7 +19,7 @@ import Text.Read qualified as R
-- | NubList : A de-duplicated list that maintains the original order.
newtype NubList a
= NubList {fromNubList :: [a]}
deriving (Eq, Typeable)
deriving (Eq)

-- NubList assumes that nub retains the list order while removing duplicate
-- elements (keeping the first occurence). Documentation for "Data.List.nub"
Expand Down
1 change: 0 additions & 1 deletion test/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import Test.Tasty.HUnit
import Test.Tasty.Options

newtype ConnectionString = ConnectionString String
deriving (Typeable)

instance IsOption ConnectionString where
defaultValue =
Expand Down
Loading