Changeset 7549

Timestamp:

02/19/08 22:10:21 (8 months ago)

Author:

pookey

Message:

compliments previous commit from me

Files:

• plugins/sfDoctrinePlugin/trunk/lib (modified) (1 prop)
• plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineBaseTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineBuildDbTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineBuildSchemaTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineBuildSqlTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineDataDumpTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineDataLoadTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineDqlTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineDropDbTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineGenerateMigrationTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineInsertSqlTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineMigrateTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineRebuildDbTask.class.php (modified) (1 diff)

plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineBaseTask.class.php

@@ -35 +35 @@
-      self::$done = true;
-    }
+  }
+
+  public function bootstrapSymfony($app = null, $env = 'dev', $debug = true)
+  {
+    // if we've already bootstrapped....
+    if (defined('SF_ROOT_DIR'))
+      return;
+
+    if (!isset($app)) 
+    {
+       $applications = sfFinder::type('dir')->maxdepth(0)->ignore_version_control()->in(sfConfig::get('sf_root_dir') . DIRECTORY_SEPARATOR . 'apps'); 
+
+       if (isset($applications[0])) {
+         $app = basename($applications[0]);
+       } else {
+         throw new Exception('You must have at least one application');
+       }
+    }
+    return parent::bootstrapSymfony($app, $env, $debug);
+
-  }
-

plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineBuildDbTask.class.php

@@ -44 +44 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $this->bootstrapSymfony();
-    $this->callDoctrineCli('create-db');
-  }

plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineBuildSchemaTask.class.php

@@ -44 +44 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $this->bootstrapSymfony();
-    $this->callDoctrineCli('generate-yaml-db');
-  }

plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineBuildSqlTask.class.php

@@ -46 +46 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $this->bootstrapSymfony();
-    $this->callDoctrineCli('generate-sql');
-  }

plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineDataDumpTask.class.php

@@ -56 +56 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $this->bootstrapSymfony();
+
-    $args = array();
-    if (isset($arguments['target']))

plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineDataLoadTask.class.php

@@ -54 +54 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $this->bootstrapSymfony();
-    $this->callDoctrineCli('load-data');
-  }

plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineDqlTask.class.php

@@ -44 +44 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $this->bootstrapSymfony();
-    $this->callDoctrineCli('dql', array('dql_query' => $arguments['dql_query']));
-  }

plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineDropDbTask.class.php

@@ -44 +44 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $this->bootstrapSymfony();
-    $this->callDoctrineCli('drop-db');
-  }

plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineGenerateMigrationTask.class.php

@@ -46 +46 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $this->bootstrapSymfony();
-    $this->callDoctrineCli('generate-migration', array('name' => $arguments['name']));
-  }

plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php

@@ -42 +42 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $this->bootstrapSymfony();
-    $this->callDoctrineCli('generate-migrations-db');
-  }

plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php

@@ -42 +42 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $this->bootstrapSymfony();
-    $this->callDoctrineCli('generate-migrations-db');
-  }

plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineInsertSqlTask.class.php

@@ -45 +45 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $this->bootstrapSymfony();
-    $this->callDoctrineCli('create-tables');
-  }

plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineMigrateTask.class.php

@@ -46 +46 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $this->bootstrapSymfony();
-    $this->callDoctrineCli('migrate', array('version' => $arguments['version']));
-  }

plugins/sfDoctrinePlugin/trunk/lib/task/sfDoctrineRebuildDbTask.class.php

@@ -44 +44 @@
-  protected function execute($arguments = array(), $options = array())
-  {
+    $this->bootstrapSymfony();
-    $this->callDoctrineCli('rebuild-db');
-  }