Changeset 505 for elixir/trunk

Timestamp:

10/15/09 14:41:44 (3 years ago)

Author:

ged

Message:

- using_options_defaults and using_table_options statements can be used several

times within the same class (closes #70).

Location:

elixir/trunk

Files:

• CHANGES (modified) (1 diff)
• elixir/entity.py (modified) (1 diff)
• elixir/options.py (modified) (2 diffs)
• tests/test_custombase.py (modified) (2 diffs)
• tests/test_options.py (modified) (3 diffs)

elixir/trunk/CHANGES

@@ -1 +1 @@
 0.8.0
 
-Changes:
+New features:
+
+Changes:
+- using_options_defaults and using_table_options statements can be used several
+  times within the same class (closes #70).
 - Dropped support for python 2.3, SQLAlchemy 0.4 and deprecated stuff from
   Elixir 0.7
 
 Bug fixes:
-- Fixed custom bases classes along side zope interfaces (closes #98, patch from
-  Valentin Lab)
+- Fixed custom base classes and versioned extension when used with zope
+  interfaces (closes #98, patch from Valentin Lab)
 
 0.7.0 - 2009-10-01

elixir/trunk/elixir/entity.py

@@ -145 +145 @@
                 self.identity = self.mapper_options['polymorphic_identity']
             else:
-                #TODO: include module name
+                #TODO: include module name (We could have b.Account inherit
+                # from a.Account)
                 self.identity = entity.__name__.lower()
         elif 'polymorphic_identity' in self.mapper_options:

elixir/trunk/elixir/options.py

@@ -231 +231 @@
             raise Exception("'%s' is not a valid option for Elixir entities."
                             % kwarg)
-
-    entity.options_defaults = kwargs
+    if not hasattr(entity, 'options_defaults'):
+        entity.options_defaults = {}
+    entity.options_defaults.update(kwargs)
 
 
@@ -245 +246 @@
 
 def using_table_options_handler(entity, *args, **kwargs):
-    entity._descriptor.table_args = list(args)
+    entity._descriptor.table_args.extend(list(args))
     entity._descriptor.table_options.update(kwargs)
 

elixir/trunk/tests/test_custombase.py

@@ -148 +148 @@
             __metaclass__ = EntityMeta
 
-            using_options_defaults(tablename=camel_to_underscore)
+            options_defaults = dict(tablename=camel_to_underscore)
+            using_options_defaults(identity=camel_to_underscore)
+            using_options_defaults(inheritance='multi')
 
         class TestA(OptionBase):
             name = Field(String(32))
 
-        class SuperTestB(OptionBase):
+        class SuperTestB(TestA):
             pass
 
@@ -160 +162 @@
         assert TestA.table.name == 'test_a'
         assert SuperTestB.table.name == 'super_test_b'
+        assert TestA._descriptor.identity == 'test_a'
 

elixir/trunk/tests/test_options.py

@@ -60 +60 @@
         setup_all(True)
 
-        raised = False
         try:
             MyEntity._descriptor.add_column(Column('name', String(30)))
+            assert False
         except Exception:
-            raised = True
-
-        assert raised
+            pass
 
     def test_allowcoloverride_true(self):
@@ -204 +202 @@
 
     def teardown(self):
-        cleanup_all()
+        cleanup_all(True)
 
     def test_unique_constraint(self):
-
         class Person(Entity):
             firstname = Field(String(30))
@@ -223 +220 @@
         homer2 = Person(firstname="Homer", surname='Simpson')
 
-        raised = False
-        try:
-            session.commit()
-        except SQLError:
-            raised = True
-
-        assert raised
+        try:
+            session.commit()
+            assert False
+        except SQLError:
+            pass
+
+    def test_several_statements(self):
+        class A(Entity):
+            name1 = Field(String(30))
+            name2 = Field(String(30))
+            name3 = Field(String(30))
+            using_table_options(UniqueConstraint('name1', 'name2'))
+            using_table_options(UniqueConstraint('name2', 'name3'))
+
+        setup_all(True)
+
+        a000 = A(name1='0', name2='0', name3='0')
+        a010 = A(name1='0', name2='1', name3='0')
+        session.commit()
+
+        a001 = A(name1='0', name2='0', name3='1')
+        try:
+            session.commit()
+            assert False
+        except SQLError:
+            session.close()
+
+        a100 = A(name1='1', name2='0', name3='0')
+        try:
+            session.commit()
+            assert False
+        except SQLError:
+            session.close()
 
     def test_unique_constraint_many_to_one(self):