From eb1dc9a3916c0204c930baa13aefae1be8d13b61 Mon Sep 17 00:00:00 2001 From: "Konstantin L. Metlov" Date: Wed, 21 Dec 2022 22:49:18 +0300 Subject: added on_delete=models.CASCADE to all models.OneToOneField invocations Signed-off-by: Konstantin L. Metlov --- src/lib/Bcfg2/Reporting/migrations/0001_initial.py | 4 ++-- src/lib/Bcfg2/Reporting/south_migrations/0001_initial.py | 8 ++++---- .../Reporting/south_migrations/0002_convert_perms_to_mode.py | 4 ++-- src/lib/Bcfg2/Reporting/south_migrations/0003_expand_hash_key.py | 4 ++-- .../Bcfg2/Reporting/south_migrations/0004_profile_can_be_null.py | 4 ++-- .../Reporting/south_migrations/0005_add_selinux_entry_support.py | 4 ++-- .../south_migrations/0006_add_user_group_entry_support.py | 4 ++-- .../south_migrations/0007_add_flag_fields_interaction.py | 4 ++-- src/lib/Bcfg2/Server/Reports/reports/models.py | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/lib/Bcfg2/Reporting/migrations/0001_initial.py b/src/lib/Bcfg2/Reporting/migrations/0001_initial.py index 8956dc0c6..8056ce483 100644 --- a/src/lib/Bcfg2/Reporting/migrations/0001_initial.py +++ b/src/lib/Bcfg2/Reporting/migrations/0001_initial.py @@ -167,7 +167,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='LinkEntry', fields=[ - ('pathentry_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='Reporting.PathEntry')), + ('pathentry_ptr', models.OneToOneField(parent_link=True, auto_created=True, on_delete = models.CASCADE, primary_key=True, serialize=False, to='Reporting.PathEntry')), ('target_path', models.CharField(max_length=1024, blank=True)), ('current_path', models.CharField(max_length=1024, blank=True)), ], @@ -180,7 +180,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='DeviceEntry', fields=[ - ('pathentry_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='Reporting.PathEntry')), + ('pathentry_ptr', models.OneToOneField(parent_link=True, auto_created=True, on_delete = models.CASCADE, primary_key=True, serialize=False, to='Reporting.PathEntry')), ('device_type', models.CharField(max_length=16, choices=[(b'block', b'Block'), (b'char', b'Char'), (b'fifo', b'Fifo')])), ('target_major', models.IntegerField()), ('target_minor', models.IntegerField()), diff --git a/src/lib/Bcfg2/Reporting/south_migrations/0001_initial.py b/src/lib/Bcfg2/Reporting/south_migrations/0001_initial.py index 7b2e10ee7..b66f0e1e0 100644 --- a/src/lib/Bcfg2/Reporting/south_migrations/0001_initial.py +++ b/src/lib/Bcfg2/Reporting/south_migrations/0001_initial.py @@ -216,7 +216,7 @@ class Migration(SchemaMigration): # Adding model 'LinkEntry' db.create_table('Reporting_linkentry', ( - ('pathentry_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['Reporting.PathEntry'], unique=True, primary_key=True)), + ('pathentry_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['Reporting.PathEntry'], unique=True, on_delete = models.CASCADE, primary_key=True)), ('target_path', self.gf('django.db.models.fields.CharField')(max_length=1024, blank=True)), ('current_path', self.gf('django.db.models.fields.CharField')(max_length=1024, blank=True)), )) @@ -224,7 +224,7 @@ class Migration(SchemaMigration): # Adding model 'DeviceEntry' db.create_table('Reporting_deviceentry', ( - ('pathentry_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['Reporting.PathEntry'], unique=True, primary_key=True)), + ('pathentry_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['Reporting.PathEntry'], unique=True, on_delete = models.CASCADE, primary_key=True)), ('device_type', self.gf('django.db.models.fields.CharField')(max_length=16)), ('target_major', self.gf('django.db.models.fields.IntegerField')()), ('target_minor', self.gf('django.db.models.fields.IntegerField')()), @@ -355,7 +355,7 @@ class Migration(SchemaMigration): 'current_major': ('django.db.models.fields.IntegerField', [], {}), 'current_minor': ('django.db.models.fields.IntegerField', [], {}), 'device_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}), - 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}), + 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'on_delete': 'models.CASCADE', 'primary_key': 'True'}), 'target_major': ('django.db.models.fields.IntegerField', [], {}), 'target_minor': ('django.db.models.fields.IntegerField', [], {}) }, @@ -415,7 +415,7 @@ class Migration(SchemaMigration): 'Reporting.linkentry': { 'Meta': {'ordering': "('state', 'name')", 'object_name': 'LinkEntry', '_ormbases': ['Reporting.PathEntry']}, 'current_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}), - 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}), + 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'on_delete': 'models.CASCADE', 'primary_key': 'True'}), 'target_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}) }, 'Reporting.packageentry': { diff --git a/src/lib/Bcfg2/Reporting/south_migrations/0002_convert_perms_to_mode.py b/src/lib/Bcfg2/Reporting/south_migrations/0002_convert_perms_to_mode.py index 268e9fcee..611bcfa8f 100644 --- a/src/lib/Bcfg2/Reporting/south_migrations/0002_convert_perms_to_mode.py +++ b/src/lib/Bcfg2/Reporting/south_migrations/0002_convert_perms_to_mode.py @@ -60,7 +60,7 @@ class Migration(SchemaMigration): 'current_major': ('django.db.models.fields.IntegerField', [], {}), 'current_minor': ('django.db.models.fields.IntegerField', [], {}), 'device_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}), - 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}), + 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'on_delete': 'models.CASCADE', 'primary_key': 'True'}), 'target_major': ('django.db.models.fields.IntegerField', [], {}), 'target_minor': ('django.db.models.fields.IntegerField', [], {}) }, @@ -120,7 +120,7 @@ class Migration(SchemaMigration): 'Reporting.linkentry': { 'Meta': {'ordering': "('state', 'name')", 'object_name': 'LinkEntry', '_ormbases': ['Reporting.PathEntry']}, 'current_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}), - 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}), + 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'on_delete': 'models.CASCADE', 'primary_key': 'True'}), 'target_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}) }, 'Reporting.packageentry': { diff --git a/src/lib/Bcfg2/Reporting/south_migrations/0003_expand_hash_key.py b/src/lib/Bcfg2/Reporting/south_migrations/0003_expand_hash_key.py index 8f65939be..de27ee879 100644 --- a/src/lib/Bcfg2/Reporting/south_migrations/0003_expand_hash_key.py +++ b/src/lib/Bcfg2/Reporting/south_migrations/0003_expand_hash_key.py @@ -70,7 +70,7 @@ class Migration(SchemaMigration): 'current_major': ('django.db.models.fields.IntegerField', [], {}), 'current_minor': ('django.db.models.fields.IntegerField', [], {}), 'device_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}), - 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}), + 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'on_delete': 'models.CASCADE', 'primary_key': 'True'}), 'target_major': ('django.db.models.fields.IntegerField', [], {}), 'target_minor': ('django.db.models.fields.IntegerField', [], {}) }, @@ -130,7 +130,7 @@ class Migration(SchemaMigration): 'Reporting.linkentry': { 'Meta': {'ordering': "('state', 'name')", 'object_name': 'LinkEntry', '_ormbases': ['Reporting.PathEntry']}, 'current_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}), - 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}), + 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'on_delete': 'models.CASCADE', 'primary_key': 'True'}), 'target_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}) }, 'Reporting.packageentry': { diff --git a/src/lib/Bcfg2/Reporting/south_migrations/0004_profile_can_be_null.py b/src/lib/Bcfg2/Reporting/south_migrations/0004_profile_can_be_null.py index da98386a9..f8f97185f 100644 --- a/src/lib/Bcfg2/Reporting/south_migrations/0004_profile_can_be_null.py +++ b/src/lib/Bcfg2/Reporting/south_migrations/0004_profile_can_be_null.py @@ -46,7 +46,7 @@ class Migration(SchemaMigration): 'current_major': ('django.db.models.fields.IntegerField', [], {}), 'current_minor': ('django.db.models.fields.IntegerField', [], {}), 'device_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}), - 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}), + 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'on_delete': 'models.CASCADE', 'primary_key': 'True'}), 'target_major': ('django.db.models.fields.IntegerField', [], {}), 'target_minor': ('django.db.models.fields.IntegerField', [], {}) }, @@ -106,7 +106,7 @@ class Migration(SchemaMigration): 'Reporting.linkentry': { 'Meta': {'ordering': "('state', 'name')", 'object_name': 'LinkEntry', '_ormbases': ['Reporting.PathEntry']}, 'current_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}), - 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}), + 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'on_delete': 'models.CASCADE', 'primary_key': 'True'}), 'target_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}) }, 'Reporting.packageentry': { diff --git a/src/lib/Bcfg2/Reporting/south_migrations/0005_add_selinux_entry_support.py b/src/lib/Bcfg2/Reporting/south_migrations/0005_add_selinux_entry_support.py index 38cc9d4e1..b540411cb 100644 --- a/src/lib/Bcfg2/Reporting/south_migrations/0005_add_selinux_entry_support.py +++ b/src/lib/Bcfg2/Reporting/south_migrations/0005_add_selinux_entry_support.py @@ -275,7 +275,7 @@ class Migration(SchemaMigration): 'current_major': ('django.db.models.fields.IntegerField', [], {}), 'current_minor': ('django.db.models.fields.IntegerField', [], {}), 'device_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}), - 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}), + 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'on_delete': 'models.CASCADE', 'primary_key': 'True'}), 'target_major': ('django.db.models.fields.IntegerField', [], {}), 'target_minor': ('django.db.models.fields.IntegerField', [], {}) }, @@ -344,7 +344,7 @@ class Migration(SchemaMigration): 'Reporting.linkentry': { 'Meta': {'ordering': "('state', 'name')", 'object_name': 'LinkEntry', '_ormbases': ['Reporting.PathEntry']}, 'current_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}), - 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}), + 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'on_delete': 'models.CASCADE', 'primary_key': 'True'}), 'target_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}) }, 'Reporting.packageentry': { diff --git a/src/lib/Bcfg2/Reporting/south_migrations/0006_add_user_group_entry_support.py b/src/lib/Bcfg2/Reporting/south_migrations/0006_add_user_group_entry_support.py index ea4fbd939..ba2bc20f9 100644 --- a/src/lib/Bcfg2/Reporting/south_migrations/0006_add_user_group_entry_support.py +++ b/src/lib/Bcfg2/Reporting/south_migrations/0006_add_user_group_entry_support.py @@ -100,7 +100,7 @@ class Migration(SchemaMigration): 'current_major': ('django.db.models.fields.IntegerField', [], {}), 'current_minor': ('django.db.models.fields.IntegerField', [], {}), 'device_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}), - 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}), + 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'on_delete': 'models.CASCADE', 'primary_key': 'True'}), 'target_major': ('django.db.models.fields.IntegerField', [], {}), 'target_minor': ('django.db.models.fields.IntegerField', [], {}) }, @@ -171,7 +171,7 @@ class Migration(SchemaMigration): 'Reporting.linkentry': { 'Meta': {'ordering': "('state', 'name')", 'object_name': 'LinkEntry', '_ormbases': ['Reporting.PathEntry']}, 'current_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}), - 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}), + 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'on_delete': 'models.CASCADE', 'primary_key': 'True'}), 'target_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}) }, 'Reporting.packageentry': { diff --git a/src/lib/Bcfg2/Reporting/south_migrations/0007_add_flag_fields_interaction.py b/src/lib/Bcfg2/Reporting/south_migrations/0007_add_flag_fields_interaction.py index 75ff30798..a96c8cb20 100644 --- a/src/lib/Bcfg2/Reporting/south_migrations/0007_add_flag_fields_interaction.py +++ b/src/lib/Bcfg2/Reporting/south_migrations/0007_add_flag_fields_interaction.py @@ -56,7 +56,7 @@ class Migration(SchemaMigration): 'current_major': ('django.db.models.fields.IntegerField', [], {}), 'current_minor': ('django.db.models.fields.IntegerField', [], {}), 'device_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}), - 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}), + 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'on_delete': 'models.CASCADE', 'primary_key': 'True'}), 'target_major': ('django.db.models.fields.IntegerField', [], {}), 'target_minor': ('django.db.models.fields.IntegerField', [], {}) }, @@ -129,7 +129,7 @@ class Migration(SchemaMigration): 'Reporting.linkentry': { 'Meta': {'ordering': "('state', 'name')", 'object_name': 'LinkEntry', '_ormbases': ['Reporting.PathEntry']}, 'current_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}), - 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'primary_key': 'True'}), + 'pathentry_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['Reporting.PathEntry']", 'unique': 'True', 'on_delete': 'models.CASCADE', 'primary_key': 'True'}), 'target_path': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}) }, 'Reporting.packageentry': { diff --git a/src/lib/Bcfg2/Server/Reports/reports/models.py b/src/lib/Bcfg2/Server/Reports/reports/models.py index b915fbf4d..ce7912027 100644 --- a/src/lib/Bcfg2/Server/Reports/reports/models.py +++ b/src/lib/Bcfg2/Server/Reports/reports/models.py @@ -395,7 +395,7 @@ class InteractionMetadata(models.Model): Hold extra data associated with the client and interaction """ - interaction = models.OneToOneField(Interaction, primary_key=True, related_name='metadata') + interaction = models.OneToOneField(Interaction, on_delete = models.CASCADE, primary_key=True, related_name='metadata') profile = models.ForeignKey(Group, related_name="+", on_delete=models.CASCADE) groups = models.ManyToManyField(Group) bundles = models.ManyToManyField(Bundle) -- cgit v1.2.3-1-g7c22