Use Data.Kind.Type explicitly instead of *

beam-migrate/Database/Beam/Migrate/Generics/Tables.hs

@@ -23,6 +23,7 @@ import Database.Beam.Migrate.Checks
 
 import Control.Applicative (Const(..))
 
+import Data.Kind (Type)
 import Data.Proxy
 import Data.Text (Text)
 import Data.Scientific (Scientific)
@@ -34,7 +35,7 @@ import Data.Word
 import GHC.Generics
 import GHC.TypeLits
 
-class BeamMigrateSqlBackend be => GMigratableTableSettings be (i :: * -> *) fieldCheck where
+class BeamMigrateSqlBackend be => GMigratableTableSettings be (i :: Type -> Type) fieldCheck where
   gDefaultTblSettingsChecks :: Proxy be -> Proxy i -> Bool -> fieldCheck ()
 
 instance (BeamMigrateSqlBackend be, GMigratableTableSettings be xId fieldCheckId) =>
@@ -81,7 +82,7 @@ instance ( Generic (embeddedTbl (Nullable (Const [FieldCheck])))
 
 -- * Nullability check
 
-type family NullableStatus (x :: *) :: Bool where
+type family NullableStatus (x :: Type) :: Bool where
   NullableStatus (Maybe x) = 'True
   NullableStatus x = 'False
 

beam-migrate/Database/Beam/Migrate/SQL/SQL92.hs

@@ -12,6 +12,7 @@ import Database.Beam.Backend.SQL.SQL92
 
 import Data.Aeson (Value)
 import Data.Hashable
+import Data.Kind (Type)
 import Data.Text (Text)
 import Data.Typeable
 #if ! MIN_VERSION_base(4,11,0)
@@ -63,9 +64,9 @@ class ( IsSql92CreateTableSyntax (Sql92DdlCommandCreateTableSyntax syntax)
       , IsSql92DropTableSyntax (Sql92DdlCommandDropTableSyntax syntax)
       , IsSql92AlterTableSyntax (Sql92DdlCommandAlterTableSyntax syntax)) =>
   IsSql92DdlCommandSyntax syntax where
-  type Sql92DdlCommandCreateTableSyntax syntax :: *
-  type Sql92DdlCommandAlterTableSyntax syntax :: *
-  type Sql92DdlCommandDropTableSyntax syntax :: *
+  type Sql92DdlCommandCreateTableSyntax syntax :: Type
+  type Sql92DdlCommandAlterTableSyntax syntax :: Type
+  type Sql92DdlCommandDropTableSyntax syntax :: Type
 
   createTableCmd :: Sql92DdlCommandCreateTableSyntax syntax -> syntax
   dropTableCmd   :: Sql92DdlCommandDropTableSyntax syntax -> syntax
@@ -76,10 +77,10 @@ class ( IsSql92TableConstraintSyntax (Sql92CreateTableTableConstraintSyntax synt
       , IsSql92TableNameSyntax (Sql92CreateTableTableNameSyntax syntax) ) =>
     IsSql92CreateTableSyntax syntax where
 
-  type Sql92CreateTableTableNameSyntax syntax :: *
-  type Sql92CreateTableColumnSchemaSyntax syntax :: *
-  type Sql92CreateTableTableConstraintSyntax syntax :: *
-  type Sql92CreateTableOptionsSyntax syntax :: *
+  type Sql92CreateTableTableNameSyntax syntax :: Type
+  type Sql92CreateTableColumnSchemaSyntax syntax :: Type
+  type Sql92CreateTableTableConstraintSyntax syntax :: Type
+  type Sql92CreateTableOptionsSyntax syntax :: Type
 
   createTableSyntax :: Maybe (Sql92CreateTableOptionsSyntax syntax)
                     -> Sql92CreateTableTableNameSyntax syntax
@@ -90,24 +91,24 @@ class ( IsSql92TableConstraintSyntax (Sql92CreateTableTableConstraintSyntax synt
 class IsSql92TableNameSyntax (Sql92DropTableTableNameSyntax syntax) =>
   IsSql92DropTableSyntax syntax where
 
-  type Sql92DropTableTableNameSyntax syntax :: *
+  type Sql92DropTableTableNameSyntax syntax :: Type
   dropTableSyntax :: Sql92DropTableTableNameSyntax syntax -> syntax
 
 class ( IsSql92TableNameSyntax (Sql92AlterTableTableNameSyntax syntax),
         IsSql92AlterTableActionSyntax (Sql92AlterTableAlterTableActionSyntax syntax) ) =>
   IsSql92AlterTableSyntax syntax where
 
-  type Sql92AlterTableTableNameSyntax syntax :: *
-  type Sql92AlterTableAlterTableActionSyntax syntax :: *
+  type Sql92AlterTableTableNameSyntax syntax :: Type
+  type Sql92AlterTableAlterTableActionSyntax syntax :: Type
 
   alterTableSyntax :: Sql92AlterTableTableNameSyntax syntax -> Sql92AlterTableAlterTableActionSyntax syntax
                    -> syntax
 
 class ( IsSql92ColumnSchemaSyntax (Sql92AlterTableColumnSchemaSyntax syntax)
       , IsSql92AlterColumnActionSyntax (Sql92AlterTableAlterColumnActionSyntax syntax) ) =>
   IsSql92AlterTableActionSyntax syntax where
-  type Sql92AlterTableAlterColumnActionSyntax syntax :: *
-  type Sql92AlterTableColumnSchemaSyntax syntax :: *
+  type Sql92AlterTableAlterColumnActionSyntax syntax :: Type
+  type Sql92AlterTableColumnSchemaSyntax syntax :: Type
   alterColumnSyntax :: Text -> Sql92AlterTableAlterColumnActionSyntax syntax
                     -> syntax
   addColumnSyntax :: Text -> Sql92AlterTableColumnSchemaSyntax syntax -> syntax
@@ -130,9 +131,9 @@ class ( IsSql92ColumnConstraintDefinitionSyntax (Sql92ColumnSchemaColumnConstrai
       , IsSql92ExpressionSyntax (Sql92ColumnSchemaExpressionSyntax columnSchema)
       , Typeable columnSchema, Sql92DisplaySyntax columnSchema, Eq columnSchema, Hashable columnSchema ) =>
   IsSql92ColumnSchemaSyntax columnSchema where
-  type Sql92ColumnSchemaColumnTypeSyntax columnSchema :: *
-  type Sql92ColumnSchemaExpressionSyntax columnSchema :: *
-  type Sql92ColumnSchemaColumnConstraintDefinitionSyntax columnSchema :: *
+  type Sql92ColumnSchemaColumnTypeSyntax columnSchema :: Type
+  type Sql92ColumnSchemaExpressionSyntax columnSchema :: Type
+  type Sql92ColumnSchemaColumnConstraintDefinitionSyntax columnSchema :: Type
 
   columnSchemaSyntax :: Sql92ColumnSchemaColumnTypeSyntax columnSchema {-^ Column type -}
                      -> Maybe (Sql92ColumnSchemaExpressionSyntax columnSchema) {-^ Default value -}
@@ -157,8 +158,8 @@ class ( IsSql92ColumnConstraintSyntax (Sql92ColumnConstraintDefinitionConstraint
       , IsSql92ConstraintAttributesSyntax (Sql92ColumnConstraintDefinitionAttributesSyntax constraint)
       , Typeable constraint ) =>
       IsSql92ColumnConstraintDefinitionSyntax constraint where
-  type Sql92ColumnConstraintDefinitionConstraintSyntax constraint :: *
-  type Sql92ColumnConstraintDefinitionAttributesSyntax constraint :: *
+  type Sql92ColumnConstraintDefinitionConstraintSyntax constraint :: Type
+  type Sql92ColumnConstraintDefinitionAttributesSyntax constraint :: Type
 
   constraintDefinitionSyntax :: Maybe Text -> Sql92ColumnConstraintDefinitionConstraintSyntax constraint
                              -> Maybe (Sql92ColumnConstraintDefinitionAttributesSyntax constraint)
@@ -175,9 +176,9 @@ class ( IsSql92MatchTypeSyntax (Sql92ColumnConstraintMatchTypeSyntax constraint)
       , Typeable (Sql92ColumnConstraintExpressionSyntax constraint)
       , Typeable constraint ) =>
   IsSql92ColumnConstraintSyntax constraint where
-  type Sql92ColumnConstraintMatchTypeSyntax constraint :: *
-  type Sql92ColumnConstraintReferentialActionSyntax constraint :: *
-  type Sql92ColumnConstraintExpressionSyntax constraint :: *
+  type Sql92ColumnConstraintMatchTypeSyntax constraint :: Type
+  type Sql92ColumnConstraintReferentialActionSyntax constraint :: Type
+  type Sql92ColumnConstraintExpressionSyntax constraint :: Type
 
   notNullConstraintSyntax :: constraint
   uniqueColumnConstraintSyntax :: constraint

beam-migrate/Database/Beam/Migrate/SQL/Tables.hs

@@ -49,6 +49,7 @@ import Control.Monad.Identity
 import Control.Monad.Writer.Strict
 import Control.Monad.State
 
+import Data.Kind (Type)
 import Data.Text (Text)
 import Data.Typeable
 import qualified Data.Kind as Kind (Constraint)
@@ -332,7 +333,7 @@ instance ( BeamMigrateSqlBackend be, HasDataTypeCreatedCheck (BeamMigrateSqlBack
     where checks = [ FieldCheck (\tbl field'' -> SomeDatabasePredicate (TableHasColumn tbl field'' ty :: TableHasColumn be)) ] ++
                    map (\cns -> FieldCheck (\tbl field'' -> SomeDatabasePredicate (TableColumnHasConstraint tbl field'' cns :: TableColumnHasConstraint be))) constraints
 
-type family IsNotNull (x :: *) :: Kind.Constraint where
+type family IsNotNull (x :: Type) :: Kind.Constraint where
   IsNotNull (Maybe x) = TypeError ('Text "You used Database.Beam.Migrate.notNull on a column with type" ':$$:
                                    'ShowType (Maybe x) ':$$:
                                    'Text "Either remove 'notNull' from your migration or 'Maybe' from your table")

beam-migrate/Database/Beam/Migrate/Types/CheckedEntities.hs

@@ -15,13 +15,13 @@ import Control.Applicative
 import Control.Monad.Writer
 import Control.Monad.Identity
 
+import Data.Kind (Constraint, Type)
 import Data.Maybe
 import Data.Monoid
 import Data.Proxy
 import Data.Text (Text)
 import Data.String
 
-import GHC.Types
 import GHC.Generics
 
 import Lens.Micro (Lens', (&), (^.), (.~), (%~))
@@ -36,7 +36,7 @@ class IsDatabaseEntity be entity => IsCheckedDatabaseEntity be entity where
   -- | The type of the descriptor for this checked entity. Usually this wraps
   -- the corresponding 'DatabaseEntityDescriptor' from 'IsDatabaseEntity', along
   -- with some mechanism for generating 'DatabasePredicate's.
-  data CheckedDatabaseEntityDescriptor be entity :: *
+  data CheckedDatabaseEntityDescriptor be entity :: Type
 
   -- | Like 'DatabaseEntityDefaultRequirements' but for checked entities
   type CheckedDatabaseEntityDefaultRequirements be entity :: Constraint
@@ -57,7 +57,7 @@ class IsDatabaseEntity be entity => IsCheckedDatabaseEntity be entity where
                       => Text -> CheckedDatabaseEntityDescriptor be entity
 
 -- | Like 'DatabaseEntity' but for checked databases
-data CheckedDatabaseEntity be (db :: (* -> *) -> *) entityType where
+data CheckedDatabaseEntity be (db :: (Type -> Type) -> Type) entityType where
   CheckedDatabaseEntity :: IsCheckedDatabaseEntity be entityType
                         => CheckedDatabaseEntityDescriptor be entityType
                         -> [ SomeDatabasePredicate ]

beam-postgres/Database/Beam/Postgres/Full.hs

@@ -4,6 +4,7 @@
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeOperators #-}
 
 -- | Module providing (almost) full support for Postgres query and data
 -- manipulation statements. These functions shadow the functions in
@@ -64,6 +65,7 @@ import           Database.Beam.Postgres.Syntax
 
 import           Control.Monad.Free.Church
 
+import           Data.Kind (Type)
 import           Data.Proxy (Proxy(..))
 import qualified Data.Text as T
 #if !MIN_VERSION_base(4, 11, 0)
@@ -229,7 +231,7 @@ runPgInsertReturningList = \case
 
 -- | What to do when an @INSERT@ statement inserts a row into the table @tbl@
 -- that violates a constraint.
-newtype PgInsertOnConflict (tbl :: (* -> *) -> *) =
+newtype PgInsertOnConflict (tbl :: (Type -> Type) -> Type) =
     PgInsertOnConflict (tbl (QField QInternal) -> PgInsertOnConflictSyntax)
 
 -- | Postgres @LATERAL JOIN@ support
@@ -397,7 +399,7 @@ runPgDeleteReturningList (PgDeleteReturning syntax) = runReturningList $ PgComma
 -- * General @RETURNING@ support
 
 class PgReturning cmd where
-  type PgReturningType cmd :: * -> *
+  type PgReturningType cmd :: Type -> Type
 
   returning :: (Beamable tbl, Projectible Postgres a)
             => cmd Postgres tbl -> (tbl (QExpr Postgres PostgresInaccessible) -> a)

beam-postgres/Database/Beam/Postgres/PgSpecific.hs

@@ -141,6 +141,7 @@ import           Data.Foldable
 import           Data.Functor
 import           Data.Hashable
 import           Data.Int
+import           Data.Kind (Type)
 import qualified Data.List.NonEmpty as NE
 import           Data.Proxy
 import           Data.Scientific (Scientific, formatScientific, FPFormat(Fixed))
@@ -308,10 +309,10 @@ arrayDims_ :: BeamSqlBackendIsString Postgres text
            -> QGenExpr context Postgres s text
 arrayDims_ (QExpr v) = QExpr (fmap (\(PgExpressionSyntax v') -> PgExpressionSyntax (emit "array_dims(" <> v' <> emit ")")) v)
 
-type family CountDims (v :: *) :: Nat where
+type family CountDims (v :: Type) :: Nat where
   CountDims (V.Vector a) = 1 + CountDims a
   CountDims a = 0
-type family WithinBounds (dim :: Nat) (v :: *) :: Constraint where
+type family WithinBounds (dim :: Nat) (v :: Type) :: Constraint where
   WithinBounds dim v =
     If ((dim <=? CountDims v) && (1 <=? dim))
        (() :: Constraint)
@@ -486,7 +487,7 @@ unbounded = PgRangeBound Exclusive Nothing
 --
 -- A reasonable example might be @Range PgInt8Range Int64@.
 -- This represents a range of Haskell @Int64@ values stored as a range of 'bigint' in Postgres.
-data PgRange (n :: *) a
+data PgRange (n :: Type) a
   = PgEmptyRange
   | PgRange (PgRangeBound a) (PgRangeBound a)
   deriving (Eq, Show, Generic)
@@ -789,7 +790,7 @@ instance Beamable (PgJSONElement a)
 -- section on
 -- <https://www.postgresql.org/docs/current/static/functions-json.html JSON>.
 --
-class IsPgJSON (json :: * -> *) where
+class IsPgJSON (json :: Type -> Type) where
   -- | The @json_each@ or @jsonb_each@ function. Values returned as @json@ or
   -- @jsonb@ respectively. Use 'pgUnnest' to join against the result
   pgJsonEach     :: QGenExpr ctxt Postgres s (json a)
@@ -1392,7 +1393,7 @@ pgRegexpSplitToTable (QExpr s) (QExpr re) =
 
 -- ** Set-valued functions
 
-data PgSetOf (tbl :: (* -> *) -> *)
+data PgSetOf (tbl :: (Type -> Type) -> Type)
 
 pgUnnest' :: forall tbl db s
            . Beamable tbl