Merge 910f049 into 5223598

.pre-commit-config.yaml

@@ -27,9 +27,11 @@
         aiida/backends/djsite/db/migrations/0011_delete_kombu_tables.py|
         aiida/backends/djsite/db/migrations/0012_drop_dblock.py|
         aiida/backends/djsite/db/migrations/0013_django_1_8.py|
+        aiida/backends/djsite/db/migrations/0014_add_node_uuid_unique_constraint.py|
         aiida/backends/djsite/db/migrations/__init__.py|
         aiida/backends/djsite/db/models.py|
         aiida/backends/djsite/db/subtests/djangomigrations.py|
+        aiida/backends/djsite/db/subtests/migrations.py|
         aiida/backends/djsite/db/subtests/generic.py|
         aiida/backends/djsite/db/subtests/__init__.py|
         aiida/backends/djsite/db/subtests/nodes.py|
@@ -67,6 +69,7 @@
         aiida/backends/sqlalchemy/migrations/versions/a6048f0ffca8_update_linktypes.py|
         aiida/backends/sqlalchemy/migrations/versions/e15ef2630a1b_initial_schema.py|
         aiida/backends/sqlalchemy/migrations/versions/f9a69de76a9a_delete_kombu_tables.py|
+        aiida/backends/sqlalchemy/migrations/versions/62fe0d36de90_add_node_uuid_unique_constraint.py|
         aiida/backends/sqlalchemy/models/authinfo.py|
         aiida/backends/sqlalchemy/models/base.py|
         aiida/backends/sqlalchemy/models/comment.py|

aiida/backends/djsite/db/migrations/0001_initial.py

@@ -8,19 +8,19 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 from __future__ import unicode_literals
-
 from __future__ import absolute_import
+
 from django.db import models, migrations
 import django.db.models.deletion
 import django.utils.timezone
 from django.conf import settings
 import django_extensions.db.fields
 
-from aiida.backends.djsite.db.migrations import update_schema_version
-
+from aiida.backends.djsite.db.migrations import upgrade_schema_version
 
 
-SCHEMA_VERSION = "1.0.1"
+REVISION = '1.0.1'
+DOWN_REVISION = '1.0.0'
 
 
 class Migration(migrations.Migration):
@@ -456,5 +456,5 @@ class Migration(migrations.Migration):
             name='dbattribute',
             unique_together=set([('dbnode', 'key')]),
         ),
-        update_schema_version(SCHEMA_VERSION)
+        upgrade_schema_version(REVISION, DOWN_REVISION)
     ]

aiida/backends/djsite/db/migrations/0002_db_state_change.py

@@ -8,14 +8,15 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 from __future__ import unicode_literals
-
 from __future__ import absolute_import
+
 from django.db import models, migrations
 
-from aiida.backends.djsite.db.migrations import update_schema_version
+from aiida.backends.djsite.db.migrations import upgrade_schema_version
 
 
-SCHEMA_VERSION = "1.0.2"
+REVISION = '1.0.2'
+DOWN_REVISION = '1.0.1'
 
 
 def fix_calc_states(apps, schema_editor):
@@ -60,5 +61,5 @@ class Migration(migrations.Migration):
         ),
         # Fix up any calculation states that had one of the removed states
         migrations.RunPython(fix_calc_states),
-        update_schema_version(SCHEMA_VERSION)
+        upgrade_schema_version(REVISION, DOWN_REVISION)
     ]

aiida/backends/djsite/db/migrations/0003_add_link_type.py

@@ -8,15 +8,15 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 from __future__ import unicode_literals
-
 from __future__ import absolute_import
+
 from django.db import models, migrations
 import aiida.utils.timezone
-from aiida.backends.djsite.db.migrations import update_schema_version
-
+from aiida.backends.djsite.db.migrations import upgrade_schema_version
 
 
-SCHEMA_VERSION = "1.0.3"
+REVISION = '1.0.3'
+DOWN_REVISION = '1.0.2'
 
 
 class Migration(migrations.Migration):
@@ -96,5 +96,5 @@ class Migration(migrations.Migration):
             name='dblink',
             unique_together=set([]),
         ),
-        update_schema_version(SCHEMA_VERSION)
+        upgrade_schema_version(REVISION, DOWN_REVISION)
     ]

aiida/backends/djsite/db/migrations/0004_add_daemon_and_uuid_indices.py

@@ -8,15 +8,16 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 from __future__ import unicode_literals
-
 from __future__ import absolute_import
+
 import django_extensions.db.fields
 from django.db import migrations
 
-from aiida.backends.djsite.db.migrations import update_schema_version
+from aiida.backends.djsite.db.migrations import upgrade_schema_version
 
 
-SCHEMA_VERSION = "1.0.4"
+REVISION = '1.0.4'
+DOWN_REVISION = '1.0.3'
 
 
 class Migration(migrations.Migration):
@@ -44,5 +45,5 @@ class Migration(migrations.Migration):
                                                         blank=True),
             preserve_default=True,
         ),
-        update_schema_version(SCHEMA_VERSION)
+        upgrade_schema_version(REVISION, DOWN_REVISION)
     ]

aiida/backends/djsite/db/migrations/0005_add_cmtime_indices.py

@@ -8,14 +8,15 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 from __future__ import unicode_literals
-
 from __future__ import absolute_import
+
 from django.db import models, migrations
 import aiida.utils.timezone
-from aiida.backends.djsite.db.migrations import update_schema_version
+from aiida.backends.djsite.db.migrations import upgrade_schema_version
 
 
-SCHEMA_VERSION = "1.0.5"
+REVISION = '1.0.5'
+DOWN_REVISION = '1.0.4'
 
 
 class Migration(migrations.Migration):
@@ -37,5 +38,5 @@ class Migration(migrations.Migration):
             field=models.DateTimeField(auto_now=True, db_index=True),
             preserve_default=True,
         ),
-        update_schema_version(SCHEMA_VERSION)
+        upgrade_schema_version(REVISION, DOWN_REVISION)
     ]

aiida/backends/djsite/db/migrations/0006_delete_dbpath.py

@@ -8,13 +8,15 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 from __future__ import unicode_literals
-
 from __future__ import absolute_import
-from django.db import models, migrations
-from aiida.backends.djsite.db.migrations import update_schema_version
 
+from django.db import migrations
+from aiida.backends.djsite.db.migrations import upgrade_schema_version
+
+
+REVISION = '1.0.6'
+DOWN_REVISION = '1.0.5'
 
-SCHEMA_VERSION = "1.0.6"
 
 class Migration(migrations.Migration):
 
@@ -42,6 +44,6 @@ class Migration(migrations.Migration):
             DROP TRIGGER IF EXISTS autoupdate_tc ON db_dblink;
             DROP FUNCTION IF EXISTS update_tc();
         """),
-        update_schema_version(SCHEMA_VERSION)
+        upgrade_schema_version(REVISION, DOWN_REVISION)
 
     ]

aiida/backends/djsite/db/migrations/0007_update_linktypes.py

@@ -8,13 +8,15 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 from __future__ import unicode_literals
-
 from __future__ import absolute_import
-from django.db import models, migrations
-from aiida.backends.djsite.db.migrations import update_schema_version
 
+from django.db import migrations
+from aiida.backends.djsite.db.migrations import upgrade_schema_version
+
+
+REVISION = '1.0.8'
+DOWN_REVISION = '1.0.7'
 
-SCHEMA_VERSION = "1.0.7"
 
 class Migration(migrations.Migration):
 
@@ -126,6 +128,6 @@ class Migration(migrations.Migration):
                     AND ( db_dblink_1.type = null  OR db_dblink_1.type = '')
             );
         """),
-        update_schema_version(SCHEMA_VERSION)
+        upgrade_schema_version(REVISION, DOWN_REVISION)
 
     ]

aiida/backends/djsite/db/migrations/0008_code_hidden_to_extra.py

@@ -8,13 +8,15 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 from __future__ import unicode_literals
-
 from __future__ import absolute_import
-from django.db import models, migrations
-from aiida.backends.djsite.db.migrations import update_schema_version
 
+from django.db import migrations
+from aiida.backends.djsite.db.migrations import upgrade_schema_version
+
+
+REVISION = '1.0.8'
+DOWN_REVISION = '1.0.7'
 
-SCHEMA_VERSION = "1.0.8"
 
 class Migration(migrations.Migration):
 
@@ -46,5 +48,5 @@ class Migration(migrations.Migration):
                 WHERE db_dbattribute.key = 'hidden' AND db_dbnode.type = 'code.Code.'
             );
         """),
-        update_schema_version(SCHEMA_VERSION)
+        upgrade_schema_version(REVISION, DOWN_REVISION)
     ]

aiida/backends/djsite/db/migrations/0009_base_data_plugin_type_string.py

@@ -8,13 +8,15 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 from __future__ import unicode_literals
-
 from __future__ import absolute_import
-from django.db import models, migrations
-from aiida.backends.djsite.db.migrations import update_schema_version
 
+from django.db import migrations
+from aiida.backends.djsite.db.migrations import upgrade_schema_version
+
+
+REVISION = '1.0.9'
+DOWN_REVISION = '1.0.8'
 
-SCHEMA_VERSION = "1.0.9"
 
 class Migration(migrations.Migration):
 
@@ -33,5 +35,5 @@ class Migration(migrations.Migration):
             UPDATE db_dbnode SET type = 'data.str.Str.' WHERE type = 'data.base.Str.';
             UPDATE db_dbnode SET type = 'data.list.List.' WHERE type = 'data.base.List.';
         """),
-        update_schema_version(SCHEMA_VERSION)
+        upgrade_schema_version(REVISION, DOWN_REVISION)
     ]

aiida/backends/djsite/db/migrations/0010_process_type.py

@@ -8,13 +8,15 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 from __future__ import unicode_literals
-
 from __future__ import absolute_import
+
 from django.db import models, migrations
-from aiida.backends.djsite.db.migrations import update_schema_version
+from aiida.backends.djsite.db.migrations import upgrade_schema_version
+
 
+REVISION = '1.0.10'
+DOWN_REVISION = '1.0.9'
 
-SCHEMA_VERSION = "1.0.10"
 
 class Migration(migrations.Migration):
 
@@ -28,5 +30,5 @@ class Migration(migrations.Migration):
             name='process_type',
             field=models.CharField(max_length=255, db_index=True, null=True)
         ),
-        update_schema_version(SCHEMA_VERSION)
+        upgrade_schema_version(REVISION, DOWN_REVISION)
     ]

aiida/backends/djsite/db/migrations/0011_delete_kombu_tables.py

@@ -8,13 +8,15 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 from __future__ import unicode_literals
-
 from __future__ import absolute_import
-from django.db import models, migrations
-from aiida.backends.djsite.db.migrations import update_schema_version
 
+from django.db import migrations
+from aiida.backends.djsite.db.migrations import upgrade_schema_version
+
+
+REVISION = '1.0.11'
+DOWN_REVISION = '1.0.10'
 
-SCHEMA_VERSION = "1.0.11"
 
 class Migration(migrations.Migration):
 
@@ -34,5 +36,5 @@ class Migration(migrations.Migration):
             DELETE FROM db_dbsetting WHERE key = 'daemon|task_stop|submitter';
             DELETE FROM db_dbsetting WHERE key = 'daemon|task_start|submitter';
         """),
-        update_schema_version(SCHEMA_VERSION)
+        upgrade_schema_version(REVISION, DOWN_REVISION)
     ]

aiida/backends/djsite/db/migrations/0012_drop_dblock.py

@@ -8,13 +8,15 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 from __future__ import unicode_literals
-
 from __future__ import absolute_import
-from django.db import models, migrations
-from aiida.backends.djsite.db.migrations import update_schema_version
 
+from django.db import migrations
+from aiida.backends.djsite.db.migrations import upgrade_schema_version
+
+
+REVISION = '1.0.12'
+DOWN_REVISION = '1.0.11'
 
-SCHEMA_VERSION = "1.0.12"
 
 class Migration(migrations.Migration):
 
@@ -26,5 +28,5 @@ class Migration(migrations.Migration):
         migrations.DeleteModel(
             name='DbLock',
         ),
-        update_schema_version(SCHEMA_VERSION)
+        upgrade_schema_version(REVISION, DOWN_REVISION)
     ]

aiida/backends/djsite/db/migrations/0013_django_1_8.py

@@ -8,13 +8,15 @@
 # For further information please visit http://www.aiida.net               #
 ###########################################################################
 from __future__ import unicode_literals
-
 from __future__ import absolute_import
+
 from django.db import models, migrations
-from aiida.backends.djsite.db.migrations import update_schema_version
+from aiida.backends.djsite.db.migrations import upgrade_schema_version
+
 
+REVISION = '1.0.13'
+DOWN_REVISION = '1.0.12'
 
-SCHEMA_VERSION = "1.0.13"
 
 class Migration(migrations.Migration):
 
@@ -35,5 +37,5 @@ class Migration(migrations.Migration):
             name='email',
             field=models.EmailField(max_length=254, verbose_name='email address', blank=True),
         ),
-        update_schema_version(SCHEMA_VERSION)
+        upgrade_schema_version(REVISION, DOWN_REVISION)
     ]