unit-tested product/specline/etc stuff

2 files changed, 215 insertions, 318 deletions

diff --git a/test/alltests.py b/test/alltests.py
index b6c0d8fc5..99573fc1d 100644
--- a/test/alltests.py
+++ b/test/alltests.py
@@ -50,6 +50,7 @@ def suite():
         'manytomany',
         'onetoone',
         'inheritance',
+        'inheritance2',
         'polymorph',
         
         # extensions
diff --git a/test/inheritance2.py b/test/inheritance2.py
index bc725f942..f01189cb2 100644
--- a/test/inheritance2.py
+++ b/test/inheritance2.py
@@ -1,336 +1,232 @@
-# UNDER CONSTRUCTION !
-# I am just pasting vladimir iliev's test cases here where they will be later assembled into unit tests.
-
 from sqlalchemy import *
 from datetime import datetime
-
-metadata = BoundMetaData('sqlite://', echo=True)
-
-products_table = Table('products', metadata,
-   Column('product_id', Integer, primary_key=True),
-   Column('product_type', String(128)),
-   Column('name', String(128)),
-   Column('mark', String(128)),
-   Column('material', String(128), default=''),
-   Column('sortament', String(128), default=''),
-   Column('weight', String(128), default=''),
-   )
-
-
-specification_table = Table('specification', metadata,
-    Column('spec_line_id', Integer, primary_key=True),
-    Column('master_id', Integer, ForeignKey("products.product_id"),
-        nullable=True),
-    Column('slave_id', Integer, ForeignKey("products.product_id"),
-        nullable=True),
-    Column('quantity', Float, default=1.),
-    )
-
-
-class Product(object):
-
-    def __init__(self, name, mark=''):
-        self.name = name
-        self.mark = mark
-
-    def __repr__(self):
-        return '<%s %s>' % (self.__class__.__name__, self.name)
-
-
-class Detail(Product):
-
-    def __init__(self, name, mark='', material='', sortament='', weight=''):
-        self.name = name
-        self.mark = mark
-        self.material = material
-        self.sortament = sortament
-        self.weight = weight
-
-
-class Assembly(Product): pass
-
-
-class SpecLine(object):
-    
-    def __init__(self, master=None, slave=None, quantity=1):
-        self.master = master
-        self.slave = slave
-        self.quantity = quantity
-    
-    def __repr__(self):
-        return '<%s %.01f %s>' % (
-            self.__class__.__name__,
-            self.quantity or 0.,
-            getattr(self.slave, 'name', None)
+import testbase
+
+class InheritTest(testbase.AssertMixin):
+    """tests some various inheritance round trips involving a particular set of polymorphic inheritance relationships"""
+    def setUpAll(self):
+        global metadata, products_table, specification_table, documents_table
+        global Product, Detail, Assembly, SpecLine, Document, RasterDocument
+        metadata = BoundMetaData(testbase.db)
+
+        products_table = Table('products', metadata,
+           Column('product_id', Integer, primary_key=True),
+           Column('product_type', String(128)),
+           Column('name', String(128)),
+           Column('mark', String(128)),
+           )
+
+        specification_table = Table('specification', metadata,
+            Column('spec_line_id', Integer, primary_key=True),
+            Column('master_id', Integer, ForeignKey("products.product_id"),
+                nullable=True),
+            Column('slave_id', Integer, ForeignKey("products.product_id"),
+                nullable=True),
+            Column('quantity', Float, default=1.),
+            )
+            
+        documents_table = Table('documents', metadata,
+            Column('document_id', Integer, primary_key=True),
+            Column('document_type', String(128)),
+            Column('product_id', Integer, ForeignKey('products.product_id')),
+            Column('create_date', DateTime, default=lambda:datetime.now()),
+            Column('last_updated', DateTime, default=lambda:datetime.now(),
+                onupdate=lambda:datetime.now()),
+            Column('name', String(128)),
+            Column('data', Binary),
+            Column('size', Integer, default=0),
+            )
+            
+        metadata.create_all()
+
+        class Product(object):
+            def __init__(self, name, mark=''):
+                self.name = name
+                self.mark = mark
+            def __repr__(self):
+                return '<%s %s>' % (self.__class__.__name__, self.name)
+
+        class Detail(Product):
+            def __init__(self, name):
+                self.name = name
+
+        class Assembly(Product):
+            def __repr__(self):
+                return Product.__repr__(self) + " " + " ".join([x + "=" + repr(getattr(self, x, None)) for x in ['specification', 'documents']])
+
+        class SpecLine(object):
+            def __init__(self, master=None, slave=None, quantity=1):
+                self.master = master
+                self.slave = slave
+                self.quantity = quantity
+
+            def __repr__(self):
+                return '<%s %.01f %s>' % (
+                    self.__class__.__name__,
+                    self.quantity or 0.,
+                    repr(self.slave)
+                    )
+
+        class Document(object):
+            def __init__(self, name, data=None):
+                self.name = name
+                self.data = data
+            def __repr__(self):
+                return '<%s %s>' % (self.__class__.__name__, self.name)
+                
+        class RasterDocument(Document): 
+            pass
+
+    def tearDown(self):
+        clear_mappers()
+        for t in metadata.table_iterator(reverse=True):
+            t.delete().execute()
+            
+    def tearDownAll(self):
+        metadata.drop_all()
+
+    def testone(self):
+        product_mapper = mapper(Product, products_table,
+            polymorphic_on=products_table.c.product_type,
+            polymorphic_identity='product')
+
+        detail_mapper = mapper(Detail, inherits=product_mapper,
+            polymorphic_identity='detail')
+
+        assembly_mapper = mapper(Assembly, inherits=product_mapper,
+            polymorphic_identity='assembly')
+
+        specification_mapper = mapper(SpecLine, specification_table,
+            properties=dict(
+                master=relation(Assembly,
+                    foreignkey=specification_table.c.master_id,
+                    primaryjoin=specification_table.c.master_id==products_table.c.product_id,
+                    lazy=True, backref=backref('specification', primaryjoin=specification_table.c.master_id==products_table.c.product_id),
+                    uselist=False),
+                slave=relation(Product, 
+                    foreignkey=specification_table.c.slave_id,
+                    primaryjoin=specification_table.c.slave_id==products_table.c.product_id,
+                    lazy=True, uselist=False),
+                quantity=specification_table.c.quantity,
+                )
             )
 
+        session = create_session(echo_uow=False)
 
+        a1 = Assembly(name='a1')
 
-product_mapper = mapper(Product, products_table,
-    polymorphic_on=products_table.c.product_type,
-    polymorphic_identity='product')
-
-detail_mapper = mapper(Detail, inherits=product_mapper,
-    polymorphic_identity='detail')
-
-assembly_mapper = mapper(Assembly, inherits=product_mapper,
-    polymorphic_identity='assembly')
-
-specification_mapper = mapper(SpecLine, specification_table,
-    properties=dict(
-        master=relation(Assembly,
-            foreignkey=specification_table.c.master_id,
-            primaryjoin=specification_table.c.master_id==products_table.c.product_id,
-            lazy=True, backref=backref('specification', primaryjoin=specification_table.c.master_id==products_table.c.product_id), uselist=False),
-        slave=relation(Product, 
-            foreignkey=specification_table.c.slave_id,
-            primaryjoin=specification_table.c.slave_id==products_table.c.product_id,
-            lazy=True, uselist=False),
-        quantity=specification_table.c.quantity,
-        )
-    )
-
-
-metadata.create_all()
-session = create_session(echo_uow=True)
-
-
-a1 = Assembly(name='a1')
-
-p1 = Product(name='p1')
-a1.specification.append(SpecLine(slave=p1))
-
-d1 = Detail(name='d1')
-a1.specification.append(SpecLine(slave=d1))
+        p1 = Product(name='p1')
+        a1.specification.append(SpecLine(slave=p1))
 
-session.save(a1)
+        d1 = Detail(name='d1')
+        a1.specification.append(SpecLine(slave=d1))
 
-session.flush()
-session.clear()
+        session.save(a1)
+        orig = repr(a1)
+        session.flush()
+        session.clear()
 
-a1 = session.query(Product).get_by(name='a1')
-print a1
-print a1.specification
+        a1 = session.query(Product).get_by(name='a1')
+        new = repr(a1)
+        print orig
+        print new
+        assert orig == new == '<Assembly a1> specification=[<SpecLine 1.0 <Product p1>>, <SpecLine 1.0 <Detail d1>>] documents=None'
 
-# ==========================================================================================
+    def testtwo(self):
+        product_mapper = mapper(Product, products_table,
+            polymorphic_on=products_table.c.product_type,
+            polymorphic_identity='product')
 
-from sqlalchemy import *
+        detail_mapper = mapper(Detail, inherits=product_mapper,
+            polymorphic_identity='detail')
 
-metadata = BoundMetaData('sqlite://', echo=True)
-
-products_table = Table('products', metadata,
-   Column('product_id', Integer, primary_key=True),
-   Column('product_type', String(128)),
-   Column('name', String(128)),
-   )
-
-specification_table = Table('specification', metadata,
-    Column('spec_line_id', Integer, primary_key=True),
-    Column('slave_id', Integer, ForeignKey("products.product_id"),
-        nullable=True),
-    )
-
-class Product(object):
-    def __init__(self, name):
-        self.name = name
-    def __repr__(self):
-        return '<%s %s>' % (self.__class__.__name__, self.name)
-
-class Detail(Product):
-    pass
-
-class SpecLine(object):
-    def __init__(self, slave=None):
-        self.slave = slave
-    def __repr__(self):
-        return '<%s %s>' % (
-            self.__class__.__name__,
-            getattr(self.slave, 'name', None)
+        specification_mapper = mapper(SpecLine, specification_table,
+            properties=dict(
+                slave=relation(Product, 
+                    foreignkey=specification_table.c.slave_id,
+                    primaryjoin=specification_table.c.slave_id==products_table.c.product_id,
+                    lazy=True, uselist=False),
+                )
             )
 
-product_mapper = mapper(Product, products_table,
-    polymorphic_on=products_table.c.product_type,
-    polymorphic_identity='product')
-
-detail_mapper = mapper(Detail, inherits=product_mapper,
-    polymorphic_identity='detail')
-
-specification_mapper = mapper(SpecLine, specification_table,
-    properties=dict(
-        slave=relation(Product, 
-            foreignkey=specification_table.c.slave_id,
-            primaryjoin=specification_table.c.slave_id==products_table.c.product_id,
-            lazy=True, uselist=False),
-        )
-    )
-
-metadata.create_all()
-session = create_session(echo_uow=True)
-
-s = SpecLine(slave=Product(name='p1'))
-s2 = SpecLine(slave=Detail(name='d1'))
-session.save(s)
-session.save(s2)
-session.flush()
-session.clear()
-print session.query(SpecLine).select()
-
-
-# =============================================================================================================================
-
-from sqlalchemy import *
-from datetime import datetime
-
+        session = create_session(echo_uow=False)
+
+        s = SpecLine(slave=Product(name='p1'))
+        s2 = SpecLine(slave=Detail(name='d1'))
+        session.save(s)
+        session.save(s2)
+        orig = repr([s, s2])
+        session.flush()
+        session.clear()
+        new = repr(session.query(SpecLine).select())
+        print orig
+        print new
+        assert orig == new == '[<SpecLine 1.0 <Product p1>>, <SpecLine 1.0 <Detail d1>>]'
+
+    def testthree(self):
+        product_mapper = mapper(Product, products_table,
+            polymorphic_on=products_table.c.product_type,
+            polymorphic_identity='product')
+        detail_mapper = mapper(Detail, inherits=product_mapper,
+            polymorphic_identity='detail')
+        assembly_mapper = mapper(Assembly, inherits=product_mapper,
+            polymorphic_identity='assembly')
+
+        specification_mapper = mapper(SpecLine, specification_table,
+            properties=dict(
+                master=relation(Assembly, lazy=False, uselist=False,
+                    foreignkey=specification_table.c.master_id,
+                    primaryjoin=specification_table.c.master_id==products_table.c.product_id,
+                    backref=backref('specification', primaryjoin=specification_table.c.master_id==products_table.c.product_id),
+                    ),
+                slave=relation(Product, lazy=False,  uselist=False,
+                    foreignkey=specification_table.c.slave_id,
+                    primaryjoin=specification_table.c.slave_id==products_table.c.product_id,
+                    ),
+                quantity=specification_table.c.quantity,
+                )
+            )
 
-metadata = BoundMetaData('sqlite:///', echo=False)
-
-
-products_table = Table('products', metadata,
-   Column('product_id', Integer, primary_key=True),
-   Column('product_type', String(128)),
-   Column('name', String(128)),
-   Column('mark', String(128)),
-   Column('material', String(128), default=''),
-   Column('sortament', String(128), default=''),
-   Column('weight', String(128), default=''),
-   )
-
-
-specification_table = Table('specification', metadata,
-    Column('spec_line_id', Integer, primary_key=True),
-    Column('master_id', Integer, ForeignKey("products.product_id"),
-        nullable=True),
-    Column('slave_id', Integer, ForeignKey("products.product_id"),
-        nullable=True),
-    Column('quantity', Float, default=1.),
-    )
-
-
-documents_table = Table('documents', metadata,
-    Column('document_id', Integer, primary_key=True),
-    Column('document_type', String(128)),
-    Column('product_id', Integer, ForeignKey('products.product_id')),
-    Column('create_date', DateTime, default=lambda:datetime.now()),
-    Column('last_updated', DateTime, default=lambda:datetime.now(),
-        onupdate=lambda:datetime.now()),
-    Column('name', String(128)),
-    Column('data', Binary),
-    Column('size', Integer, default=0),
-    )
-
-metadata.create_all()
-
-
-class Product(object):
-    def __init__(self, name, mark=''):
-        self.name = name
-        self.mark = mark
-    def __repr__(self):
-        return '<%s %s>' % (self.__class__.__name__, self.name)
-class Detail(Product):
-    def __init__(self, name, mark='', material='', sortament='', weight=''):
-        self.name = name
-        self.mark = mark
-        self.material = material
-        self.sortament = sortament
-        self.weight = weight
-class Assembly(Product): pass
-
-
-class SpecLine(object):
-    
-    def __init__(self, master=None, slave=None, quantity=1):
-        self.master = master
-        self.slave = slave
-        self.quantity = quantity
-    
-    def __repr__(self):
-        return '<%s %.01f %s>' % (
-            self.__class__.__name__,
-            self.quantity or 0.,
-            getattr(self.slave, 'name', None)
+        document_mapper = mapper(Document, documents_table,
+            polymorphic_on=documents_table.c.document_type,
+            polymorphic_identity='document',
+            properties=dict(
+                name=documents_table.c.name,
+                data=deferred(documents_table.c.data),
+                product=relation(Product, lazy=True, backref='documents'),
+                ),
+            )
+        raster_document_mapper = mapper(RasterDocument, inherits=document_mapper,
+            polymorphic_identity='raster_document')
+
+        assembly_mapper.add_property('specification',
+            relation(SpecLine, lazy=True,
+                primaryjoin=specification_table.c.master_id==products_table.c.product_id,
+                backref='master', cascade='all, delete-orphan',
+                )
             )
 
+        product_mapper.add_property('documents',
+            relation(Document, lazy=True,
+                backref='product', cascade='all, delete-orphan'),
+            )
 
-class Document(object):
-    def __init__(self, name, data=None):
-        self.name = name
-        self.data = data
-    def __repr__(self):
-        return '<%s %s>' % (self.__class__.__name__, self.name)
-class RasterDocument(Document): pass
-
-
-product_mapper = mapper(Product, products_table,
-    polymorphic_on=products_table.c.product_type,
-    polymorphic_identity='product')
-detail_mapper = mapper(Detail, inherits=product_mapper,
-    polymorphic_identity='detail')
-assembly_mapper = mapper(Assembly, inherits=product_mapper,
-    polymorphic_identity='assembly')
-
-
-specification_mapper = mapper(SpecLine, specification_table,
-    properties=dict(
-        master=relation(Assembly, lazy=False, uselist=False,
-            foreignkey=specification_table.c.master_id,
-            primaryjoin=specification_table.c.master_id==products_table.c.product_id,
-            backref=backref('specification', primaryjoin=specification_table.c.master_id==products_table.c.product_id),
-            ),
-        slave=relation(Product, lazy=False,  uselist=False,
-            foreignkey=specification_table.c.slave_id,
-            primaryjoin=specification_table.c.slave_id==products_table.c.product_id,
-            ),
-        quantity=specification_table.c.quantity,
-        )
-    )
-
-
-document_mapper = mapper(Document, documents_table,
-    polymorphic_on=documents_table.c.document_type,
-    polymorphic_identity='document',
-    properties=dict(
-        name=documents_table.c.name,
-        data=deferred(documents_table.c.data),
-        product=relation(Product, lazy=True, backref='documents'),
-        ),
-    )
-raster_document_mapper = mapper(RasterDocument, inherits=document_mapper,
-    polymorphic_identity='raster_document')
-
-
-assembly_mapper.add_property('specification',
-    relation(SpecLine, lazy=True,
-        primaryjoin=specification_table.c.master_id==products_table.c.product_id,
-        backref='master', cascade='all, delete-orphan',
-        )
-    )
-
-
-# bug #1
-# the property must be added to all the mapers individually, else delete-orphan doesnt work
-for m in (product_mapper, assembly_mapper, detail_mapper):
-    m.add_property('documents',
-        relation(Document, lazy=True,
-            backref='product', cascade='all, delete-orphan'),
-        )
-
-
-session = create_session()
-
-
-a1 = Assembly(name='a1')
-a1.specification.append(SpecLine(slave=Detail(name='d1')))
-a1.documents.append(Document('doc1'))
-a1.documents.append(RasterDocument('doc2')) # bug #2
-session.save(a1)
-session.flush()
-session.clear()
-del a1
-
-
-a1 = session.query(Product).get_by(name='a1')
-print a1.documents
-
-
-# ==============================================================================================================================
\ No newline at end of file
+        session = create_session()
+
+        a1 = Assembly(name='a1')
+        a1.specification.append(SpecLine(slave=Detail(name='d1')))
+        a1.documents.append(Document('doc1'))
+        a1.documents.append(RasterDocument('doc2'))
+        session.save(a1)
+        orig = repr(a1)
+        session.flush()
+        session.clear()
+
+        a1 = session.query(Product).get_by(name='a1')
+        new = repr(a1)
+        print orig
+        print new
+        assert orig == new  == '<Assembly a1> specification=[<SpecLine 1.0 <Detail d1>>] documents=[<Document doc1>, <RasterDocument doc2>]'
+        
+if __name__ == "__main__":    
+    testbase.main()