[PATCH] sfPropelDatabase generate wrong configuration on multiple datasource (symfony 1.1).

I dont understand, can you provide an example with snippet of code?

in r6729

this change has somehow broken something with sfDoctrinPlugin 1.1 - I've not had a chance to figure out what yet though...

although, sfDoctrineDatabase

sfDatabase -

 34   public function __construct($parameters = array())
 35   {
 36     $this->initialize($parameters);
 37   }

however... sfDoctrineDatabase does this:

 35   public function initialize($parameters = array(), $name = null)
 36   {
 37     if (!$parameters)
 38     {
 39       return;
 40     }
 41
 42     parent::initialize($parameters);
 43

also, it seems that sfPropelDatabase does similar...

 34   public function initialize($parameters = null, $name = 'propel')
 35   {
 36     parent::initialize($parameters);
 37
 38     if (!$this->hasParameter('datasource'))
 39     {
 40       $this->setParameter('datasource', $name);
 41     }

I'm not fully understanding these changes, so i'm rolling back for now....

Change in r6729 doesn't fix this. sfPropelDatabase which extend sfDatabase have a __construct() with only one argument. But in generated databases.yml config shown:

<?php
// auto-generated by sfDatabaseConfigHandler
// date: 2007/12/29 10:12:00

$database = new sfPropelDatabase(array (
  'phptype' => 'mysql',
  'hostspec' => 'localhost',
  'database' => 'simpeg_web',
  'username' => 'root',
  'password' => NULL,
), 'propel');
$this->databases['propel'] = $database;

$database = new sfPropelDatabase(array (
  'phptype' => 'mysql',
  'hostspec' => 'localhost',
  'database' => 'simpeg',
  'username' => 'root',
  'password' => NULL,
), 'master-local');
$this->databases['master-local'] = $database;

sfPropelDatabase constructor called with two argument, so the second argument will never passed to sfPropelDatabase.

The Workaround is to override sfPropelDatabase constructor like this:

class sfPropelDatabase extends sfCreoleDatabase
{
  static protected
    $config = array();

  /**
   * Class constructor.
   *
   * @see initialize()
   */
  public function __construct($parameters = array(), $name = 'propel')
  {
    $this->initialize($parameters, $name);
  }

  public function initialize($parameters = null, $name = 'propel')
  {
    parent::initialize($parameters);

    if (!$this->hasParameter('datasource'))
    {
      $this->setParameter('datasource', $name);
    }

I think this can also applied to sfDoctrineDatabase.

in r6805