Improved version handling for double digit and minor version numbers

Compare version properly for UpgradeController and Tests Closes #663, closes #664
ThinkUpLLC · Mar 8, 2011 · 189946c · 189946c
1 parent 4d2e8a2
commit 189946c
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 2 deletions.
diff --git a/tests/TestOfUpgradeController.php b/tests/TestOfUpgradeController.php
@@ -241,6 +241,53 @@ public function testProcessOneMigrations() {
         $this->assertEqual(count($data), 3);
     }
 
+    public function testProcessMinorVersionMigration() {
+        $this->simulateLogin('me@example.com', true);
+        $config = Config::getInstance();
+        $config->setValue('THINKUP_VERSION', $config->getValue('THINKUP_VERSION') + 10.1); //set a high minor version
+        $controller = new UpgradeController(true);
+        $this->migrationFiles(1);
+        $_GET['migration_index'] = 1;
+        $results = $controller->go();
+        $obj = json_decode($results);
+        $this->assertTrue($obj->processed);
+        $this->assertEqual($obj->sql, file_get_contents($this->test_migrations[0]));
+
+        $sql = "show tables like  'tu_test1'";
+        $stmt = $this->pdo->query($sql);
+        $data = $stmt->fetch();
+        $this->assertEqual($data[0], 'tu_test1');
+        $sql = 'select * from tu_test1';
+        $stmt = $this->pdo->query($sql);
+        $data = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        $this->assertEqual(count($data), 3);
+    }
+
+    public function testProcessMinorBetaVersionMigration() {
+        $this->simulateLogin('me@example.com', true);
+        $config = Config::getInstance();
+        $test_version = $config->getValue('THINKUP_VERSION') + 10.1;
+        $test_version .= 'beta';
+        $config->setValue('THINKUP_VERSION', $test_version); //set a high minor version with beta string
+        $controller = new UpgradeController(true);
+        $this->migrationFiles(1);
+        $_GET['migration_index'] = 1;
+        $results = $controller->go();
+        $obj = json_decode($results);
+        $this->assertTrue($obj->processed);
+        $this->assertEqual($obj->sql, file_get_contents($this->test_migrations[0]));
+
+        $sql = "show tables like  'tu_test1'";
+        $stmt = $this->pdo->query($sql);
+        $data = $stmt->fetch();
+        $this->assertEqual($data[0], 'tu_test1');
+        $sql = 'select * from tu_test1';
+        $stmt = $this->pdo->query($sql);
+        $data = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        $this->assertEqual(count($data), 3);
+    }
+
+
     public function testProcessSnowflakeMigration() {
         $config = Config::getInstance();
         $app_path = $config->getValue('source_root_path');
@@ -455,6 +502,8 @@ private function migrationFiles($count = 1) {
         if($count == 2) {
             $migration_test2 = $this->migrations_test_dir . $this->migrations_file2;
             $migration_version--;
+            $migration_version += 0.12;
+            $migration_version .= 'beta'; 
             $migration2 = $this->migrations_dir
             . '2010-09-16_v' . $migration_version . '.sql.migration';
             copy($migration_test2, $migration2);

diff --git a/webapp/_lib/controller/class.UpgradeController.php b/webapp/_lib/controller/class.UpgradeController.php
@@ -77,6 +77,7 @@ public function __construct($session_started=false) {
     }
 
     public function authControl() {
+
         $this->disableCaching();
         Utils::defineConstants();
         $config = Config::getInstance();
@@ -235,9 +236,14 @@ public function getMigrationList($version) {
         $migrations = array();
         $config = Config::getInstance();
         for ($i = 0; $i < count($dir_list); $i++) {
-            if(preg_match('/_v(\d+\.\d+)\.sql\.migration/', $dir_list[$i], $matches)) {
+            if(preg_match('/_v(\d+\.\d+(\.\d+)?(\w+)?)\.sql\.migration/', $dir_list[$i], $matches)) {
                 $migration_version = $matches[1];
-                if($migration_version > $version && $migration_version <= $config->getValue('THINKUP_VERSION')) {
+                // skip early pre beta 1 versions...
+                if(preg_match('/^0\.00/', $migration_version)) {
+                    continue;
+                }
+                if(version_compare($migration_version, $version) > 0 && 
+                version_compare($migration_version, $config->getValue('THINKUP_VERSION')) < 1 ) {
                     if($migration_version == 0.3) {
                         $install_dao = DAOFactory::getDAO('InstallerDAO');
                         if(! $install_dao->needsSnowflakeUpgrade() && ! $this->snowflakeSession(false) ) {