[open-ils-commits] r972 - servres/trunk/conifer/syrup/migrations (gfawcett)

[svn at svn.open-ils.org]

Author: gfawcett
Date: 2010-08-18 09:24:12 -0400 (Wed, 18 Aug 2010)
New Revision: 972

Modified:
   servres/trunk/conifer/syrup/migrations/0005_auto__add_field_site_start_term__add_field_site_end_term.py
   servres/trunk/conifer/syrup/migrations/0006_auto__del_field_site_term__del_unique_site_owner_course_term__add_uniq.py
Log:
database migration fixes

Modified: servres/trunk/conifer/syrup/migrations/0005_auto__add_field_site_start_term__add_field_site_end_term.py
===================================================================
--- servres/trunk/conifer/syrup/migrations/0005_auto__add_field_site_start_term__add_field_site_end_term.py	2010-08-18 13:16:33 UTC (rev 971)
+++ servres/trunk/conifer/syrup/migrations/0005_auto__add_field_site_start_term__add_field_site_end_term.py	2010-08-18 13:24:12 UTC (rev 972)
@@ -13,9 +13,11 @@
 
         # Adding field 'Site.end_term'
         db.add_column('syrup_site', 'end_term', self.gf('django.db.models.fields.related.ForeignKey')(default=1, related_name='end_term', to=orm['syrup.Term']), keep_default=False)
+        db.start_transaction()
         for site in orm.Site.objects.all():
             site.start_term = site.end_term = site.term
             site.save()
+        db.commit_transaction()
 
     def backwards(self, orm):
         

Modified: servres/trunk/conifer/syrup/migrations/0006_auto__del_field_site_term__del_unique_site_owner_course_term__add_uniq.py
===================================================================
--- servres/trunk/conifer/syrup/migrations/0006_auto__del_field_site_term__del_unique_site_owner_course_term__add_uniq.py	2010-08-18 13:16:33 UTC (rev 971)
+++ servres/trunk/conifer/syrup/migrations/0006_auto__del_field_site_term__del_unique_site_owner_course_term__add_uniq.py	2010-08-18 13:24:12 UTC (rev 972)
@@ -11,9 +11,6 @@
         # Deleting field 'Site.term'
         db.delete_column('syrup_site', 'term_id')
 
-        # Removing unique constraint on 'Site', fields ['owner', 'course', 'term']
-        db.delete_unique('syrup_site', ['owner_id', 'course_id', 'term_id'])
-
         # Adding unique constraint on 'Site', fields ['owner', 'course', 'start_term']
         db.create_unique('syrup_site', ['owner_id', 'course_id', 'start_term_id'])