Revert most ordering changes in 1.1.5rc's, Restore patched dumpdata

beat/web/algorithms/migrations/0004_auto_20160704_1109.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-07-04 11:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('algorithms', '0003_auto_20160701_1707'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='algorithm',
+            options={'ordering': ['author__username', 'name', 'version']},
+        ),
+    ]

beat/web/common/models.py

@@ -381,9 +381,7 @@ class Versionable(Shareable):
 
     class Meta(Shareable.Meta):
         abstract = True
-
-        # setup ordering so that the dump order respects self dependencies
-        ordering = ['version', 'id']
+        ordering = ['name', '-version']
 
 
     #_____ Static Methods __________
@@ -554,6 +552,7 @@ class Contribution(Versionable):
 
     class Meta(Versionable.Meta):
         abstract = True
+        ordering = ['author__username', 'name', 'version']
         unique_together = ('author', 'name', 'version')
 
 

beat/web/databases/migrations/0005_auto_20160704_1109.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-07-04 11:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('databases', '0004_auto_20160701_1707'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='database',
+            options={'ordering': ['name', '-version']},
+        ),
+    ]

beat/web/databases/models.py

@@ -192,11 +192,6 @@ class Database(Versionable):
     class Meta(Versionable.Meta):
         unique_together = ('name', 'version')
 
-        # setup ordering so that the dump order respects self dependencies
-        # note: Versionable already has the right ordering - not sure why
-        # `django makemigrations' is not detecting it though.
-        ordering = ['version', 'id']
-
 
     #_____ Utilities __________
 

beat/web/dataformats/migrations/0003_auto_20160704_1109.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-07-04 11:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dataformats', '0002_auto_20160701_1712'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='dataformat',
+            options={'ordering': ['author__username', 'name', 'version'], 'verbose_name': 'dataformat', 'verbose_name_plural': 'dataformats'},
+        ),
+    ]

beat/web/libraries/migrations/0004_auto_20160704_1109.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-07-04 11:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('libraries', '0003_auto_20160701_1707'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='library',
+            options={'ordering': ['author__username', 'name', 'version'], 'verbose_name_plural': 'libraries'},
+        ),
+    ]

beat/web/plotters/migrations/0004_auto_20160704_1109.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-07-04 11:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('plotters', '0003_auto_20160701_1707'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='plotter',
+            options={'ordering': ['author__username', 'name', 'version']},
+        ),
+        migrations.AlterModelOptions(
+            name='plotterparameter',
+            options={'ordering': ['author__username', 'name', 'version']},
+        ),
+    ]

beat/web/toolchains/migrations/0004_auto_20160704_1109.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-07-04 11:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('toolchains', '0003_auto_20160701_1707'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='toolchain',
+            options={'ordering': ['author__username', 'name', 'version']},
+        ),
+    ]

beat/web/utils/management/commands/backup.py

@@ -149,7 +149,7 @@ class Command(BaseCommand):
             destfile = os.path.join(tmpdir, 'initial.json')
             logger.info("Dumping initial (unspecified) data -> `%s'", destfile)
             arguments['output'] = destfile #new in Django-1.8.x
-            call_command('beatdump', **arguments)
+            call_command('xdumpdata', **arguments)
 
             # and backs-up the apps respecting the imposed order
             for app in use_apps:
@@ -159,7 +159,7 @@ class Command(BaseCommand):
                 logger.info("Dumping data for `%s' -> `%s'", app, destfile)
 
                 arguments['output'] = destfile #new in Django-1.8.x
-                call_command('beatdump', only.get(app, app), **arguments)
+                call_command('xdumpdata', only.get(app, app), **arguments)
 
                 # copy prefix data
                 path = os.path.join(settings.PREFIX, app)

beat/web/utils/management/commands/beatdump.py → beat/web/utils/management/commands/xdumpdata.py

@@ -150,14 +150,19 @@ class Command(BaseCommand):
                     else:
                         objects = model._default_manager
 
-                    # BEAT PATCH: let default order take place
+                    # ###################################################
+                    # patch for BEAT starts here: respect self ordering
+                    # ###################################################
                     queryset = objects.using(using)
-                    # ORIGINAL LINE
-                    #queryset = objects.using(using).order_by(model._meta.pk.name)
 
                     if primary_keys:
-                        queryset = queryset.filter(pk__in=primary_keys)
-                    if count_only:
+                        # in case the user specifies PKs, respect order
+                        for pk in [int(k) for k in primary_keys]:
+                            yield queryset.get(pk=pk)
+                    elif count_only:
+                        # ###################################################
+                        # patch for BEAT ends here
+                        # ###################################################
                         yield queryset.order_by().count()
                     else:
                         for obj in queryset.iterator():