Development

Changeset 10513

You must first sign up to be able to contribute.

Changeset 10513

Show
Ignore:
Timestamp:
07/30/08 17:28:20 (4 months ago)
Author:
nicolas
Message:

[1.2] backport of r10512 - fixed "No connection params set for propel" PropelException thrown in Propel command line tasks under certain circumstances (refs #3323, #2702, #1915)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.2/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildFormsTask.class.php

    r8512 r10513  
    6262  { 
    6363    $this->logSection('propel', 'generating form classes'); 
     64     
     65    $databaseManager = new sfDatabaseManager($this->configuration); 
    6466 
    6567    $generatorManager = new sfGeneratorManager($this->configuration); 

  • branches/1.2/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataLoadTask.class.php

    r8491 r10513  
    7171  protected function execute($arguments = array(), $options = array()) 
    7272  { 
     73    $databaseManager = new sfDatabaseManager($this->configuration); 
     74     
    7375    if (count($options['dir'])) 
    7476    { 
    …… 
    8385      $fixturesDirs = sfFinder::type('dir')->name('fixtures')->in(array_merge($pluginDirs, array(sfConfig::get('sf_data_dir')))); 
    8486    } 
    85  
    86     $databaseManager = new sfDatabaseManager($this->configuration); 
    8787 
    8888    $data = new sfPropelData(); 

  • branches/1.2/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateCrudTask.class.php

    r8148 r10513  
    7373  protected function execute($arguments = array(), $options = array()) 
    7474  { 
     75    $databaseManager = new sfDatabaseManager($this->configuration); 
     76     
    7577    $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true); 
    7678 
    …… 
    8284      'AUTHOR_NAME'  => isset($properties['symfony']['author']) ? $properties['symfony']['author'] : 'Your name here', 
    8385    ); 
    84  
     86     
    8587    $method = $options['generate-in-cache'] ? 'executeInit' : 'executeGenerate'; 
    8688 

  • branches/1.2/lib/plugins/sfPropelPlugin/lib/task/sfPropelInitAdminTask.class.php

    r8148 r10513  
    6363  protected function execute($arguments = array(), $options = array()) 
    6464  { 
     65    $databaseManager = new sfDatabaseManager($this->configuration); 
     66     
    6567    $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true); 
    6668