From f9d11df41969b2f68b6ec72a327bfad3430532b9 Mon Sep 17 00:00:00 2001 From: Graham Gilbert Date: Wed, 5 Jul 2017 16:09:54 -0700 Subject: [PATCH] Use big int for ids --- sal/version.plist | 2 +- server/migrations/0053_auto_20170705_1559.py | 25 ++++++++ server/migrations/0054_auto_20170705_1603.py | 60 ++++++++++++++++++++ server/models.py | 11 ++++ set_build_no.sh | 2 +- 5 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 server/migrations/0053_auto_20170705_1559.py create mode 100644 server/migrations/0054_auto_20170705_1603.py diff --git a/sal/version.plist b/sal/version.plist index 00030480..e2623825 100644 --- a/sal/version.plist +++ b/sal/version.plist @@ -3,6 +3,6 @@ version - 3.2.0.949 + 3.2.1.950 diff --git a/server/migrations/0053_auto_20170705_1559.py b/server/migrations/0053_auto_20170705_1559.py new file mode 100644 index 00000000..eb7e0c95 --- /dev/null +++ b/server/migrations/0053_auto_20170705_1559.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-07-05 22:59 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('server', '0052_auto_20170624_0851'), + ] + + operations = [ + migrations.AlterField( + model_name='condition', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='fact', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + ] diff --git a/server/migrations/0054_auto_20170705_1603.py b/server/migrations/0054_auto_20170705_1603.py new file mode 100644 index 00000000..8ce98037 --- /dev/null +++ b/server/migrations/0054_auto_20170705_1603.py @@ -0,0 +1,60 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-07-05 23:03 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('server', '0053_auto_20170705_1559'), + ] + + operations = [ + migrations.AlterField( + model_name='historicalfact', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='installedupdate', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='machine', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='pendingappleupdate', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='pendingupdate', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='pluginscriptrow', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='pluginscriptsubmission', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='updatehistory', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='updatehistoryitem', + name='id', + field=models.BigAutoField(primary_key=True, serialize=False), + ), + ] diff --git a/server/models.py b/server/models.py index f68ad6f0..b8791691 100644 --- a/server/models.py +++ b/server/models.py @@ -72,6 +72,7 @@ class Machine(models.Model): ('Windows', 'Windows'), ('Linux', 'Linux'), ) + id = models.BigAutoField(primary_key=True) machine_group = models.ForeignKey(MachineGroup) serial = models.CharField(db_index=True, max_length=100, unique=True) hostname = models.CharField(max_length=256, null=True, blank=True) @@ -209,6 +210,7 @@ def save(self, *args, **kwargs): super(Machine, self).save() class UpdateHistory(models.Model): + id = models.BigAutoField(primary_key=True) UPDATE_TYPE = ( ('third_party', '3rd Party'), ('apple', 'Apple'), @@ -225,6 +227,7 @@ class Meta: unique_together = (("machine", "name", "version", "update_type"),) class UpdateHistoryItem(models.Model): + id = models.BigAutoField(primary_key=True) UPDATE_STATUS = ( ('pending', 'Pending'), ('error', 'Error'), @@ -244,6 +247,7 @@ class Meta: class Fact(models.Model): + id = models.BigAutoField(primary_key=True) machine = models.ForeignKey(Machine, related_name='facts') fact_name = models.TextField(db_index=True) fact_data = models.TextField() @@ -253,6 +257,7 @@ class Meta: ordering = ['fact_name'] class HistoricalFact(models.Model): + id = models.BigAutoField(primary_key=True) machine = models.ForeignKey(Machine, related_name='historical_facts') fact_name = models.CharField(db_index=True, max_length=255) fact_data = models.TextField() @@ -263,6 +268,7 @@ class Meta: ordering = ['fact_name', 'fact_recorded'] class Condition(models.Model): + id = models.BigAutoField(primary_key=True) machine = models.ForeignKey(Machine, related_name='conditions') condition_name = models.CharField(max_length=255,db_index=True) condition_data = models.TextField(db_index=True) @@ -272,6 +278,7 @@ class Meta: ordering = ['condition_name'] class PluginScriptSubmission(models.Model): + id = models.BigAutoField(primary_key=True) machine = models.ForeignKey(Machine) plugin = models.CharField(db_index=True, max_length=255) historical = models.BooleanField(default=False) @@ -282,6 +289,7 @@ class Meta: ordering = ['recorded', 'plugin'] class PluginScriptRow(models.Model): + id = models.BigAutoField(primary_key=True) submission = models.ForeignKey(PluginScriptSubmission) pluginscript_name = models.TextField(db_index=True) pluginscript_data = models.TextField(blank=True, null=True, db_index=True) @@ -324,6 +332,7 @@ class Meta: ordering = ['pluginscript_name'] class PendingUpdate(models.Model): + id = models.BigAutoField(primary_key=True) machine = models.ForeignKey(Machine, related_name='pending_updates') update = models.CharField(db_index=True, max_length=255, null=True, blank=True) update_version = models.CharField(db_index=True, max_length=255, null=True, blank=True) @@ -334,6 +343,7 @@ class Meta: ordering = ['display_name'] class InstalledUpdate(models.Model): + id = models.BigAutoField(primary_key=True) machine = models.ForeignKey(Machine, related_name='installed_updates') update = models.CharField(db_index=True, max_length=255, null=True, blank=True) update_version = models.CharField(db_index=True, max_length=255, null=True, blank=True) @@ -346,6 +356,7 @@ class Meta: unique_together = ("machine", "update", "update_version") class PendingAppleUpdate(models.Model): + id = models.BigAutoField(primary_key=True) machine = models.ForeignKey(Machine, related_name='pending_apple_updates') update = models.CharField(db_index=True, max_length=255, null=True, blank=True) update_version = models.CharField(db_index=True, max_length=256, null=True, blank=True) diff --git a/set_build_no.sh b/set_build_no.sh index 5759515b..0e22120a 100755 --- a/set_build_no.sh +++ b/set_build_no.sh @@ -1,6 +1,6 @@ #!/bin/bash -current_version="3.2.0" +current_version="3.2.1" pushd `dirname $0` > /dev/null SCRIPTPATH=`pwd`