Changeset 5081

Show
Ignore:
Timestamp:
02/16/09 22:17:50 (15 hours ago)
Author:
desai
Message:

Snapshots: (hopefully) final correspondence type updates

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/bcfg2/src/lib/Server/Snapshots/model.py

    r5080 r5081  
    9393    __tablename__ = 'package_pair' 
    9494    id = Column(Integer, primary_key=True)     
    95     desired_id = Column(Integer, ForeignKey('package.id')) 
    96     desired = relation(Package, primaryjoin=desired_id == Package.id) 
    97     incorrect_id = Column(Integer, ForeignKey('package.id'), nullable=True) 
    98     incorrect = relation(Package, primaryjoin=incorrect_id == Package.id) 
     95    start_id = Column(Integer, ForeignKey('package.id')) 
     96    start = relation(Package, primaryjoin=start_id == Package.id) 
     97    end_id = Column(Integer, ForeignKey('package.id'), nullable=True) 
     98    end = relation(Package, primaryjoin=end_id == Package.id) 
    9999    modified = Column(Boolean) 
     100    correct = Column(Boolean) 
    100101 
    101102package_snap = Table('package_snap', Base.metadata, 
    …… 
    113114    __tablename__ = 'service_pair' 
    114115    id = Column(Integer, primary_key=True)     
    115     desired_id = Column(Integer, ForeignKey('service.id')) 
    116     desired = relation(Service, primaryjoin=desired_id == Service.id) 
    117     incorrect_id = Column(Integer, ForeignKey('service.id'), nullable=True) 
    118     incorrect = relation(Service, primaryjoin=incorrect_id == Service.id) 
     116    start_id = Column(Integer, ForeignKey('service.id')) 
     117    start = relation(Service, primaryjoin=start_id == Service.id) 
     118    end_id = Column(Integer, ForeignKey('service.id'), nullable=True) 
     119    end = relation(Service, primaryjoin=end_id == Service.id) 
    119120    modified = Column(Boolean) 
     121    correct = Column(Boolean)     
    120122 
    121123service_snap = Table('service_snap', Base.metadata, 
    …… 
    136138    __tablename__ = 'file_pair' 
    137139    id = Column(Integer, primary_key=True)     
    138     desired_id = Column(Integer, ForeignKey('file.id')) 
    139     desired = relation(File, primaryjoin=desired_id == File.id) 
    140     incorrect_id = Column(Integer, ForeignKey('file.id'), nullable=True) 
    141     incorrect = relation(File, primaryjoin=incorrect_id == File.id) 
     140    start_id = Column(Integer, ForeignKey('file.id')) 
     141    start = relation(File, primaryjoin=start_id == File.id) 
     142    end_id = Column(Integer, ForeignKey('file.id'), nullable=True) 
     143    end = relation(File, primaryjoin=end_id == File.id) 
    142144    modified = Column(Boolean) 
     145    correct = Column(Boolean)     
    143146 
    144147file_snap = Table('file_snap', Base.metadata,