From 8f8956d70a9be5c9634ab10239bea280dbfc8b4e Mon Sep 17 00:00:00 2001
From: "Olivier Perez [a570709]" <olivier.perez@worldline.com>
Date: Fri, 2 Jan 2015 09:08:07 +0100
Subject: [PATCH] Migration: Add precondition on every Migration sub-classes
---
.../Migration/From_0_0_to_0_8_Migration.php | 18 ++++++++++++++++++
.../Migration/From_0_8_to_0_9_Migration.php | 16 ++++++++++++++++
app/classes/Framadate/Migration/Migration.php | 9 +++++++++
migration.php | 2 +-
4 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php b/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php
index 121e389e..dbdb59eb 100644
--- a/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php
+++ b/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php
@@ -1,11 +1,29 @@
<?php
namespace Framadate\Migration;
+use Framadate\Utils;
+
class From_0_0_to_0_8_Migration implements Migration {
function __construct() {
}
+ /**
+ * This method could check if the execute method should be called.
+ * It is called before the execute method.
+ *
+ * @param \PDO $pdo The connection to database
+ * @return bool true is the Migration should be executed.
+ */
+ function preCondition(\PDO $pdo) {
+ $stmt = $pdo->query('SHOW TABLES');
+ $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+
+ // Check if there is no tables but the MIGRATION_TABLE one
+ $diff = array_diff($tables, [Utils::table(MIGRATION_TABLE)]);
+ return count($diff) === 0;
+ }
+
/**
* This methode is called only one time in the migration page.
*
diff --git a/app/classes/Framadate/Migration/From_0_8_to_0_9_Migration.php b/app/classes/Framadate/Migration/From_0_8_to_0_9_Migration.php
index 33f11858..ea69991f 100644
--- a/app/classes/Framadate/Migration/From_0_8_to_0_9_Migration.php
+++ b/app/classes/Framadate/Migration/From_0_8_to_0_9_Migration.php
@@ -13,6 +13,22 @@ class From_0_8_to_0_9_Migration implements Migration {
function __construct() {
}
+ /**
+ * This method could check if the execute method should be called.
+ * It is called before the execute method.
+ *
+ * @param \PDO $pdo The connection to database
+ * @return bool true is the Migration should be executed.
+ */
+ function preCondition(\PDO $pdo) {
+ $stmt = $pdo->query('SHOW TABLES');
+ $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+
+ // Check if tables of v0.8 are presents
+ $diff = array_diff(['sondage', 'sujet_studs', 'comments', 'user_studs'], $tables);
+ return count($diff) === 0;
+ }
+
/**
* This methode is called only one time in the migration page.
*
diff --git a/app/classes/Framadate/Migration/Migration.php b/app/classes/Framadate/Migration/Migration.php
index e6d0eb9e..b68362b5 100644
--- a/app/classes/Framadate/Migration/Migration.php
+++ b/app/classes/Framadate/Migration/Migration.php
@@ -3,6 +3,15 @@ namespace Framadate\Migration;
interface Migration {
+ /**
+ * This method could check if the execute method should be called.
+ * It is called before the execute method.
+ *
+ * @param \PDO $pdo The connection to database
+ * @return bool true is the Migration should be executed.
+ */
+ function preCondition(\PDO $pdo);
+
/**
* This methode is called only one time in the migration page.
*
diff --git a/migration.php b/migration.php
index 70d7c6dc..2617b843 100644
--- a/migration.php
+++ b/migration.php
@@ -57,7 +57,7 @@ foreach ($migrations as $migration) {
$executed = $selectStmt->rowCount();
$selectStmt->closeCursor();
- if (!$executed) {
+ if (!$executed && $migration->preCondition($pdo)) {
$migration->execute($pdo);
if ($insertStmt->execute([$className])) {
$countSucceeded++;
--
GitLab