Changeset 5383

Timestamp:

10/05/07 20:53:41 (1 year ago)

Author:

Jonathan.Wage

Message:

Getting all the pake tasks working correctly.

Files:

• plugins/sfDoctrinePlugin/trunk/lib/sfDoctrineSchemasConfigHandler.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/tasks/sfDoctrineBaseTask.class.php (modified) (2 diffs)
• plugins/sfDoctrinePlugin/trunk/lib/tasks/sfDoctrineBuildAllTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/tasks/sfDoctrineBuildDbTask.class.php (modified) (2 diffs)
• plugins/sfDoctrinePlugin/trunk/lib/tasks/sfDoctrineBuildSchemaTask.class.php (modified) (2 diffs)
• plugins/sfDoctrinePlugin/trunk/lib/tasks/sfDoctrineBuildSqlTask.class.php (modified) (3 diffs)
• plugins/sfDoctrinePlugin/trunk/lib/tasks/sfDoctrineDataDumpTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/tasks/sfDoctrineDataLoadTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/tasks/sfDoctrineGenerateCrudTask.class.php (modified) (1 diff)
• plugins/sfDoctrinePlugin/trunk/lib/tasks/sfDoctrineInsertSqlTask.class.php (modified) (2 diffs)

plugins/sfDoctrinePlugin/trunk/lib/sfDoctrineSchemasConfigHandler.class.php

@@ -42 +42 @@
-            if (empty($components)) {
-                $schema = explode('/', $schemaFile);
+                
+                if (!isset($schema[1])) {
+                  continue;
+                }
+                
-                $pluginName = $schema[0];
-                $schema = $schema[1];

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

@@ -19 +19 @@
-abstract class sfDoctrineBaseTask extends sfBaseTask
-{
-Doctrine
+Models
-  {
-    require_once(dirname(dirname(__FILE__)).'/doctrine/Doctrine.php');
-    
-    $directories = array();
-    $directories[] = sfConfig::get('sf_model_lib_dir') . DIRECTORY_SEPARATOR . 'doctrine';
@@ -40 +38 @@
-    $models = Doctrine::loadModels($directories);
-  }
+  
+  public function loadConnections()
+  {
+    $doctrineConfigPath = sfConfig::get('sf_plugins_dir').'/sfDoctrinePlugin/config/doctrine.yml';
+    
+    $config = new sfDoctrineConfigHandler();
+    $php = str_replace('<?php', '', $config->execute(array($doctrineConfigPath)));
+    
+    eval($php);
+    
+    $databases = sfYaml::load(sfConfig::get('sf_config_dir').'/databases.yml');
+    $databases = $databases['all'];
+    
+    foreach ($databases as $name => $database)
+    {
+      $info = Doctrine_Manager::getInstance()->parseDsn($database['param']['dsn']);
+      
+      $dsn = $info['dsn'];
+      $user = $info['user'];
+      $password = $info['pass'];
+      
+      $connection = Doctrine_Manager::getInstance()->openConnection(new PDO($dsn, $user, $password), $name);
+      
+      // Load attributes to connection
+      foreach($default_attributes as $k => $v)
+      {
+        $connection->setAttribute(constant('Doctrine::'.$k), $v);
+      }
+    }
+    
+    // Apply connection component binding
+    $schemasPath = sfConfig::get('sf_config_dir').'/schemas.yml';
+    
+    if (file_exists($schemasPath)) {
+      $schemas = new sfDoctrineSchemasConfigHandler();
+      $php = str_replace('<?php', '', $schemas->execute(array($schemasPath)));
+      
+      eval($php);
+    }
+  }
-}

plugins/sfDoctrinePlugin/trunk/lib/tasks/sfDoctrineBuildAllTask.class.php

@@ -52 +52 @@
-    $buildModel->run();
-
-    $buildSql = new sfDoctrineBuildSqlTask($this->dispatcher, $this->formatter);
-    $buildSql->run();
-
-    $insertSql = new sfDoctrineInsertSqlTask($this->dispatcher, $this->formatter);
-    $insertSql->run();

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

@@ -23 +23 @@
-   */
-  protected function configure()
-    
+
-    $this->aliases = array('doctrine-build-db');
-    $this->namespace = 'doctrine';
@@ -45 +45 @@
-  protected function execute($arguments = array(), $options = array())
-  {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-}

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

@@ -24 +24 @@
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name')
-    ));
-
-    $this->addOptions(array(
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environement', 'dev'),
-      new sfCommandOption('connection', null, sfCommandOption::PARAMETER_REQUIRED, 'The connection name', 'doctrine'),
-    ));
-    
-    $this->aliases = array('doctrine-build-schema');
-    $this->namespace = 'doctrine';
@@ -52 +43 @@
-  protected function execute($arguments = array(), $options = array())
-  {
-bootstrapSymfony($arguments['application'], $options['env'], true
+loadConnections(
-    
-    $schema = sfConfig::get('sf_root_dir') . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'doctrine' . DIRECTORY_SEPARATOR . 'schema.yml';

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

@@ -23 +23 @@
-   */
-  protected function configure()
-
-
-
-
-
-
-
-
-
-
+
-    $this->aliases = array('doctrine-build-sql');
-    $this->namespace = 'doctrine';
@@ -54 +45 @@
-  protected function execute($arguments = array(), $options = array())
-  {
-bootstrapSymfony($arguments['application'], $options['env'], true
+loadConnections(
-    
-    $sqlPath = sfConfig::get('sf_root_dir').'/data/sql';
-    
-
-
-
+
+
-    
-    // Build sql for all of the plugins
@@ -67 +57 @@
-    foreach ($plugins as $plugin)
-    {
-name = basename($plugin)
+pluginModelPath = sfConfig::get('sf_plugins_dir').'/'.basename($plugin).'/lib/model/doctrine'
-      
-
-
-
-
-
-
-
+
+
-      }
-    }
+    
+    $sql = Doctrine::exportSql($directories);
+    
+    file_put_contents($sqlPath.'/doctrine-schema.sql', implode("\n", $sql));
-  }
-}

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

@@ -65 +65 @@
-    $this->bootstrapSymfony($arguments['application'], $options['env'], true);
-
-    $this->loadDoctrine();
-    
-    $databaseManager = new sfDatabaseManager();
-
-    if (!sfToolkit::isPathAbsolute($filename))
-    {

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

@@ -65 +65 @@
-    $this->bootstrapSymfony($arguments['application'], $options['env'], true);
-    
-    $this->loadDoctrine();
-    
-    sfSimpleAutoload::getInstance()->unregister();
-    sfSimpleAutoload::getInstance()->register();

plugins/sfDoctrinePlugin/trunk/lib/tasks/sfDoctrineGenerateCrudTask.class.php

@@ -63 +63 @@
-    $this->bootstrapSymfony($arguments['application'], $options['env'], true);
-    
-    $this->loadDoctrine();
-    
-    // generate module
-    $tmpDir = sfConfig::get('sf_root_dir').DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.md5(uniqid(rand(), true));

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

@@ -24 +24 @@
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name')
-    ));
-
-    $this->addOptions(array(
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environement', 'dev'),
-      new sfCommandOption('connection', null, sfCommandOption::PARAMETER_REQUIRED, 'The connection name', 'doctrine'),
-    ));
-    
-    $this->aliases = array('doctrine-insert-sql');
-    $this->namespace = 'doctrine';
@@ -53 +44 @@
-  protected function execute($arguments = array(), $options = array())
-  {
-bootstrapSymfony($arguments['application'], $options['env'], true
+loadConnections(
-    
-    Doctrine::exportSchema(sfConfig::get('sf_root_dir').'/lib/model/doctrine');