Author: justi9 Date: 2008-09-21 17:44:54 -0400 (Sun, 21 Sep 2008) New Revision: 2515 Modified: mgmt/trunk/mint/python/mint/schema.py mgmt/trunk/mint/sql/schema.sql Log: Update schema for new condor changes Modified: mgmt/trunk/mint/python/mint/schema.py =================================================================== --- mgmt/trunk/mint/python/mint/schema.py 2008-09-21 20:58:19 UTC (rev 2514) +++ mgmt/trunk/mint/python/mint/schema.py 2008-09-21 21:44:54 UTC (rev 2515) @@ -768,6 +768,7 @@ statsPrev = ForeignKey('JobStats', cascade='null', default=None) classInfos = dict() # brokerId => classInfo scheduler = ForeignKey('Scheduler', cascade='null', default=None) + submitter = ForeignKey('Submitter', cascade='null', default=None) AccountingGroup = StringCol(length=1000, default=None) Args = StringCol(length=4000, default=None) ClusterId = IntCol(default=None) @@ -1066,7 +1067,9 @@ Scheduler.sqlmeta.addJoin(SQLMultipleJoin('Job', joinMethodName='jobs')) +Submitter.sqlmeta.addJoin(SQLMultipleJoin('Job', joinMethodName='jobs')) + Job.sqlmeta.addJoin(SQLMultipleJoin('JobStats', joinMethodName='stats')) classToSchemaNameMap['Scheduler'] = 'Scheduler' Modified: mgmt/trunk/mint/sql/schema.sql =================================================================== --- mgmt/trunk/mint/sql/schema.sql 2008-09-21 20:58:19 UTC (rev 2514) +++ mgmt/trunk/mint/sql/schema.sql 2008-09-21 21:44:54 UTC (rev 2515) @@ -245,6 +245,7 @@ stats_curr_id INT, stats_prev_id INT, scheduler_id INT, + submitter_id INT, accounting_group VARCHAR(1000), args VARCHAR(4000), cluster_id INT, @@ -767,6 +768,8 @@ ALTER TABLE job ADD CONSTRAINT scheduler_id_exists FOREIGN KEY (scheduler_id) REFERENCES scheduler (id) ON DELETE SET NULL; +ALTER TABLE job ADD CONSTRAINT submitter_id_exists FOREIGN KEY (submitter_id) REFERENCES submitter (id) ON DELETE SET NULL; + ALTER TABLE job_stats ADD CONSTRAINT job_id_exists FOREIGN KEY (job_id) REFERENCES job (id) ON DELETE SET NULL; ALTER TABLE journal ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES journal_stats (id) ON DELETE SET NULL;