[Sqlalchemy-commits] sqlalchemy: - Won't generate "CREATE TYPE" / "DROP TYPE" if

[<co...@sq...>]

details:   http://hg.sqlalchemy.org/sqlalchemy/sqlalchemy/rev/1a1e9754c353
changeset: 6649:1a1e9754c353
user:      zzzeek
date:      Fri Jun 25 13:11:06 2010 -0400
description:
- 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]

diffstat:

 CHANGES                                    |   7 ++++-
 lib/sqlalchemy/dialects/postgresql/base.py |   6 ++++
 test/dialect/test_postgresql.py            |  44 ++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletions(-)

diffs (91 lines):

diff -r 270d28a85c6d -r 1a1e9754c353 CHANGES
--- a/CHANGES	Thu Jun 24 12:45:37 2010 -0400
+++ b/CHANGES	Fri Jun 25 13:11:06 2010 -0400
@@ -89,7 +89,12 @@
     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 -r 270d28a85c6d -r 1a1e9754c353 lib/sqlalchemy/dialects/postgresql/base.py
--- a/lib/sqlalchemy/dialects/postgresql/base.py	Thu Jun 24 12:45:37 2010 -0400
+++ b/lib/sqlalchemy/dialects/postgresql/base.py	Fri Jun 25 13:11:06 2010 -0400
@@ -260,10 +260,16 @@
 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 -r 270d28a85c6d -r 1a1e9754c353 test/dialect/test_postgresql.py
--- a/test/dialect/test_postgresql.py	Thu Jun 24 12:45:37 2010 -0400
+++ b/test/dialect/test_postgresql.py	Fri Jun 25 13:11:06 2010 -0400
@@ -349,6 +349,50 @@
             
         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)