Changeset a03cb61

Timestamp:

Apr 6, 2012, 1:28:28 AM (14 years ago)

Author:

ASA Group Database <asa-db@…>

Branches:

master, space-access, stable, stage

Children:

2c86ed1

Parents:

0ac15a1

git-author:

Alex Dehnert <adehnert@…> (04/06/12 01:28:28)

git-committer:

ASA Group Database <asa-db@…> (04/06/12 01:28:28)

Message:

Add indices to database tables

Fixes ASA Trac #38. Also, makes space-related scripts quick instead of
stupidly slow...

Location:

asadb

Files:

• forms/migrations/0011_add_indices.py (added)
• forms/models.py (modified) (5 diffs)
• groups/migrations/0024_add_indices.py (added)
• groups/models.py (modified) (6 diffs)
• space/migrations/0002_add_indices.py (added)
• space/models.py (modified) (2 diffs)

asadb/forms/models.py

@@ -10 +10 @@
 
 class FYSM(models.Model):
-    group = models.ForeignKey(groups.models.Group)
+    group = models.ForeignKey(groups.models.Group, db_index=True, )
     display_name = models.CharField(max_length=50)
-    year = models.IntegerField()
+    year = models.IntegerField(db_index=True, )
     website = models.URLField()
     join_url = models.URLField(verbose_name="recruiting URL", help_text="""<p>If you have a specific web page for recruiting new members of your group, you can link to it here. It will be used as the destination for most links about your group (join link on the main listing page and when clicking on the slide, but not the "website" link on the slide page). If you do not have such a page, use your main website's URL.</p>""")
@@ -39 +39 @@
 class FYSMCategory(models.Model):
     name = models.CharField(max_length=25)
-    slug = models.SlugField()
+    slug = models.SlugField(unique=True, )
     blurb = models.TextField()
 
@@ -139 +139 @@
 class GroupConfirmationCycle(models.Model):
     name = models.CharField(max_length=30)
-    slug = models.SlugField()
+    slug = models.SlugField(unique=True, )
     create_date = models.DateTimeField(default=datetime.datetime.now)
 
@@ -155 +155 @@
     updater_title = models.CharField(max_length=30, help_text="You need not hold any particular title in the group, but we like to know who is completing the form.")
     
-    group = models.ForeignKey(groups.models.Group, help_text="If your group does not appear in the list above, then please email asa-exec@mit.edu.")
+    group = models.ForeignKey(groups.models.Group, help_text="If your group does not appear in the list above, then please email asa-exec@mit.edu.", db_index=True, )
     group_email = models.EmailField(help_text="The text of the law will be automatically distributed to your members via this list, in order to comply with the law.")
     officer_email = models.EmailField()
@@ -196 +196 @@
     update_time = models.DateTimeField(default=datetime.datetime.utcfromtimestamp(0))
     username = models.CharField(max_length=30)
-    cycle = models.ForeignKey(GroupConfirmationCycle)
+    cycle = models.ForeignKey(GroupConfirmationCycle, db_index=True, )
     deleted = models.DateTimeField(default=None, null=True, blank=True, )
     valid = models.IntegerField(choices=VALID_CHOICES, default=VALID_UNSET)

asadb/groups/models.py

@@ -23 +23 @@
 
 class Group(models.Model):
-    name = models.CharField(max_length=100)
-    abbreviation = models.CharField(max_length=10, blank=True)
+    name = models.CharField(max_length=100, db_index=True, )
+    abbreviation = models.CharField(max_length=10, blank=True, db_index=True, )
     description = models.TextField()
-    activity_category = models.ForeignKey('ActivityCategory', null=True, blank=True, )
-    group_class = models.ForeignKey('GroupClass')
-    group_status = models.ForeignKey('GroupStatus')
-    group_funding = models.ForeignKey('GroupFunding', null=True, blank=True, )
+    activity_category = models.ForeignKey('ActivityCategory', null=True, blank=True, db_index=True, )
+    group_class = models.ForeignKey('GroupClass', db_index=True, )
+    group_status = models.ForeignKey('GroupStatus', db_index=True, )
+    group_funding = models.ForeignKey('GroupFunding', null=True, blank=True, db_index=True, )
     website_url = models.URLField()
     constitution_url = models.CharField(max_length=200, blank=True)
@@ -225 +225 @@
 
 class GroupStartup(models.Model):
-    group = models.ForeignKey(Group)
+    group = models.ForeignKey(Group, unique=True, )
     stage = models.IntegerField(choices=GROUP_STARTUP_STAGE)
     submitter = models.CharField(max_length=30, editable=False, )
@@ -239 +239 @@
 
 class GroupNote(models.Model):
-    author = models.CharField(max_length=30, ) # match Django username field
+    author = models.CharField(max_length=30, db_index=True, ) # match Django username field
     timestamp = models.DateTimeField(default=datetime.datetime.now, editable=False, )
     body = models.TextField()
     acl_read_group = models.BooleanField(default=True, help_text='Can the group read this note')
     acl_read_offices = models.BooleanField(default=True, help_text='Can "offices" that interact with groups (SAO, CAC, and funding boards) read this note')
-    group = models.ForeignKey(Group)
+    group = models.ForeignKey(Group, db_index=True, )
 
     def __str__(self, ):
@@ -274 +274 @@
 
     display_name = models.CharField(max_length=50)
-    slug = models.SlugField()
+    slug = models.SlugField(unique=True, )
     description = models.TextField()
     max_count = models.IntegerField(default=UNLIMITED, help_text='Maximum number of holders of this role. Use %d for no limit.' % UNLIMITED)
@@ -314 +314 @@
     END_NEVER       = datetime.datetime.max
 
-    person = models.CharField(max_length=30)
-    role = models.ForeignKey('OfficerRole')
-    group = models.ForeignKey('Group')
-    start_time = models.DateTimeField(default=datetime.datetime.now)
-    end_time = models.DateTimeField(default=datetime.datetime.max)
+    person = models.CharField(max_length=30, db_index=True, )
+    role = models.ForeignKey('OfficerRole', db_index=True, )
+    group = models.ForeignKey('Group', db_index=True, )
+    start_time = models.DateTimeField(default=datetime.datetime.now, db_index=True, )
+    end_time = models.DateTimeField(default=datetime.datetime.max, db_index=True, )
 
     objects = models.Manager()
@@ -433 +433 @@
 
 class AthenaMoiraAccount(models.Model):
-    username = models.CharField(max_length=8)
+    username = models.CharField(max_length=8, unique=True, )
     mit_id = models.CharField(max_length=15)
     first_name      = models.CharField(max_length=45)

asadb/space/models.py

@@ -98 +98 @@
     END_NEVER       = datetime.datetime.max
 
-    group = models.ForeignKey(groups.models.Group)
-    space = models.ForeignKey(Space)
-    start = models.DateField(default=datetime.datetime.now)
-    end = models.DateField(default=END_NEVER)
+    group = models.ForeignKey(groups.models.Group, db_index=True, )
+    space = models.ForeignKey(Space, db_index=True, )
+    start = models.DateField(default=datetime.datetime.now, db_index=True, )
+    end = models.DateField(default=END_NEVER, db_index=True, )
 
     notes = models.TextField(blank=True, )
@@ -139 +139 @@
     END_NEVER       = datetime.datetime.max
 
-    group = models.ForeignKey(groups.models.Group)
-    space = models.ForeignKey(Space)
-    start = models.DateTimeField(default=now_offset)
-    end = models.DateTimeField(default=END_NEVER)
+    group = models.ForeignKey(groups.models.Group, db_index=True, )
+    space = models.ForeignKey(Space, db_index=True, )
+    start = models.DateTimeField(default=now_offset, db_index=True, )
+    end = models.DateTimeField(default=END_NEVER, db_index=True, )
 
     name = models.CharField(max_length=50)