Changeset 10513

Timestamp:

07/30/08 17:28:20 (1 year 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:

• branches/1.2/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildFormsTask.class.php (modified) (1 diff)
• branches/1.2/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataLoadTask.class.php (modified) (2 diffs)
• branches/1.2/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateCrudTask.class.php (modified) (2 diffs)
• branches/1.2/lib/plugins/sfPropelPlugin/lib/task/sfPropelInitAdminTask.class.php (modified) (1 diff)

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

@@ -62 +62 @@
-  {
-    $this->logSection('propel', 'generating form classes');
+    
+    $databaseManager = new sfDatabaseManager($this->configuration);
-
-    $generatorManager = new sfGeneratorManager($this->configuration);

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

@@ -71 +71 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $databaseManager = new sfDatabaseManager($this->configuration);
+    
-    if (count($options['dir']))
-    {
@@ -83 +85 @@
-      $fixturesDirs = sfFinder::type('dir')->name('fixtures')->in(array_merge($pluginDirs, array(sfConfig::get('sf_data_dir'))));
-    }
-
-    $databaseManager = new sfDatabaseManager($this->configuration);
-
-    $data = new sfPropelData();

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

@@ -73 +73 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $databaseManager = new sfDatabaseManager($this->configuration);
+    
-    $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
-
@@ -82 +84 @@
-      'AUTHOR_NAME'  => isset($properties['symfony']['author']) ? $properties['symfony']['author'] : 'Your name here',
-    );
-
+
-    $method = $options['generate-in-cache'] ? 'executeInit' : 'executeGenerate';
-

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

@@ -63 +63 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $databaseManager = new sfDatabaseManager($this->configuration);
+    
-    $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
-