Correct constraints and remove label

getsentry · May 24, 2013 · efbafc1 · efbafc1
1 parent 913f981
commit efbafc1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/sentry/tsdb/migrations/0001_initial.py b/src/sentry/tsdb/migrations/0001_initial.py
@@ -12,7 +12,6 @@ def forwards(self, orm):
         db.create_table(u'tsdb_key', (
             (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
             ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=1000)),
-            ('label', self.gf('django.db.models.fields.CharField')(max_length=1000, null=True)),
         ))
         db.send_create_signal(u'tsdb', ['Key'])
 
@@ -26,8 +25,14 @@ def forwards(self, orm):
         ))
         db.send_create_signal(u'tsdb', ['Point'])
 
+        # Adding unique constraint on 'Point', fields ['key', 'rollup', 'epoch']
+        db.create_unique(u'tsdb_point', ['key_id', 'rollup', 'epoch'])
+
 
     def backwards(self, orm):
+        # Removing unique constraint on 'Point', fields ['key', 'rollup', 'epoch']
+        db.delete_unique(u'tsdb_point', ['key_id', 'rollup', 'epoch'])
+
         # Deleting model 'Key'
         db.delete_table(u'tsdb_key')
 
@@ -39,11 +44,10 @@ def backwards(self, orm):
         u'tsdb.key': {
             'Meta': {'object_name': 'Key'},
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'label': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1000'})
         },
         u'tsdb.point': {
-            'Meta': {'object_name': 'Point'},
+            'Meta': {'unique_together': "(('key', 'rollup', 'epoch'),)", 'object_name': 'Point'},
             'epoch': ('django.db.models.fields.PositiveIntegerField', [], {}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'key': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['tsdb.Key']"}),

diff --git a/src/sentry/tsdb/models.py b/src/sentry/tsdb/models.py
@@ -39,7 +39,6 @@
 
 class Key(models.Model):
     name = models.CharField(max_length=1000, unique=True)
-    label = models.CharField(max_length=1000, null=True)
 
     objects = BaseManager(cache_fields=['name'])
 
@@ -53,7 +52,9 @@ class Point(models.Model):
     objects = PointManager()
 
     class Meta:
-        index_together = (
+        unique_together = (
             ('key', 'rollup', 'epoch'),
+        )
+        index_together = (
             ('rollup', 'epoch'),
         )