Merge branch 'develop' into ym@system_catalogues

obsidiansystems · Oct 5, 2023 · 052388a · 052388a
2 parents 26b8fd1 + 5bd03ad
commit 052388a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Revision history for beam-automigrate
 
+## Unreleased
+
+* Add ltree column type
+
 ## 0.1.4.0
 
 * [#52](https://github.com/obsidiansystems/beam-automigrate/pull/52) Support sql arrays

diff --git a/src/Database/Beam/AutoMigrate.hs b/src/Database/Beam/AutoMigrate.hs
@@ -569,6 +569,8 @@ renderDataType = \case
  PgSpecificType (PgEnumeration (EnumerationName ty)) -> ty
  -- oid
  PgSpecificType PgOid -> "oid"
+ -- ltree
+ PgSpecificType PgLTree -> "ltree"
  -- Arrays
  SqlArrayType (SqlArrayType _ _) _ -> error "beam-automigrate: invalid nested array."
  SqlArrayType _ 0 -> error "beam-automigrate: array with zero dimensions"

diff --git a/src/Database/Beam/AutoMigrate/Postgres.hs b/src/Database/Beam/AutoMigrate/Postgres.hs
@@ -381,6 +381,8 @@ pgTypeToColumnType oid width
  Just (PgSpecificType PgUuid)
  | Pg.typoid Pg.oid == oid =
  Just (PgSpecificType PgOid)
+ | Pg.Oid 16385 == oid =
+ Just (PgSpecificType PgLTree)
  | otherwise =
  Nothing
 

diff --git a/src/Database/Beam/AutoMigrate/Types.hs b/src/Database/Beam/AutoMigrate/Types.hs
@@ -157,6 +157,7 @@ data PgDataType
  | PgUuid
  | PgEnumeration EnumerationName
  | PgOid
+ | PgLTree
 
 deriving instance Show PgDataType