Skip to content

Commit b455a1d

Browse files
author
Gabriel Monroy
committed
reset south migrations, and add uniqueness contraint on builds fixes #30 
1 parent 0ac52a8 commit b455a1d

5 files changed

Lines changed: 14 additions & 680 deletions

‎api/migrations/0001_initial.py‎

Lines changed: 13 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def forwards(self, orm):
3030
('owner', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
3131
('id', self.gf('django.db.models.fields.SlugField')(max_length=64)),
3232
('type', self.gf('django.db.models.fields.SlugField')(max_length=16)),
33-
('creds', self.gf('api.fields.CredentialsField')(default=u'null')),
33+
('creds', self.gf('api.fields.CredentialsField')(default=u'null', blank=True)),
3434
))
3535
db.send_create_signal(u'api', ['Provider'])
3636

@@ -120,9 +120,7 @@ def forwards(self, orm):
120120
('node', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api.Node'])),
121121
('type', self.gf('django.db.models.fields.CharField')(max_length=128)),
122122
('num', self.gf('django.db.models.fields.PositiveIntegerField')()),
123-
('id', self.gf('django.db.models.fields.CharField')(max_length=128, blank=True)),
124-
('port', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True)),
125-
('metadata', self.gf('json_field.fields.JSONField')(default=u'null', blank=True)),
123+
('status', self.gf('django.db.models.fields.CharField')(default=u'up', max_length=64)),
126124
))
127125
db.send_create_signal(u'api', ['Container'])
128126

@@ -151,7 +149,6 @@ def forwards(self, orm):
151149
('updated', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
152150
('owner', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
153151
('formation', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api.Formation'])),
154-
('version', self.gf('django.db.models.fields.PositiveIntegerField')()),
155152
('sha', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
156153
('output', self.gf('django.db.models.fields.TextField')(blank=True)),
157154
('procfile', self.gf('api.fields.ProcfileField')(default=u'null', blank=True)),
@@ -163,8 +160,8 @@ def forwards(self, orm):
163160
))
164161
db.send_create_signal(u'api', ['Build'])
165162

166-
# Adding unique constraint on 'Build', fields ['formation', 'version']
167-
db.create_unique(u'api_build', ['formation_id', 'version'])
163+
# Adding unique constraint on 'Build', fields ['formation', 'uuid']
164+
db.create_unique(u'api_build', ['formation_id', 'uuid'])
168165

169166
# Adding model 'Release'
170167
db.create_table(u'api_release', (
@@ -175,42 +172,21 @@ def forwards(self, orm):
175172
('formation', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api.Formation'])),
176173
('version', self.gf('django.db.models.fields.PositiveIntegerField')()),
177174
('config', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api.Config'])),
178-
('image', self.gf('django.db.models.fields.CharField')(default=u'ubuntu', max_length=256)),
175+
('image', self.gf('django.db.models.fields.CharField')(default=u'deis/buildstep', max_length=256)),
179176
('build', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api.Build'], null=True, blank=True)),
180177
))
181178
db.send_create_signal(u'api', ['Release'])
182179

183180
# Adding unique constraint on 'Release', fields ['formation', 'version']
184181
db.create_unique(u'api_release', ['formation_id', 'version'])
185182

186-
# Adding model 'Access'
187-
db.create_table(u'api_access', (
188-
('uuid', self.gf('api.fields.UuidField')(unique=True, max_length=32, primary_key=True)),
189-
('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
190-
('updated', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
191-
('owner', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
192-
('formation', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api.Formation'])),
193-
('role', self.gf('django.db.models.fields.CharField')(default=u'user', max_length=6)),
194-
))
195-
db.send_create_signal(u'api', ['Access'])
196-
197-
# Adding model 'Event'
198-
db.create_table(u'api_event', (
199-
('uuid', self.gf('api.fields.UuidField')(unique=True, max_length=32, primary_key=True)),
200-
('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
201-
('updated', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
202-
('owner', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
203-
('formation', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api.Formation'])),
204-
))
205-
db.send_create_signal(u'api', ['Event'])
206-
207183

208184
def backwards(self, orm):
209185
# Removing unique constraint on 'Release', fields ['formation', 'version']
210186
db.delete_unique(u'api_release', ['formation_id', 'version'])
211187

212-
# Removing unique constraint on 'Build', fields ['formation', 'version']
213-
db.delete_unique(u'api_build', ['formation_id', 'version'])
188+
# Removing unique constraint on 'Build', fields ['formation', 'uuid']
189+
db.delete_unique(u'api_build', ['formation_id', 'uuid'])
214190

215191
# Removing unique constraint on 'Config', fields ['formation', 'version']
216192
db.delete_unique(u'api_config', ['formation_id', 'version'])
@@ -266,25 +242,10 @@ def backwards(self, orm):
266242
# Deleting model 'Release'
267243
db.delete_table(u'api_release')
268244

269-
# Deleting model 'Access'
270-
db.delete_table(u'api_access')
271-
272-
# Deleting model 'Event'
273-
db.delete_table(u'api_event')
274-
275245

276246
models = {
277-
u'api.access': {
278-
'Meta': {'object_name': 'Access'},
279-
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
280-
'formation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Formation']"}),
281-
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
282-
'role': ('django.db.models.fields.CharField', [], {'default': "u'user'", 'max_length': '6'}),
283-
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
284-
'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'})
285-
},
286247
u'api.build': {
287-
'Meta': {'ordering': "[u'-created']", 'unique_together': "((u'formation', u'version'),)", 'object_name': 'Build'},
248+
'Meta': {'ordering': "[u'-created']", 'unique_together': "((u'formation', u'uuid'),)", 'object_name': 'Build'},
288249
'checksum': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
289250
'config': ('api.fields.EnvVarsField', [], {'default': "u'null'", 'blank': 'True'}),
290251
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
@@ -297,8 +258,7 @@ def backwards(self, orm):
297258
'size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
298259
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
299260
'url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
300-
'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'}),
301-
'version': ('django.db.models.fields.PositiveIntegerField', [], {})
261+
'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'})
302262
},
303263
u'api.config': {
304264
'Meta': {'ordering': "[u'-created']", 'unique_together': "((u'formation', u'version'),)", 'object_name': 'Config'},
@@ -311,27 +271,17 @@ def backwards(self, orm):
311271
'version': ('django.db.models.fields.PositiveIntegerField', [], {})
312272
},
313273
u'api.container': {
314-
'Meta': {'unique_together': "((u'formation', u'type', u'num'),)", 'object_name': 'Container'},
274+
'Meta': {'ordering': "[u'created']", 'unique_together': "((u'formation', u'type', u'num'),)", 'object_name': 'Container'},
315275
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
316276
'formation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Formation']"}),
317-
'id': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
318-
'metadata': ('json_field.fields.JSONField', [], {'default': "u'null'", 'blank': 'True'}),
319277
'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Node']"}),
320278
'num': ('django.db.models.fields.PositiveIntegerField', [], {}),
321279
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
322-
'port': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
280+
'status': ('django.db.models.fields.CharField', [], {'default': "u'up'", 'max_length': '64'}),
323281
'type': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
324282
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
325283
'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'})
326284
},
327-
u'api.event': {
328-
'Meta': {'object_name': 'Event'},
329-
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
330-
'formation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Formation']"}),
331-
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
332-
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
333-
'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'})
334-
},
335285
u'api.flavor': {
336286
'Meta': {'unique_together': "((u'owner', u'id'),)", 'object_name': 'Flavor'},
337287
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
@@ -397,7 +347,7 @@ def backwards(self, orm):
397347
u'api.provider': {
398348
'Meta': {'unique_together': "((u'owner', u'id'),)", 'object_name': 'Provider'},
399349
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
400-
'creds': ('api.fields.CredentialsField', [], {'default': "u'null'"}),
350+
'creds': ('api.fields.CredentialsField', [], {'default': "u'null'", 'blank': 'True'}),
401351
'id': ('django.db.models.fields.SlugField', [], {'max_length': '64'}),
402352
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
403353
'type': ('django.db.models.fields.SlugField', [], {'max_length': '16'}),
@@ -410,7 +360,7 @@ def backwards(self, orm):
410360
'config': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Config']"}),
411361
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
412362
'formation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Formation']"}),
413-
'image': ('django.db.models.fields.CharField', [], {'default': "u'ubuntu'", 'max_length': '256'}),
363+
'image': ('django.db.models.fields.CharField', [], {'default': "u'deis/buildstep'", 'max_length': '256'}),
414364
'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
415365
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
416366
'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'}),

0 commit comments

Comments
 (0)