fix type signatures

haskell-beam · Dec 8, 2024 · 211b467 · 211b467
1 parent be0b014
commit 211b467
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 19 deletions.
diff --git a/beam-postgres/examples/src/Pagila/Schema.hs b/beam-postgres/examples/src/Pagila/Schema.hs
@@ -13,9 +13,9 @@ import Control.Arrow ( (>>>) )
 import Database.Beam (DatabaseSettings)
 import Database.Beam.Migrate.Types ( CheckedDatabaseSettings, MigrationSteps, unCheckDatabase
                                    , evaluateDatabase, migrationStep)
-import Database.Beam.Postgres (Postgres, PgCommandSyntax)
+import Database.Beam.Postgres (Postgres)
 
--- migration :: MigrationSteps PgCommandSyntax () (CheckedDatabaseSettings Postgres Pagila.Schema.V0002.PagilaDb)
+migration :: MigrationSteps Postgres () (CheckedDatabaseSettings Postgres Pagila.Schema.V0002.PagilaDb)
 migration = migrationStep "Initial commit" V0001.migration >>>
             migrationStep "Add film actor, inventory, rental table" V0002.migration
 

diff --git a/beam-postgres/examples/src/Pagila/Schema/CustomMigrateExample.hs b/beam-postgres/examples/src/Pagila/Schema/CustomMigrateExample.hs
@@ -32,11 +32,10 @@ import Database.Beam
 import Database.Beam.Postgres
     ( smallserial,
       now_,
-      PgCommandSyntax,
       Postgres,
       ResultError(ConversionFailed) )
 import Database.Beam.Postgres.Syntax
-    ( pgTextType, PgColumnSchemaSyntax, PgDataTypeSyntax )
+    ( pgTextType )
 import Database.Beam.Migrate
     ( createTable,
       defaultTo_,
@@ -132,7 +131,7 @@ instance Beamable AddressT
 lastUpdateField :: TableFieldSchema Postgres LocalTime
 lastUpdateField = field "last_update" timestamp  (defaultTo_ now_) notNull
 
--- migration :: () -> Migration PgCommandSyntax (CheckedDatabaseSettings Postgres PagilaDb)
+migration :: () -> Migration Postgres (CheckedDatabaseSettings Postgres PagilaDb)
 migration () = do
 --  year_ <- createDomain "year" integer (check (\yr -> yr >=. 1901 &&. yr <=. 2155))
   PagilaDb <$> createTable "address"

diff --git a/beam-postgres/examples/src/Pagila/Schema/V0001.hs b/beam-postgres/examples/src/Pagila/Schema/V0001.hs
@@ -24,21 +24,18 @@ import Database.Beam
       maybeType,
       smallint,
       boolean,
-      date,
       numeric,
       char,
       binaryLargeObject )
 import Database.Beam.Postgres
     ( Postgres,
-      PgCommandSyntax,
       now_,
       serial,
       smallserial,
       text,
       bytea )
-import Database.Beam.Postgres.Syntax (PgColumnSchemaSyntax)
 import Database.Beam.Migrate.Types
-    ( CheckedDatabaseSettings, Migration )
+    ( CheckedDatabaseEntity, Migration )
 import Database.Beam.Migrate.SQL
     ( TableFieldSchema,
       field,
@@ -332,7 +329,7 @@ createDateField = field "create_date" timestamp (defaultTo_ now_) notNull
 lastUpdateField :: TableFieldSchema Postgres LocalTime
 lastUpdateField = field "last_update" timestamp (defaultTo_ now_) notNull
 
--- migration :: () -> Migration PgCommandSyntax (CheckedDatabaseSettings Postgres PagilaDb)
+migration :: () -> Migration Postgres (PagilaDb (CheckedDatabaseEntity Postgres db0))
 migration () = do
 --  year_ <- createDomain "year" integer (check (\yr -> yr >=. 1901 &&. yr <=. 2155))
   PagilaDb <$> createTable "actor"

diff --git a/beam-postgres/examples/src/Pagila/Schema/V0002.hs b/beam-postgres/examples/src/Pagila/Schema/V0002.hs
@@ -28,19 +28,13 @@ import Database.Beam
       TableEntity,
       Database,
       smallint )
-import Database.Beam.Postgres ( Postgres, PgCommandSyntax )
+import Database.Beam.Postgres ( Postgres )
 import Database.Beam.Migrate.Types
     ( CheckedDatabaseSettings, Migration )
 import Database.Beam.Migrate.SQL.Tables
     ( field, notNull, createTable, preserve )
 
-import qualified Database.PostgreSQL.Simple as Pg
-
-import Data.Text (Text)
-import Data.ByteString (ByteString)
-import qualified Data.ByteString.Lazy as BL
 import Data.Time.LocalTime (LocalTime)
-import Data.Scientific (Scientific)
 
 -- film actor
 
@@ -82,8 +76,8 @@ data PagilaDb f
   } deriving Generic
 instance Database Postgres PagilaDb
 
--- migration :: CheckedDatabaseSettings Postgres V0001.PagilaDb
---           -> Migration PgCommandSyntax (CheckedDatabaseSettings Postgres PagilaDb)
+migration :: CheckedDatabaseSettings Postgres V0001.PagilaDb
+          -> Migration Postgres (CheckedDatabaseSettings Postgres PagilaDb)
 migration oldDb =
   PagilaDb
     <$> preserve (V0001.actor oldDb)