Changeset 354

Timestamp:

07/07/08 13:07:42 (5 years ago)

Author:

ged

Message:

- Fixed acts_as_list extension with autoloaded entities (patch from maqr,

closes ticket #52).

Location:

elixir/trunk

Files:

• CHANGES (modified) (3 diffs)
• elixir/ext/list.py (modified) (4 diffs)
• tests/test_acts_as_list.py (modified) (3 diffs)

elixir/trunk/CHANGES

@@ -17 +17 @@
         pass
     A.name = Field(String(32))
-- Added add_mapper_property and add_table_column helper method in
+- Added add_mapper_property and add_table_column helper methods in
   EntityBuilders.
 - Added full_tablename property on EntityDescriptor (includes schema name if
@@ -32 +32 @@
       SA 0.4)
     * autoexpire=True (with SA 0.5).
-- removed objectstore
+- removed objectstore and other SA 0.3 or older support code.
 
 Bug fixes:
@@ -40 +40 @@
 - Fixed inheritance with autoloaded entities: when using autoload, we
   shouldn't try to add columns to the table (closes tickets #41 and #43).
+- Fixed acts_as_list extension with autoloaded entities (patch from maqr,
+  closes ticket #52).
 - Fixed ColumnProperty to work with latest version of SQLAlchemy (O.4.5 and
   later)

elixir/trunk/elixir/ext/list.py

@@ -53 +53 @@
 
 
-The above example can then be used to manage ordered todo lists for people. 
+The above example can then be used to manage ordered todo lists for people.
 Note that you must set the `order_by` property on the `Person.todo` relation in
-order for the relation to respect the ordering. Here is an example of using 
+order for the relation to respect the ordering. Here is an example of using
 this model in practice:
 
@@ -104 +104 @@
 
     def create_non_pk_cols(self):
-        self.position_column = Column(self.column_name, Integer)
-        self.entity._descriptor.add_column(self.position_column)
+        if self.entity._descriptor.autoload:
+            for c in self.entity.table.c:
+                if c.name == self.column_name:
+                    self.position_column = c
+            if not hasattr(self, 'position_column'):
+                raise Exception(
+                    "Could not find column '%s' in autoloaded table '%s', "
+                    "needed by entity '%s'." % (self.column_name,
+                        self.entity.table.name, self.entity.__name__))
+        else:
+            self.position_column = Column(self.column_name, Integer)
+            self.entity._descriptor.add_column(self.position_column)
 
     def after_table(self):
@@ -163 +173 @@
 
         def move_to_top(self):
-            # move the items that were above this item down one
-            self.table.update(
-                and_(
-                    position_column <= getattr(self, position_column_name),
-                    qualifier_method(self)
-                ),
-                values = {
-                    position_column: position_column + 1
-                }
-            ).execute()
-
-            # move this item to the first position
-            self.table.update(get_entity_where(self)) \
-                      .execute(**{position_column_name: 1})
+            self.move_to(1)
 
         def move_to(self, position):
@@ -207 +204 @@
 
         def move_lower(self):
+            # replace for ex.: p.todos.insert(x + 1, p.todos.pop(x))
             self.move_to(getattr(self, position_column_name) + 1)
 

elixir/trunk/tests/test_acts_as_list.py

@@ +1 @@
+from sqlalchemy import Table, Column, MetaData
+
 from elixir import *
 from elixir.ext.list import acts_as_list
 
-def setup():
-    global ToDo, Person
-
-    class ToDo(Entity):
-        subject = Field(String(128))
-        owner = ManyToOne('Person')
-
-        def qualify(self):
-            return ToDo.owner_id == self.owner_id
-
-        acts_as_list(qualifier=qualify, column_name='position')
-
-        def __repr__(self):
-            return '<%d:%s>' % (self.position, self.subject)
-
-    class Person(Entity):
-        name = Field(String(64))
-        todos = OneToMany('ToDo', order_by='position')
-
-
-    setup_all()
-    metadata.bind = 'sqlite:///'
-
-
-def teardown():
-    cleanup_all()
-
 
 class TestActsAsList(object):
-    def setup(self):
-        create_all()
 
     def teardown(self):
-        drop_all()
-        session.clear()
+        cleanup_all(True)
 
     def test_acts_as_list(self):
+        class ToDo(Entity):
+            subject = Field(String(128))
+            owner = ManyToOne('Person')
+
+            def qualify(self):
+                return ToDo.owner_id == self.owner_id
+
+            acts_as_list(qualifier=qualify, column_name='position')
+
+            def __repr__(self):
+                return '<%d:%s>' % (self.position, self.subject)
+
+        class Person(Entity):
+            name = Field(String(64))
+            todos = OneToMany('ToDo', order_by='position')
+
+        metadata.bind = 'sqlite:///'
+
+        setup_all(True)
+
         # create a person
         # you must create and commit this _before_ you attach todo's to it
@@ -74 +66 @@
 
         # lets shuffle them again for the sake of testing move_to_bottom
-        # and move_to_top
         p.todos[2].move_to_top()
         session.commit(); session.clear()
@@ -117 +108 @@
         assert p.todos[1].subject == 'Three'
         assert p.todos[1].position == 2
+
+    def test_acts_as_list_autoload(self):
+        # Make autoload test fixture
+        meta = MetaData('sqlite:///')
+
+        preloaded_table = Table('preloaded', meta,
+            Column('name', String(32), primary_key=True),
+            Column('position', Integer))
+
+        meta.create_all()
+
+        class Preloaded(Entity):
+            using_options(tablename='preloaded', autoload=True)
+            acts_as_list()
+
+        metadata.bind = meta.bind
+        setup_all()
+
+        i = Preloaded(name='Foo')
+        session.commit()
+        assert i.name == 'Foo'
+        assert i.position == 1
+
+        j = Preloaded(name='Bar')
+        session.commit()
+        assert j.name == 'Bar'
+        assert j.position == 2