Merge pull request #79 from tfc/int-patch

Fix wrong postgres type for SqlInt64
brandonchinn178 · Sep 27, 2021 · dd25379 · dd25379
2 parents 66f1312 + 7f68e9b
commit dd25379
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/Database/Persist/Migration/Postgres.hs b/src/Database/Persist/Migration/Postgres.hs
@@ -120,9 +120,10 @@ showColumn Column{..} = concatSql
   (\sqls -> Text.unwords $ [quote colName, sqlType] ++ sqls)
   $ map showColumnProp colProps
   where
-    sqlType = if AutoIncrement `elem` colProps
-      then "SERIAL"
-      else showSqlType colType
+    sqlType = case (AutoIncrement `elem` colProps, colType) of
+      (True, SqlInt32) -> "SERIAL"
+      (True, SqlInt64) -> "BIGSERIAL"
+      _ -> showSqlType colType
 
 -- | Show a 'SqlType'. See `showSqlType` from `Database.Persist.Postgresql`.
 showSqlType :: SqlType -> Text

diff --git a/test/goldens-unit/postgresql/migration-with-shorter-path.txt b/test/goldens-unit/postgresql/migration-with-shorter-path.txt
@@ -1,3 +1,3 @@
-CREATE TABLE IF NOT EXISTS "person" ( "id" SERIAL NOT NULL ,"gender" VARCHAR,PRIMARY KEY ( "id" ) )
+CREATE TABLE IF NOT EXISTS "person" ( "id" BIGSERIAL NOT NULL ,"gender" VARCHAR,PRIMARY KEY ( "id" ) )
 
 []
diff --git a/test/integration/Migration.hs b/test/integration/Migration.hs
@@ -1,8 +1,10 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE ExistentialQuantification #-}
 {-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiParamTypeClasses #-}