Author: jablko
Date: Fri Oct 2 15:23:37 2009
New Revision: 3650
Log:
Straighten out some install logic, instead of trying to get a database
connection whenever possible, assume no database connection exists and make one
only if necessary -- force
Modified:
trunk/plugins/sfInstallPlugin/config/sfInstallPluginConfiguration.class.php
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/actions/configureDatabaseAction.class.php
Modified:
trunk/plugins/sfInstallPlugin/config/sfInstallPluginConfiguration.class.php
==============================================================================
--- trunk/plugins/sfInstallPlugin/config/sfInstallPluginConfiguration.class.php
Fri Oct 2 15:19:51 2009 (r3649)
+++ trunk/plugins/sfInstallPlugin/config/sfInstallPluginConfiguration.class.php
Fri Oct 2 15:23:37 2009 (r3650)
@@ -10,19 +10,6 @@
*/
class sfInstallPluginConfiguration extends sfPluginConfiguration
{
- public function contextLoadFactories(sfEvent $event)
- {
- $context = $event->getSubject();
-
- try
- {
- $context->databaseManager = new sfDatabaseManager($this->configuration);
- }
- catch (sfConfigurationException $e)
- {
- }
- }
-
public function controllerChangeAction(sfEvent $event)
{
if ('sfInstallPlugin' != $event->module)
@@ -94,15 +81,6 @@
if ($installScriptName == $scriptName)
{
- // The install.php front controller avoids throwing an exception if
- // databases.yml doesn't exist. It connects an event listener which trys
- // to make a database connection if possible, but continues without one
- // if not.
- if (sfConfig::get('sf_use_database'))
- {
- $this->dispatcher->connect('context.load_factories', array($this,
'contextLoadFactories'));
- }
-
sfConfig::set('sf_no_script_name', false);
sfConfig::set('sf_use_database', false);
}
Modified:
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/actions/configureDatabaseAction.class.php
==============================================================================
---
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/actions/configureDatabaseAction.class.php
Fri Oct 2 15:19:51 2009 (r3649)
+++
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/actions/configureDatabaseAction.class.php
Fri Oct 2 15:23:37 2009 (r3650)
@@ -10,6 +10,11 @@
{
$this->database = array();
+ if (!isset($this->context->databaseManager))
+ {
+ $this->context->databaseManager = new
sfDatabaseManager(sfProjectConfiguration::getActive());
+ }
+
// TODO: Can we avoid hardcoding the database name?
$database = $this->context->databaseManager->getDatabase('propel');
--~--~---------~--~----~------------~-------~--~----~
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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
