Index: /elixir/trunk/elixir/ext/associable.py =================================================================== --- /elixir/trunk/elixir/ext/associable.py (revision 190) +++ /elixir/trunk/elixir/ext/associable.py (revision 194) @@ -114,11 +114,11 @@ import sqlalchemy as sa -def associable(entity, plural_name=None, lazy=True): +def associable(assoc_entity, plural_name=None, lazy=True): ''' Generate an associable Elixir Statement ''' - interface_name = entity.table.name + interface_name = assoc_entity._descriptor.tablename able_name = interface_name + 'able' - + if plural_name: attr_name = "%s_rel" % plural_name @@ -126,33 +126,9 @@ plural_name = interface_name attr_name = "%s_rel" % interface_name - - association_table = sa.Table("%s" % able_name, entity._descriptor.metadata, - sa.Column('%s_id' % able_name, sa.Integer, primary_key=True), - sa.Column('%s_type' % able_name, sa.String(40), nullable=False), - ) - - association_to_table = sa.Table("%s_to_%s" % (able_name, interface_name), entity._descriptor.metadata, - sa.Column('%s_id' % able_name, sa.Integer, sa.ForeignKey(getattr(association_table.c, '%s_id' % able_name), ondelete="CASCADE"), primary_key=True), - sa.Column('%s_id' % interface_name, sa.Integer, sa.ForeignKey(entity.table.c.id, ondelete="RESTRICT"), primary_key=True), - ) - - entity._assoc_table = association_table - entity._assoc_to_table = association_to_table - assoc_entity = entity - assoc_entity._assoc_relations = [] - - def finder(key): - def find_by(cls, value): - pass - return find_by - - for col in entity.table.columns.keys(): - if col != 'id': - setattr(entity, 'find_by_%s' % col, finder(col)) - + class GenericAssoc(object): - def __init__(self, name): - setattr(self, '%s_type' % able_name, name) - + def __init__(self, tablename): + self.type = tablename + class Associable(el.relationships.Relationship): """An associable Elixir Statement object""" @@ -166,36 +142,45 @@ else: self.name = name - - assoc_entity._assoc_relations.append(entity) - - field = type('myfield', (object,), {}) - field.colname = '%s_assoc_id' % interface_name - field.deferred = False - field.primary_key = False - # CHANGE: I had to change the second argument from None to sa.Integer - # in order to get associable working with the versioning extension... - # Ben: was this the right thing to do? - field.column = sa.Column('%s_assoc_id' % interface_name, sa.Integer, - sa.ForeignKey('%s.%s_id' % (able_name, able_name))) - entity._descriptor.add_field(field) - entity._descriptor.relationships[able_name] = self - - def select_by(cls, **kwargs): - return cls.query().join(attr_name).join('targets').filter_by(**kwargs).list() - setattr(entity, 'select_by_%s' % self.name, classmethod(select_by)) - - def select(cls, *args, **kwargs): - return cls.query().join(attr_name).join('targets').filter(*args, **kwargs).list() - setattr(entity, 'select_%s' % self.name, classmethod(select)) - - def setup(self): - self.create_properties() - return True + self.entity._descriptor.relationships[able_name] = self + + def create_keys(self, pk): + field = el.Field(sa.Integer, sa.ForeignKey('%s.id' % able_name), + colname='%s_assoc_id' % interface_name) + self.entity._descriptor.add_field(field) + + def create_tables(self): + if not hasattr(assoc_entity, '_assoc_table'): + association_table = sa.Table("%s" % able_name, assoc_entity._descriptor.metadata, + sa.Column('id', sa.Integer, primary_key=True), + sa.Column('type', sa.String(40), nullable=False), + ) + + association_to_table = sa.Table("%s_to_%s" % (able_name, interface_name), assoc_entity._descriptor.metadata, + sa.Column('assoc_id', sa.Integer, sa.ForeignKey(association_table.c.id, ondelete="CASCADE"), primary_key=True), + #FIXME: this assumes a single id col + sa.Column('%s_id' % interface_name, sa.Integer, sa.ForeignKey(assoc_entity.table.c.id, ondelete="RESTRICT"), primary_key=True), + ) + + assoc_entity._assoc_table = association_table + assoc_entity._assoc_to_table = association_to_table + + def after_mapper(self): + if not hasattr(assoc_entity, '_assoc_mapper'): + assoc_entity._assoc_mapper = sa.orm.mapper(GenericAssoc, + assoc_entity._assoc_table, properties={ + 'targets': sa.orm.relation(assoc_entity, + secondary=assoc_entity._assoc_to_table, + lazy=lazy, backref='associations', + order_by=assoc_entity.mapper.order_by) + }) def create_properties(self): entity = self.entity - entity.mapper.add_property(attr_name, sa.relation(GenericAssoc, lazy=self.lazy, + entity.mapper.add_property(attr_name, sa.orm.relation(GenericAssoc, lazy=self.lazy, backref='_backref_%s' % entity.table.name)) - entity.mapper.add_property(self.name, sa.synonym(attr_name)) + # this is strange! self.name is both set via mapper synonym and + # the python property + entity.mapper.add_property(self.name, sa.orm.synonym(attr_name)) + if self.uselist: def get(self): @@ -220,8 +205,12 @@ setattr(entity, self.name, property(get, set)) - sa.mapper(GenericAssoc, association_table, properties={ - 'targets': sa.relation(entity, secondary=association_to_table, - lazy=lazy, backref='association', - order_by=entity.mapper.order_by) - }) + # add helper methods + def select_by(cls, **kwargs): + return cls.query().join([attr_name, 'targets']).filter_by(**kwargs).all() + setattr(entity, 'select_by_%s' % self.name, classmethod(select_by)) + + def select(cls, *args, **kwargs): + return cls.query().join([attr_name, 'targets']).filter(*args, **kwargs).all() + setattr(entity, 'select_%s' % self.name, classmethod(select)) + return Statement(Associable) Index: /elixir/trunk/tests/test_associable.py =================================================================== --- /elixir/trunk/tests/test_associable.py (revision 190) +++ /elixir/trunk/tests/test_associable.py (revision 194) @@ -7,56 +7,60 @@ from elixir.ext.associable import associable -class Address(Entity): - has_field('street', String(130)) - has_field('city', String) - using_options(shortnames=True) - -class Comment(Entity): - has_field('id', Integer, primary_key=True) - has_field('name', Unicode) - has_field('text', String) - -is_addressable = associable(Address, 'addresses') -is_commentable = associable(Comment, 'comments') - -class Person(Entity): - has_field('id', Integer, primary_key=True) - has_field('name', Unicode) - has_many('orders', of_kind='Order') - using_options(shortnames=True) - is_addressable() - is_commentable() - -class Order(Entity): - has_field('order_num', Integer, primary_key=True) - has_field('item_count', Integer) - belongs_to('person', of_kind='Person') - using_options(shortnames=True) - is_addressable('address', uselist=False) - -class Foo(Entity): - pass - -class Bar(Entity): - pass - -is_fooable = associable(Foo) -is_barable = associable(Bar) - -class Quux(Entity): - is_fooable() - is_barable() +def setup(self): +# metadata.bind = create_engine('sqlite:///', echo=True) + metadata.bind = 'sqlite:///' class TestOrders(object): - def setup(self): - engine = create_engine('sqlite:///', echo=True) - metadata.connect(engine) - create_all() + def teardown(self): + cleanup_all(True) - def teardown(self): - cleanup_all() - + def test_empty(self): + class Foo(Entity): + pass + + class Bar(Entity): + pass + + is_fooable = associable(Foo) + is_barable = associable(Bar) + + class Quux(Entity): + is_fooable() + is_barable() + + setup_all(True) + def test_basic(self): + class Address(Entity): + has_field('street', String(130)) + has_field('city', String) + using_options(shortnames=True) + + class Comment(Entity): + has_field('id', Integer, primary_key=True) + has_field('name', Unicode) + has_field('text', String) + + is_addressable = associable(Address, 'addresses') + is_commentable = associable(Comment, 'comments') + + class Person(Entity): + has_field('id', Integer, primary_key=True) + has_field('name', Unicode) + has_many('orders', of_kind='Order') + using_options(shortnames=True) + is_addressable() + is_commentable() + + class Order(Entity): + has_field('order_num', Integer, primary_key=True) + has_field('item_count', Integer) + belongs_to('person', of_kind='Person') + using_options(shortnames=True) + is_addressable('address', uselist=False) + + setup_all(True) + home = Address(street='123 Elm St.', city='Spooksville') work = Address(street='243 Hooper st.', city='Cupertino') @@ -74,10 +78,35 @@ # Queries using the added helpers people = Person.select_by_addresses(city='Cupertino') - assert len(people) > 0 - assert people[0].addresses[1].street == '243 Hooper st.' - assert people[0].addresses[0].street == '123 Elm St.' + assert len(people) == 1 + + streets = [adr.street for adr in people[0].addresses] + assert '243 Hooper st.' in streets + assert '123 Elm St.' in streets - peopl = Person.select_addresses(and_(Address.c.street=='132 Elm St', - Address.c.city=='Smallville')) - assert len(people) > 0 - + people = Person.select_addresses(and_(Address.c.street=='132 Elm St', + Address.c.city=='Smallville')) + assert len(people) == 0 + + def test_with_forward_ref(self): + class Checkout(Entity): + belongs_to('by', of_kind='Villian', ondelete='cascade') + has_field('stamp', DateTime) + + can_checkout = associable(Checkout, 'checked_out') + + class Article(Entity): + has_field('title', Unicode) + has_field('content', Unicode) + can_checkout('checked_out_by', uselist=False) + using_options(tablename='article') + + class Villian(Entity): + has_field('name', Unicode) + using_options(tablename='villian') + + setup_all(True) + + art = Article(title='Hope Soars') + + objectstore.flush() + objectstore.clear() Index: /ixir/trunk/tests/test_associable_imports.py =================================================================== --- /elixir/trunk/tests/test_associable_imports.py (revision 192) +++ (revision ) @@ -1,39 +1,0 @@ -""" -Test the associable statement generator with a delayed import name -""" - -from sqlalchemy import create_engine, and_ -from elixir import * -from elixir.ext.associable import associable - - -class Checkout(Entity): - belongs_to('by', of_kind='Villian', ondelete='cascade') - has_field('stamp', DateTime) - -can_checkout = associable(Checkout, 'checked_out') - -class Article(Entity): - has_field('title', Unicode) - has_field('content', Unicode) - can_checkout('checked_out_by', uselist=False) - using_options(tablename='article') - -class Villian(Entity): - has_field('name', Unicode) - using_options(tablename='villian') - - -class TestOrders(object): - def setup(self): - engine = create_engine('sqlite:///', echo=True) - metadata.connect(engine) - create_all() - - def teardown(self): - cleanup_all() - - def test_basic(self): - art = Article(title='Hope Soars') - objectstore.flush() - objectstore.clear()