From 4ee092152bdb748d4ff83fa035a30eabae5c4573 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Tue, 16 Dec 2014 18:01:49 -0500 Subject: [PATCH] Fix intermediate migrations to reflect modifications to 0055_v210_changes. --- awx/main/migrations/0055_v210_changes.py | 5 +++-- awx/main/migrations/0056_v210_changes.py | 5 +++-- awx/main/migrations/0057_v210_changes.py | 5 +++-- awx/main/migrations/0058_v210_changes.py | 5 +++-- awx/main/migrations/0059_v210_changes.py | 5 +++-- awx/main/migrations/0060_v210_changes.py | 5 +++-- awx/main/migrations/0061_v210_changes.py | 5 +++-- awx/main/migrations/0062_v210_changes.py | 5 +++-- awx/main/migrations/0063_v210_changes.py | 2 +- 9 files changed, 25 insertions(+), 17 deletions(-) diff --git a/awx/main/migrations/0055_v210_changes.py b/awx/main/migrations/0055_v210_changes.py index 08ef787ec6..42b52c56d4 100644 --- a/awx/main/migrations/0055_v210_changes.py +++ b/awx/main/migrations/0055_v210_changes.py @@ -147,7 +147,7 @@ class Migration(SchemaMigration): 'vault_password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}) }, 'main.custominventoryscript': { - 'Meta': {'ordering': "('name',)", 'object_name': 'CustomInventoryScript'}, + 'Meta': {'ordering': "('name',)", 'unique_together': "[('name', 'organization')]", 'object_name': 'CustomInventoryScript'}, 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_created+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), @@ -155,7 +155,8 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'modified_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_modified+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'False', 'max_length': '512'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'custom_inventory_scripts'", 'to': "orm['main.Organization']"}), 'script': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}) }, 'main.group': { diff --git a/awx/main/migrations/0056_v210_changes.py b/awx/main/migrations/0056_v210_changes.py index 0291afc6e0..632ea72abb 100644 --- a/awx/main/migrations/0056_v210_changes.py +++ b/awx/main/migrations/0056_v210_changes.py @@ -133,7 +133,7 @@ class Migration(SchemaMigration): 'vault_password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}) }, 'main.custominventoryscript': { - 'Meta': {'ordering': "('name',)", 'object_name': 'CustomInventoryScript'}, + 'Meta': {'ordering': "('name',)", 'unique_together': "[('name', 'organization')]", 'object_name': 'CustomInventoryScript'}, 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_created+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), @@ -141,7 +141,8 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'modified_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_modified+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'False', 'max_length': '512'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'custom_inventory_scripts'", 'to': "orm['main.Organization']"}), 'script': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}) }, 'main.group': { diff --git a/awx/main/migrations/0057_v210_changes.py b/awx/main/migrations/0057_v210_changes.py index 1ff37aeb7c..19ad745282 100644 --- a/awx/main/migrations/0057_v210_changes.py +++ b/awx/main/migrations/0057_v210_changes.py @@ -128,7 +128,7 @@ class Migration(SchemaMigration): 'vault_password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}) }, 'main.custominventoryscript': { - 'Meta': {'ordering': "('name',)", 'object_name': 'CustomInventoryScript'}, + 'Meta': {'ordering': "('name',)", 'unique_together': "[('name', 'organization')]", 'object_name': 'CustomInventoryScript'}, 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_created+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), @@ -136,7 +136,8 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'modified_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_modified+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'False', 'max_length': '512'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'custom_inventory_scripts'", 'to': "orm['main.Organization']"}), 'script': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}) }, 'main.group': { diff --git a/awx/main/migrations/0058_v210_changes.py b/awx/main/migrations/0058_v210_changes.py index 5abb296cf3..8ebd297027 100644 --- a/awx/main/migrations/0058_v210_changes.py +++ b/awx/main/migrations/0058_v210_changes.py @@ -139,7 +139,7 @@ class Migration(SchemaMigration): 'vault_password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}) }, 'main.custominventoryscript': { - 'Meta': {'ordering': "('name',)", 'object_name': 'CustomInventoryScript'}, + 'Meta': {'ordering': "('name',)", 'unique_together': "[('name', 'organization')]", 'object_name': 'CustomInventoryScript'}, 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_created+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), @@ -147,7 +147,8 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'modified_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_modified+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'False', 'max_length': '512'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'custom_inventory_scripts'", 'to': "orm['main.Organization']"}), 'script': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}) }, 'main.group': { diff --git a/awx/main/migrations/0059_v210_changes.py b/awx/main/migrations/0059_v210_changes.py index 89d12fa334..3caffd0828 100644 --- a/awx/main/migrations/0059_v210_changes.py +++ b/awx/main/migrations/0059_v210_changes.py @@ -129,7 +129,7 @@ class Migration(DataMigration): 'vault_password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}) }, 'main.custominventoryscript': { - 'Meta': {'ordering': "('name',)", 'object_name': 'CustomInventoryScript'}, + 'Meta': {'ordering': "('name',)", 'unique_together': "[('name', 'organization')]", 'object_name': 'CustomInventoryScript'}, 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_created+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), @@ -137,7 +137,8 @@ class Migration(DataMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'modified_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_modified+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'False', 'max_length': '512'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'custom_inventory_scripts'", 'to': "orm['main.Organization']"}), 'script': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}) }, 'main.group': { diff --git a/awx/main/migrations/0060_v210_changes.py b/awx/main/migrations/0060_v210_changes.py index b792388372..113bc5b0ed 100644 --- a/awx/main/migrations/0060_v210_changes.py +++ b/awx/main/migrations/0060_v210_changes.py @@ -113,7 +113,7 @@ class Migration(DataMigration): 'vault_password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}) }, 'main.custominventoryscript': { - 'Meta': {'ordering': "('name',)", 'object_name': 'CustomInventoryScript'}, + 'Meta': {'ordering': "('name',)", 'unique_together': "[('name', 'organization')]", 'object_name': 'CustomInventoryScript'}, 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_created+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), @@ -121,7 +121,8 @@ class Migration(DataMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'modified_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_modified+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'False', 'max_length': '512'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'custom_inventory_scripts'", 'to': "orm['main.Organization']"}), 'script': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}) }, 'main.group': { diff --git a/awx/main/migrations/0061_v210_changes.py b/awx/main/migrations/0061_v210_changes.py index 6eecea2146..26573c9e05 100644 --- a/awx/main/migrations/0061_v210_changes.py +++ b/awx/main/migrations/0061_v210_changes.py @@ -144,7 +144,7 @@ class Migration(SchemaMigration): 'vault_password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}) }, 'main.custominventoryscript': { - 'Meta': {'ordering': "('name',)", 'object_name': 'CustomInventoryScript'}, + 'Meta': {'ordering': "('name',)", 'unique_together': "[('name', 'organization')]", 'object_name': 'CustomInventoryScript'}, 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_created+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), @@ -152,7 +152,8 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'modified_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_modified+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'False', 'max_length': '512'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'custom_inventory_scripts'", 'to': "orm['main.Organization']"}), 'script': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}) }, 'main.group': { diff --git a/awx/main/migrations/0062_v210_changes.py b/awx/main/migrations/0062_v210_changes.py index 8444b7931f..f501b61c3f 100644 --- a/awx/main/migrations/0062_v210_changes.py +++ b/awx/main/migrations/0062_v210_changes.py @@ -123,7 +123,7 @@ class Migration(SchemaMigration): 'vault_password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}) }, 'main.custominventoryscript': { - 'Meta': {'ordering': "('name',)", 'object_name': 'CustomInventoryScript'}, + 'Meta': {'ordering': "('name',)", 'unique_together': "[('name', 'organization')]", 'object_name': 'CustomInventoryScript'}, 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_created+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), @@ -131,7 +131,8 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'modified_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_modified+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'False', 'max_length': '512'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'custom_inventory_scripts'", 'to': "orm['main.Organization']"}), 'script': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}) }, 'main.group': { diff --git a/awx/main/migrations/0063_v210_changes.py b/awx/main/migrations/0063_v210_changes.py index a74c7c04b6..2b55481455 100644 --- a/awx/main/migrations/0063_v210_changes.py +++ b/awx/main/migrations/0063_v210_changes.py @@ -131,7 +131,7 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}), 'modified_by': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': '"{\'class\': \'custominventoryscript\', \'app_label\': \'main\'}(class)s_modified+"', 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['auth.User']"}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'False', 'max_length': '512'}), 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'custom_inventory_scripts'", 'to': "orm['main.Organization']"}), 'script': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}) },