Changeset 8491
- Timestamp:
- 04/17/08 01:26:28 (5 months ago)
- Files:
-
- branches/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllLoadTask.class.php (modified) (1 diff)
- branches/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataDumpTask.class.php (modified) (1 diff)
- branches/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataLoadTask.class.php (modified) (1 diff)
- branches/1.1/lib/task/generator/sfGenerateTaskTask.class.php (modified) (1 diff)
- branches/1.1/lib/task/sfBaseTask.class.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllLoadTask.class.php
r7962 r8491 61 61 { 62 62 // load Propel configuration before Phing 63 $configuration = ProjectConfiguration::getApplicationConfiguration($arguments['application'], $options['env'], true); 64 $databaseManager = new sfDatabaseManager($configuration); 63 $databaseManager = new sfDatabaseManager($this->configuration); 65 64 require_once sfConfig::get('sf_symfony_lib_dir').'/plugins/sfPropelPlugin/lib/propel/sfPropelAutoload.php'; 66 65 branches/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataDumpTask.class.php
r8150 r8491 74 74 protected function execute($arguments = array(), $options = array()) 75 75 { 76 $configuration = ProjectConfiguration::getApplicationConfiguration($arguments['application'], $options['env'], true); 77 78 $databaseManager = new sfDatabaseManager($configuration); 76 $databaseManager = new sfDatabaseManager($this->configuration); 79 77 80 78 $filename = $arguments['target']; branches/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataLoadTask.class.php
r7962 r8491 84 84 } 85 85 86 $configuration = ProjectConfiguration::getApplicationConfiguration($arguments['application'], $options['env'], true); 87 88 $databaseManager = new sfDatabaseManager($configuration); 86 $databaseManager = new sfDatabaseManager($this->configuration); 89 87 90 88 $data = new sfPropelData(); branches/1.1/lib/task/generator/sfGenerateTaskTask.class.php
r8418 r8491 96 96 { 97 97 // Database initialization 98 \$configuration = ProjectConfiguration::getApplicationConfiguration(\$arguments['application'], \$options['env'], true); 99 \$databaseManager = new sfDatabaseManager(\$configuration); 98 \$databaseManager = new sfDatabaseManager(\$this->configuration); 100 99 \$connection = Propel::getConnection(\$options['connection'] ? \$options['connection'] : ''); 101 100 // add code here branches/1.1/lib/task/sfBaseTask.class.php
r8290 r8491 32 32 33 33 $application = $commandManager->getArgumentSet()->hasArgument('application') ? $commandManager->getArgumentValue('application') : null; 34 $env = $commandManager->getOptionSet()->hasOption('env') ? $commandManager->getOptionValue('env') : 'test'; 34 35 if (!is_null($application)) 35 36 { … … 37 38 38 39 require_once sfConfig::get('sf_config_dir').'/ProjectConfiguration.class.php'; 39 $this->configuration = ProjectConfiguration::getApplicationConfiguration($application, 'test', true, null, $this->dispatcher);40 $this->configuration = ProjectConfiguration::getApplicationConfiguration($application, $env, true, null, $this->dispatcher); 40 41 } 41 42 else
