Author: sevein
Date: Tue Jul 10 22:25:19 2012
New Revision: 11900
Log:
Use arUpgrade110 instead of QubitMigrate110, also fixes the fix for the 62/75
bug.
Modified:
trunk/lib/task/migrate/arUpgradeSqlTask.class.php
Modified: trunk/lib/task/migrate/arUpgradeSqlTask.class.php
==============================================================================
--- trunk/lib/task/migrate/arUpgradeSqlTask.class.php Tue Jul 10 21:17:28
2012 (r11899)
+++ trunk/lib/task/migrate/arUpgradeSqlTask.class.php Tue Jul 10 22:25:19
2012 (r11900)
@@ -78,21 +78,21 @@
// or 1.2
if (62 == intval($this->initialVersion))
{
- // Check if "accession_mask" setting exists (Added in version 63)
+ // Check if "accession_mask" setting exists (added in version 63)
$sql = "SELECT id FROM setting WHERE name='accession_mask';";
- if (null !== QubitPdo::fetchOne($sql))
+ if (false !== QubitPdo::fetchOne($sql))
{
$this->initialVersion = 75;
}
}
- // Use old migration script for versions before 75
- if (null == $this->initialVersion || 75 > $this->initialVersion)
+ // Use old migration script for versions before 62
+ if (null == $this->initialVersion || 62 > $this->initialVersion)
{
$this->logBlock(array(
'',
'Please use the propel:migrate task for upgrading',
- 'from Qubit releases prior to Release 1.2',
+ 'from Qubit releases prior to Release 1.1',
''),
'ERROR');
@@ -144,7 +144,9 @@
}
catch (Exception $e)
{
- throw new sfException('The task failed while trying to upgrade to
v'.$version.'.');
+ $this->logSection('upgrade-sql', sprintf('The task failed while trying
to upgrade to v'.$version);
+
+ throw $e;
}
}
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
