From b40c80acdd1d19963837e887f94aff86f5e67708 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Tue, 17 Feb 2009 04:17:50 +0000 Subject: Snapshots: (hopefully) final correspondence type updates git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5081 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Snapshots/model.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/lib/Server/Snapshots/model.py b/src/lib/Server/Snapshots/model.py index c15370162..5489edff5 100644 --- a/src/lib/Server/Snapshots/model.py +++ b/src/lib/Server/Snapshots/model.py @@ -92,11 +92,12 @@ class Package(Base): class PackageCorrespondence(Base): __tablename__ = 'package_pair' id = Column(Integer, primary_key=True) - desired_id = Column(Integer, ForeignKey('package.id')) - desired = relation(Package, primaryjoin=desired_id == Package.id) - incorrect_id = Column(Integer, ForeignKey('package.id'), nullable=True) - incorrect = relation(Package, primaryjoin=incorrect_id == Package.id) + start_id = Column(Integer, ForeignKey('package.id')) + start = relation(Package, primaryjoin=start_id == Package.id) + end_id = Column(Integer, ForeignKey('package.id'), nullable=True) + end = relation(Package, primaryjoin=end_id == Package.id) modified = Column(Boolean) + correct = Column(Boolean) package_snap = Table('package_snap', Base.metadata, Column('ppair_id', Integer, ForeignKey('package_pair.id')), @@ -112,11 +113,12 @@ class Service(Base): class ServiceCorrespondence(Base): __tablename__ = 'service_pair' id = Column(Integer, primary_key=True) - desired_id = Column(Integer, ForeignKey('service.id')) - desired = relation(Service, primaryjoin=desired_id == Service.id) - incorrect_id = Column(Integer, ForeignKey('service.id'), nullable=True) - incorrect = relation(Service, primaryjoin=incorrect_id == Service.id) + start_id = Column(Integer, ForeignKey('service.id')) + start = relation(Service, primaryjoin=start_id == Service.id) + end_id = Column(Integer, ForeignKey('service.id'), nullable=True) + end = relation(Service, primaryjoin=end_id == Service.id) modified = Column(Boolean) + correct = Column(Boolean) service_snap = Table('service_snap', Base.metadata, Column('spair_id', Integer, ForeignKey('service_pair.id')), @@ -135,11 +137,12 @@ class File(Base): class FileCorrespondence(Base): __tablename__ = 'file_pair' id = Column(Integer, primary_key=True) - desired_id = Column(Integer, ForeignKey('file.id')) - desired = relation(File, primaryjoin=desired_id == File.id) - incorrect_id = Column(Integer, ForeignKey('file.id'), nullable=True) - incorrect = relation(File, primaryjoin=incorrect_id == File.id) + start_id = Column(Integer, ForeignKey('file.id')) + start = relation(File, primaryjoin=start_id == File.id) + end_id = Column(Integer, ForeignKey('file.id'), nullable=True) + end = relation(File, primaryjoin=end_id == File.id) modified = Column(Boolean) + correct = Column(Boolean) file_snap = Table('file_snap', Base.metadata, Column('fpair_id', Integer, ForeignKey('file_pair.id')), -- cgit v1.2.3-1-g7c22