Skip to content

Commit 26fab5b

Browse files
committed
Use Fourmolu 0.11
1 parent 4f92c90 commit 26fab5b

7 files changed

Lines changed: 41 additions & 40 deletions

File tree

docs/src/Tutorial.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ data AuthorInfo = AuthorInfo
180180
}
181181
deriving stock (Eq, Show)
182182

183-
mkAuthor :: MonadIO m => AuthorInfo -> m Author
183+
mkAuthor :: (MonadIO m) => AuthorInfo -> m Author
184184
mkAuthor AuthorInfo{name = authorName} = do
185185
authorId <- liftIO $ AuthorId <$> UUID.nextRandom
186186
createdAt <- liftIO Time.getCurrentTime

fourmolu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ haddock-style: multi-line-compact # '--' vs. '{-'
88
newlines-between-decls: 1 # number of newlines between top-level declarations
99
fixities: []
1010
function-arrows: leading
11+
single-constraint-parens: never

src/Database/PostgreSQL/Entity.hs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ deleteByField fs values = void $ execute Delete (_deleteWhere @e fs) values
352352
353353
@since 0.0.1.0
354354
-}
355-
_select :: forall e. Entity e => Query
355+
_select :: forall e. (Entity e) => Query
356356
_select = textToQuery $ "SELECT " <> expandQualifiedFields @e <> " FROM " <> getTableName @e
357357

358358
{-| Produce a SELECT statement with explicit fields for a given entity
@@ -364,7 +364,7 @@ _select = textToQuery $ "SELECT " <> expandQualifiedFields @e <> " FROM " <> get
364364
365365
@since 0.0.1.0
366366
-}
367-
_selectWithFields :: forall e. Entity e => Vector Field -> Query
367+
_selectWithFields :: forall e. (Entity e) => Vector Field -> Query
368368
_selectWithFields fs = textToQuery $ "SELECT " <> expandQualifiedFields' fs tn <> " FROM " <> quoteName tn
369369
where
370370
tn = getTableName @e
@@ -404,7 +404,7 @@ _where fs' = textToQuery $ " WHERE " <> clauseFields
404404
405405
@since 0.0.1.0
406406
-}
407-
_selectWhere :: forall e. Entity e => Vector Field -> Query
407+
_selectWhere :: forall e. (Entity e) => Vector Field -> Query
408408
_selectWhere fs = _select @e <> _where fs
409409

410410
{-| Produce a SELECT statement where the provided fields are checked for being non-null.
@@ -415,7 +415,7 @@ _selectWhere fs = _select @e <> _where fs
415415
416416
@since 0.0.1.0
417417
-}
418-
_selectWhereNotNull :: forall e. Entity e => Vector Field -> Query
418+
_selectWhereNotNull :: forall e. (Entity e) => Vector Field -> Query
419419
_selectWhereNotNull fs = _select @e <> textToQuery (" WHERE " <> isNotNull fs)
420420

421421
{-| Produce a SELECT statement where the provided fields are checked for being null.
@@ -425,7 +425,7 @@ _selectWhereNotNull fs = _select @e <> textToQuery (" WHERE " <> isNotNull fs)
425425
426426
@since 0.0.1.0
427427
-}
428-
_selectWhereNull :: forall e. Entity e => Vector Field -> Query
428+
_selectWhereNull :: forall e. (Entity e) => Vector Field -> Query
429429
_selectWhereNull fs = _select @e <> textToQuery (" WHERE " <> isNull fs)
430430

431431
{-| Produce a SELECT statement where the given field is checked aginst the provided array of values .
@@ -435,7 +435,7 @@ _selectWhereNull fs = _select @e <> textToQuery (" WHERE " <> isNull fs)
435435
436436
@since 0.0.2.0
437437
-}
438-
_selectWhereIn :: forall e. Entity e => Field -> Vector Text -> Query
438+
_selectWhereIn :: forall e. (Entity e) => Field -> Vector Text -> Query
439439
_selectWhereIn f values = _select @e <> textToQuery (" WHERE " <> isIn f values)
440440

441441
{-| Produce a "SELECT FROM" over two entities.
@@ -548,7 +548,7 @@ _joinSelectOneByField pivotField whereField =
548548
549549
@since 0.0.1.0
550550
-}
551-
_insert :: forall e. Entity e => Query
551+
_insert :: forall e. (Entity e) => Query
552552
_insert = textToQuery $ "INSERT INTO " <> getTableName @e <> " " <> fs <> " VALUES " <> ps
553553
where
554554
fs = inParens (expandFields @e)
@@ -590,7 +590,7 @@ _onConflictDoUpdate conflictTarget fieldsToReplace =
590590
591591
@since 0.0.1.0
592592
-}
593-
_update :: forall e. Entity e => Query
593+
_update :: forall e. (Entity e) => Query
594594
_update = _updateBy @e (primaryKey @e)
595595

596596
{-| Produce an UPDATE statement for the given entity by the given field.
@@ -602,7 +602,7 @@ _update = _updateBy @e (primaryKey @e)
602602
603603
@since 0.0.1.0
604604
-}
605-
_updateBy :: forall e. Entity e => Field -> Query
605+
_updateBy :: forall e. (Entity e) => Field -> Query
606606
_updateBy f = _updateFieldsBy @e (fields @e) f
607607

608608
{-| Produce an UPDATE statement for the given entity and fields, by primary key.
@@ -612,7 +612,7 @@ _updateBy f = _updateFieldsBy @e (fields @e) f
612612
613613
@since 0.0.1.0
614614
-}
615-
_updateFields :: forall e. Entity e => Vector Field -> Query
615+
_updateFields :: forall e. (Entity e) => Vector Field -> Query
616616
_updateFields fs = _updateFieldsBy @e fs (primaryKey @e)
617617

618618
{-| Produce an UPDATE statement for the given entity and fields, by the specified field.
@@ -627,7 +627,7 @@ _updateFields fs = _updateFieldsBy @e fs (primaryKey @e)
627627
-}
628628
_updateFieldsBy
629629
:: forall e
630-
. Entity e
630+
. (Entity e)
631631
=> Vector Field
632632
-- ^ Field names to update
633633
-> Field
@@ -659,7 +659,7 @@ _updateFieldsBy fs' f =
659659
660660
@since 0.0.1.0
661661
-}
662-
_delete :: forall e. Entity e => Query
662+
_delete :: forall e. (Entity e) => Query
663663
_delete = textToQuery ("DELETE FROM " <> getTableName @e) <> _where [primaryKey @e]
664664

665665
{-| Produce a DELETE statement for the given entity and fields
@@ -671,7 +671,7 @@ _delete = textToQuery ("DELETE FROM " <> getTableName @e) <> _where [primaryKey
671671
672672
@since 0.0.1.0
673673
-}
674-
_deleteWhere :: forall e. Entity e => Vector Field -> Query
674+
_deleteWhere :: forall e. (Entity e) => Vector Field -> Query
675675
_deleteWhere fs = textToQuery ("DELETE FROM " <> (getTableName @e)) <> _where fs
676676

677677
{-| Produce an ORDER BY clause with one field and a sorting keyword

src/Database/PostgreSQL/Entity/Internal.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ literal n = "\'" <> escapeSingleQuotes n <> "\'"
112112
113113
@since 0.0.1.0
114114
-}
115-
getTableName :: forall e. Entity e => Text
115+
getTableName :: forall e. (Entity e) => Text
116116
getTableName = prefix (schema @e) <> quoteName (tableName @e)
117117

118118
{-| Safe getter that quotes a table's primary key
@@ -126,7 +126,7 @@ getTableName = prefix (schema @e) <> quoteName (tableName @e)
126126
127127
@since 0.0.2.0
128128
-}
129-
getPrimaryKey :: forall e. Entity e => Text
129+
getPrimaryKey :: forall e. (Entity e) => Text
130130
getPrimaryKey = getFieldName $ primaryKey @e
131131

132132
prefix :: Maybe Text -> Text
@@ -151,7 +151,7 @@ getFieldName = quoteName . fieldName
151151
152152
@since 0.0.1.0
153153
-}
154-
expandFields :: forall e. Entity e => Text
154+
expandFields :: forall e. (Entity e) => Text
155155
expandFields = V.foldl1' (\element acc -> element <> ", " <> acc) (getFieldName <$> fields @e)
156156

157157
{-| Produce a comma-separated list of an entity's fields, qualified with the table name
@@ -163,7 +163,7 @@ expandFields = V.foldl1' (\element acc -> element <> ", " <> acc) (getFieldName
163163
164164
@since 0.0.1.0
165165
-}
166-
expandQualifiedFields :: forall e. Entity e => Text
166+
expandQualifiedFields :: forall e. (Entity e) => Text
167167
expandQualifiedFields = expandQualifiedFields' (fields @e) prefixName
168168
where
169169
prefixName = tableName @e
@@ -193,7 +193,7 @@ expandQualifiedFields' fs prefixName = V.foldl1' (\element acc -> element <> ",
193193
194194
@since 0.0.2.0
195195
-}
196-
qualifyField :: forall e. Entity e => Field -> Text
196+
qualifyField :: forall e. (Entity e) => Field -> Text
197197
qualifyField f = (\(Field fName _) -> p <> "." <> quoteName fName) f
198198
where
199199
p = tableName @e
@@ -241,7 +241,7 @@ placeholder (Field f (Just t)) = quoteName f <> " = ?::" <> t
241241
242242
@since 0.0.2.0
243243
-}
244-
placeholder' :: forall e. Entity e => Field -> Text
244+
placeholder' :: forall e. (Entity e) => Field -> Text
245245
placeholder' f@(Field _ (Just t)) = qualifyField @e f <> " = ?::" <> t
246246
placeholder' f = qualifyField @e f <> " = ?"
247247

src/Database/PostgreSQL/Entity/Internal/BlogPost.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ data Author = Author
5656
(Entity)
5757
via (GenericEntity '[PrimaryKey "author_id", TableName "authors"] Author)
5858

59-
instance HasField x Author a => IsLabel x (Author -> a) where
59+
instance (HasField x Author a) => IsLabel x (Author -> a) where
6060
fromLabel = getField @x
6161

6262
-- | Wrapper around the UUID type
@@ -99,7 +99,7 @@ data BlogPost = BlogPost
9999
deriving stock (Eq, Generic, Ord, Show)
100100
deriving anyclass (FromRow, ToRow)
101101

102-
instance HasField x BlogPost a => IsLabel x (BlogPost -> a) where
102+
instance (HasField x BlogPost a) => IsLabel x (BlogPost -> a) where
103103
fromLabel = getField @x
104104

105105
instance Entity BlogPost where

src/Database/PostgreSQL/Entity/Types.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ instance (TypeError ('Text "You can't derive an Entity for a type constructor's
130130
instance (TypeError ('Text "You don't have to derive GetTableName for a product type")) => GetTableName (e :*: f) where
131131
getTableName _opts = error "You don't have to derive GetTableName for a product type"
132132

133-
instance GetTableName e => GetTableName (M1 C _1 e) where
133+
instance (GetTableName e) => GetTableName (M1 C _1 e) where
134134
getTableName opts = getTableName @e opts
135135

136-
instance GetTableName e => GetTableName (M1 S _1 e) where
136+
instance (GetTableName e) => GetTableName (M1 S _1 e) where
137137
getTableName opts = getTableName @e opts
138138

139139
instance
@@ -161,10 +161,10 @@ instance (TypeError ('Text "You can't derive Entity for a a type constructor's f
161161
instance (GetFields e, GetFields f) => GetFields (e :*: f) where
162162
getField opts = getField @e opts <> getField @f opts
163163

164-
instance GetFields e => GetFields (M1 C _1 e) where
164+
instance (GetFields e) => GetFields (M1 C _1 e) where
165165
getField opts = getField @e opts
166166

167-
instance GetFields e => GetFields (M1 D ('MetaData _1 _2 _3 _4) e) where
167+
instance (GetFields e) => GetFields (M1 D ('MetaData _1 _2 _3 _4) e) where
168168
getField opts = getField @e opts
169169

170170
instance (KnownSymbol name) => GetFields (M1 S ('MetaSel ('Just name) _1 _2 _3) _4) where
@@ -320,7 +320,7 @@ newtype UpdateRow a = UpdateRow {getUpdate :: a}
320320
deriving stock (Eq, Show)
321321
deriving newtype (Entity)
322322

323-
instance ToRow a => ToRow (UpdateRow a) where
323+
instance (ToRow a) => ToRow (UpdateRow a) where
324324
toRow = (drop <> take) 1 . toRow . getUpdate
325325

326326
{-|

test/Utils.hs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,19 @@ assertEqual expected actual = liftIO $ Test.assertEqual "" expected actual
7777

7878
--
7979

80-
genAuthorId :: MonadGen m => m AuthorId
80+
genAuthorId :: (MonadGen m) => m AuthorId
8181
genAuthorId = AuthorId <$> genUUID
8282

83-
genUUID :: MonadGen m => m UUID
83+
genUUID :: (MonadGen m) => m UUID
8484
genUUID = UUID.fromWords <$> genWord32 <*> genWord32 <*> genWord32 <*> genWord32
8585
where
86-
genWord32 :: MonadGen m => m Word32
86+
genWord32 :: (MonadGen m) => m Word32
8787
genWord32 = H.word32 (Range.constant minBound maxBound)
8888

89-
genUUIDList :: MonadGen m => m UUIDList
89+
genUUIDList :: (MonadGen m) => m UUIDList
9090
genUUIDList = UUIDList . V.fromList <$> H.list (Range.linear 1 10) genUUID
9191

92-
genUTCTime :: MonadGen m => m UTCTime
92+
genUTCTime :: (MonadGen m) => m UTCTime
9393
genUTCTime = do
9494
year <- toInteger <$> H.int (Range.constant 2000 2022)
9595
month <- H.int (Range.constant 1 12)
@@ -98,10 +98,10 @@ genUTCTime = do
9898
secs <- toInteger <$> H.int (Range.constant 0 86401)
9999
pure $ UTCTime date (secondsToDiffTime secs)
100100

101-
genName :: MonadGen m => m Text
101+
genName :: (MonadGen m) => m Text
102102
genName = H.text (Range.constant 3 25) H.unicode
103103

104-
genAuthor :: MonadGen m => m Author
104+
genAuthor :: (MonadGen m) => m Author
105105
genAuthor = do
106106
authorId <- genAuthorId
107107
name <- genName
@@ -115,15 +115,15 @@ data RandomAuthorTemplate m = RandomAuthorTemplate
115115
}
116116
deriving stock (Generic)
117117

118-
randomAuthorTemplate :: MonadIO m => RandomAuthorTemplate m
118+
randomAuthorTemplate :: (MonadIO m) => RandomAuthorTemplate m
119119
randomAuthorTemplate =
120120
RandomAuthorTemplate
121121
{ generateAuthorId = H.sample genAuthorId
122122
, generateName = H.sample genName
123123
, generateCreatedAt = H.sample genUTCTime
124124
}
125125

126-
randomAuthor :: MonadIO m => RandomAuthorTemplate m -> m Author
126+
randomAuthor :: (MonadIO m) => RandomAuthorTemplate m -> m Author
127127
randomAuthor RandomAuthorTemplate{..} = do
128128
authorId <- generateAuthorId
129129
name <- generateName
@@ -141,7 +141,7 @@ instantiateRandomAuthor RandomAuthorTemplate{..} = do
141141

142142
--
143143

144-
genBlogPost :: MonadGen m => m BlogPost
144+
genBlogPost :: (MonadGen m) => m BlogPost
145145
genBlogPost = do
146146
blogPostId <- genBlogPostId
147147
authorId <- genAuthorId
@@ -151,7 +151,7 @@ genBlogPost = do
151151
createdAt <- genUTCTime
152152
pure BlogPost{..}
153153

154-
genBlogPostId :: MonadGen m => m BlogPostId
154+
genBlogPostId :: (MonadGen m) => m BlogPostId
155155
genBlogPostId = BlogPostId <$> genUUID
156156

157157
data RandomBlogPostTemplate m = RandomBlogPostTemplate
@@ -164,7 +164,7 @@ data RandomBlogPostTemplate m = RandomBlogPostTemplate
164164
}
165165
deriving stock (Generic)
166166

167-
randomBlogPostTemplate :: MonadIO m => RandomBlogPostTemplate m
167+
randomBlogPostTemplate :: (MonadIO m) => RandomBlogPostTemplate m
168168
randomBlogPostTemplate =
169169
RandomBlogPostTemplate
170170
{ generateBlogPostId = H.sample genBlogPostId
@@ -175,7 +175,7 @@ randomBlogPostTemplate =
175175
, generateCreatedAt = H.sample genUTCTime
176176
}
177177

178-
randomBlogPost :: MonadIO m => RandomBlogPostTemplate m -> m BlogPost
178+
randomBlogPost :: (MonadIO m) => RandomBlogPostTemplate m -> m BlogPost
179179
randomBlogPost RandomBlogPostTemplate{..} = do
180180
blogPostId <- generateBlogPostId
181181
authorId <- generateAuthorId

0 commit comments

Comments
 (0)