Improve SQL migrations when old default swimlanes have the same name as a normal swimlanes

2 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f38c881..eb4f91f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@ New features:
 * Add configurable list of predefined subjects when sending a task or a a comment by email
 * Add command line argument to filter overdue notification for a given project
 
+Improvements:
+
+* Improve SQL migrations when old default swimlanes have the same name as a normal swimlanes
+
 Bug fixes:
 
 * Add missing subtask permissions for project viewer role
diff --git a/app/Schema/Migration.php b/app/Schema/Migration.php
index 654303f4..21ef4427 100644
--- a/app/Schema/Migration.php
+++ b/app/Schema/Migration.php
@@ -13,6 +13,13 @@ function migrate_default_swimlane(PDO $pdo)
             $project['default_swimlane'] = 'Default swimlane';
         }
 
+        $rq = $pdo->prepare('SELECT 1 FROM swimlanes WHERE name=? AND project_id=?');
+        $rq->execute(array($project['default_swimlane'], $project['id']));
+
+        if ($rq->fetchColumn()) {
+            $project['default_swimlane'] = $project['default_swimlane'].' (Default swimlane)';
+        }
+
         // Create new default swimlane
         $rq = $pdo->prepare('INSERT INTO swimlanes (project_id, name, is_active, position) VALUES (?, ?, ?, ?)');
         $rq->execute(array(