Skip to content

Use new entitySchema field for Postgres migrations #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
curranosaurus merged 1 commit into from
Oct 3, 2024
Merged

Use new entitySchema field for Postgres migrations #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 16 additions & 7 deletions persistent-postgresql/Database/Persist/Postgresql.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,14 +626,16 @@ withStmt' conn query vals =

doesTableExist :: (Text -> IO Statement)
-> EntityNameDB
-> (Maybe SchemaNameDB)
-> IO Bool
doesTableExist getter (EntityNameDB name) = do
doesTableExist getter (EntityNameDB name) mSchema = do
stmt <- getter sql
with (stmtQuery stmt vals) (\src -> runConduit $ src .| start)
where
sql = "SELECT COUNT(*) FROM pg_catalog.pg_tables WHERE schemaname != 'pg_catalog'"
<> " AND schemaname != 'information_schema' AND tablename=?"
vals = [PersistText name]
schema = maybe "public" escapeS mSchema
sql = "SELECT COUNT(*) FROM pg_catalog.pg_tables "
<> "WHERE tablename=? AND schemaname=?"
vals = [PersistText name, PersistText schema]

start = await >>= maybe (error "No results when checking doesTableExist") start'
start' [PersistInt64 0] = finish False
Expand All @@ -651,7 +653,7 @@ migrate' allDefs getter entity = fmap (fmap $ map showAlterDb) $ do
([], old'') -> do
exists' <-
if null old
then doesTableExist getter name
then doesTableExist getter name schema
else return True
return $ Right $ migrationText exists' old''
(errs, _) -> return $ Left errs
Expand Down Expand Up @@ -714,7 +716,13 @@ mkForeignAlt entity fdef = pure $ AlterColumn tableName_ schemaName_ addReferenc

addTable :: [Column] -> EntityDef -> AlterDB
addTable cols entity =
AddTable $ T.concat
AddTable $ T.concat $
case schema of
Nothing -> stmt
-- Lower case e: see Database.Persist.Sql.Migration
Just s -> "CREATe SCHEMA IF NOT EXISTS " <> s <> ";\n" : stmt
where
stmt =
-- Lower case e: see Database.Persist.Sql.Migration
[ "CREATe TABLE " -- DO NOT FIX THE CAPITALIZATION!
, entityIdentifier entity
Expand All @@ -724,7 +732,6 @@ addTable cols entity =
, T.intercalate "," $ map showColumn nonIdCols
, ")"
]
where
nonIdCols =
case entityPrimary entity of
Just _ ->
Expand All @@ -738,6 +745,8 @@ addTable cols entity =

name =
getEntityDBName entity
schema =
escapeS <$> getEntitySchema entity
idtxt =
case getEntityId entity of
EntityIdNaturalKey pdef ->
Expand Down