From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 25 Jun 2010 17:11:06 +0000 (-0400)
Subject: - Won't generate "CREATE TYPE" / "DROP TYPE" if
X-Git-Tag: rel_0_6_2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eab7982537426d4dc1c467df1371dea3b0a0a4e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Won't generate "CREATE TYPE" / "DROP TYPE" if
using types.Enum on a PG version prior to 8.3 -
the supports_native_enum flag is fully
honored.  [ticket:1836]
---

diff --git a/CHANGES b/CHANGES
index b138210a74..9c983e1c88 100644
--- a/CHANGES
+++ b/CHANGES
@@ -89,7 +89,12 @@ CHANGES
     Ultimately this will have to detect the value of 
     "standard_conforming_strings" for full behavior.  
     [ticket:1400]
-  
+
+  - Won't generate "CREATE TYPE" / "DROP TYPE" if
+    using types.Enum on a PG version prior to 8.3 - 
+    the supports_native_enum flag is fully
+    honored.  [ticket:1836]
+    
 - mysql
   - MySQL dialect doesn't emit CAST() for MySQL version 
     detected < 4.0.2.  This allows the unicode
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 8275aa1e7d..1a7f670a1e 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -260,10 +260,16 @@ PGArray = ARRAY
 class ENUM(sqltypes.Enum):
 
     def create(self, bind=None, checkfirst=True):
+        if not bind.dialect.supports_native_enum:
+            return
+            
         if not checkfirst or not bind.dialect.has_type(bind, self.name, schema=self.schema):
             bind.execute(CreateEnumType(self))
 
     def drop(self, bind=None, checkfirst=True):
+        if not bind.dialect.supports_native_enum:
+            return
+
         if not checkfirst or bind.dialect.has_type(bind, self.name, schema=self.schema):
             bind.execute(DropEnumType(self))
         
diff --git a/test/dialect/test_postgresql.py b/test/dialect/test_postgresql.py
index 14814bc20f..d947ad4c44 100644
--- a/test/dialect/test_postgresql.py
+++ b/test/dialect/test_postgresql.py
@@ -349,6 +349,50 @@ class EnumTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL):
             
         finally:
             metadata.drop_all()
+    
+    def test_non_native_type(self):
+        metadata = MetaData()
+        t1 = Table('foo', metadata,
+            Column('bar', Enum('one', 'two', 'three', name='myenum', native_enum=False))
+        )
+        
+        def go():
+            t1.create(testing.db)
+        
+        try:
+            self.assert_sql(testing.db, go, [], with_sequences=[
+                (
+                    "CREATE TABLE foo (\tbar VARCHAR(5), \t"
+                    "CONSTRAINT myenum CHECK (bar IN ('one', 'two', 'three')))",
+                    {}
+                )]
+            )
+        finally:
+            metadata.drop_all(testing.db)
+        
+    def test_non_native_dialect(self):
+        engine = engines.testing_engine()
+        engine.connect()
+        engine.dialect.supports_native_enum = False
+        
+        metadata = MetaData()
+        t1 = Table('foo', metadata,
+            Column('bar', Enum('one', 'two', 'three', name='myenum'))
+        )
+        
+        def go():
+            t1.create(engine)
+        
+        try:
+            self.assert_sql(engine, go, [], with_sequences=[
+                (
+                    "CREATE TABLE foo (\tbar VARCHAR(5), \t"
+                    "CONSTRAINT myenum CHECK (bar IN ('one', 'two', 'three')))",
+                    {}
+                )]
+            )
+        finally:
+            metadata.drop_all(engine)
         
     def test_standalone_enum(self):
         metadata = MetaData(testing.db)