From 955e499773dcfd80e2b5497d3cb1b38c9ae294eb Mon Sep 17 00:00:00 2001 From: "Zhang Rong(Jon)" Date: Wed, 19 Jan 2022 22:25:36 +0800 Subject: [PATCH] Fix: INF-254 ENUM type create failed while re-creating a pod 1. Stop using psql 'type' creation that maps the object to DB, replace to varchar Issue-ID: INF-254 Signed-off-by: Zhang Rong(Jon) Change-Id: Ic841e08ed2186bab2c2f70fb274178aec81a9d4d --- o2ims/adapter/clients/orm_stx.py | 2 +- o2ims/adapter/orm.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/o2ims/adapter/clients/orm_stx.py b/o2ims/adapter/clients/orm_stx.py index dd65402..2d58b8b 100644 --- a/o2ims/adapter/clients/orm_stx.py +++ b/o2ims/adapter/clients/orm_stx.py @@ -44,7 +44,7 @@ stxobject = Table( "stxcache", metadata, Column("id", String(255), primary_key=True), - Column("type", Enum(ResourceTypeEnum)), + Column("type", Enum(ResourceTypeEnum, native_enum=False)), Column("name", String(255)), Column("updatetime", DateTime), Column("createtime", DateTime), diff --git a/o2ims/adapter/orm.py b/o2ims/adapter/orm.py index 0e03727..6c4a678 100644 --- a/o2ims/adapter/orm.py +++ b/o2ims/adapter/orm.py @@ -66,7 +66,8 @@ resourcetype = Table( Column("hash", String(255)), Column("resourceTypeId", String(255), primary_key=True), - Column("resourceTypeEnum", Enum(ResourceTypeEnum), nullable=False), + Column("resourceTypeEnum", Enum( + ResourceTypeEnum, native_enum=False), nullable=False), Column("oCloudId", ForeignKey("ocloud.oCloudId")), Column("name", String(255)), Column("vendor", String(255)), -- 2.16.6