Merge lp:~blake-rouse/maas/fix-1524152 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Fix upgrade path for piston. Fix missing migrations in the in-tree MAAS 1.9 tarball. Fix missing piston3 migration.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file 'src/maasserver/management/commands/dbupgrade.py'
--- src/maasserver/management/commands/dbupgrade.py	2015-12-08 18:48:31 +0000
+++ src/maasserver/management/commands/dbupgrade.py	2015-12-09 17:02:06 +0000
@@ -190,13 +190,25 @@
             not cls._south_migrations_are_complete(database))
 
     @classmethod
-    def _rename_piston_to_piston3(cls, database):
+    def _find_tables(cls, database, startwith):
+        """Return list of tables that start with `startwith`."""
+        cursor = connections[database].cursor()
+        cursor.execute(
+            "SELECT table_name FROM information_schema.tables "
+            "WHERE table_schema = 'public' AND table_name LIKE %s",
+            [startwith + "%"])
+        return [
+            row[0]
+            for row in cursor.fetchall()
+        ]
+
+    @classmethod
+    def _rename_piston_to_piston3(cls, database, tables):
         """Rename piston to piston3."""
         cursor = connections[database].cursor()
-        cursor.execute(
-            "ALTER TABLE piston_consumer RENAME TO piston3_consumer")
-        cursor.execute("ALTER TABLE piston_nonce RENAME TO piston3_nonce")
-        cursor.execute("ALTER TABLE piston_token RENAME TO piston3_token")
+        for table in tables:
+            cursor.execute(
+                "ALTER TABLE piston_%s RENAME TO piston3_%s" % (table, table))
 
     @classmethod
     def _perform_south_migrations(cls, script_path, database):
@@ -259,13 +271,19 @@
             if rc != 0:
                 sys.exit(rc)
         else:
-            # Piston has been renamed from piston to piston3. If south was ever
-            # performed then the tables need to be renamed.
-            south_was_performed = self._south_was_performed(database)
-            if south_was_performed:
-                self._rename_piston_to_piston3(database)
+            # Piston has been renamed from piston to piston3.
+            piston_tables = self._find_tables(database, "piston")
+            piston_tables = [
+                table[7:]
+                for table in piston_tables
+                if not table.startswith("piston3")
+            ]
+            if len(piston_tables):
+                self._rename_piston_to_piston3(database, piston_tables)
 
             # Perform the builtin migration faking the initial migrations
             # if south was ever performed.
             call_command(
-                "migrate", interactive=False, fake_initial=south_was_performed)
+                "migrate",
+                interactive=False,
+                fake_initial=self._south_was_performed(database))
 
=== added file 'src/maasserver/migrations/builtin/piston3/0002_auto_20151209_1652.py'
--- src/maasserver/migrations/builtin/piston3/0002_auto_20151209_1652.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/migrations/builtin/piston3/0002_auto_20151209_1652.py	2015-12-09 17:02:06 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import (
+    migrations,
+    models,
+)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('piston3', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='consumer',
+            name='status',
+            field=models.CharField(default='pending', choices=[('pending', 'Pending'), ('accepted', 'Accepted'), ('canceled', 'Canceled'), ('rejected', 'Rejected')], max_length=16),
+        ),
+    ]
 
=== modified file 'src/maasserver/migrations/south/django16_south_maas19.tar.gz'
 Binary files src/maasserver/migrations/south/django16_south_maas19.tar.gz	2015-12-02 20:43:30 +0000 and src/maasserver/migrations/south/django16_south_maas19.tar.gz	2015-12-09 17:02:06 +0000 differ
=== modified file 'src/maasserver/tests/test_commands_dbupgrade.py'
--- src/maasserver/tests/test_commands_dbupgrade.py	2015-12-08 18:48:31 +0000
+++ src/maasserver/tests/test_commands_dbupgrade.py	2015-12-09 17:02:06 +0000
@@ -137,14 +137,36 @@
         self.assertCalledSouth(popen)
         self.assertCalledDjango(popen)
 
-    def test_django_run_renames_piston_tables_if_south_ran_before(self):
-        self.patch(
-            dbupgrade_command, "_south_was_performed").return_value = True
-        mock_rename = self.patch(
-            dbupgrade_command, "_rename_piston_to_piston3")
-        mock_call = self.patch(dbupgrade_module, "call_command")
-        call_command('dbupgrade', django=True)
-        self.assertThat(mock_rename, MockCalledOnceWith("default"))
+    def test_django_run_renames_piston_tables_if_piston_tables_exists(self):
+        self.patch(
+            dbupgrade_command, "_south_was_performed").return_value = True
+        self.patch(dbupgrade_command, "_find_tables").return_value = [
+            "piston_consumer",
+            "piston_token",
+        ]
+        mock_rename = self.patch(
+            dbupgrade_command, "_rename_piston_to_piston3")
+        mock_call = self.patch(dbupgrade_module, "call_command")
+        call_command('dbupgrade', django=True)
+        self.assertThat(
+            mock_rename, MockCalledOnceWith("default", ["consumer", "token"]))
+        self.assertThat(
+            mock_call, MockCalledOnceWith(
+                "migrate", interactive=False, fake_initial=True))
+
+    def test_django_run_doesnt_renames_piston_tables_if_piston3(self):
+        self.patch(
+            dbupgrade_command, "_south_was_performed").return_value = True
+        self.patch(dbupgrade_command, "_find_tables").return_value = [
+            "piston3_consumer",
+            "piston3_token",
+        ]
+        mock_rename = self.patch(
+            dbupgrade_command, "_rename_piston_to_piston3")
+        mock_call = self.patch(dbupgrade_module, "call_command")
+        call_command('dbupgrade', django=True)
+        self.assertThat(
+            mock_rename, MockNotCalled())
         self.assertThat(
             mock_call, MockCalledOnceWith(
                 "migrate", interactive=False, fake_initial=True))