diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-12-05 14:56:26 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-12-05 14:56:26 -0500 |
| commit | f1e54a69fb9b07a73bd8488110b1ceace168a50a (patch) | |
| tree | 9ffef9bc95b2015877f5dcfa63fb6574a87ca15e /lib/sqlalchemy/dialects/postgresql/base.py | |
| parent | 77763969ff06b12edcbaedab62890afa27e105b4 (diff) | |
| parent | 926b0d7fa860abee8b34236148fa34a6666700a9 (diff) | |
| download | sqlalchemy-f1e54a69fb9b07a73bd8488110b1ceace168a50a.tar.gz | |
- merge default tip
Diffstat (limited to 'lib/sqlalchemy/dialects/postgresql/base.py')
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/base.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index f000520ca..821ec5cfb 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -771,7 +771,10 @@ class PGDialect(default.DefaultDialect): self.supports_native_enum = self.server_version_info >= (8, 3) if not self.supports_native_enum: self.colspecs = self.colspecs.copy() - del self.colspecs[ENUM] + # pop base Enum type + self.colspecs.pop(sqltypes.Enum, None) + # psycopg2, others may have placed ENUM here as well + self.colspecs.pop(ENUM, None) def on_connect(self): if self.isolation_level is not None: |