Changeset 7396

Timestamp:

02/08/08 00:51:14 (10 months ago)

Author:

dwhittle

Message:

dwhittle: merged changes to branch

Files:

• branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/propel/addon/sfPropelDatabaseSchema.class.php (modified) (11 diffs)
• branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/propel/builder/SfObjectBuilder.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/propel/builder/SfPeerBuilder.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBaseTask.class.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/test/unit/fixtures/new_schema.yml (copied) (copied from branches/1.1/lib/plugins/sfPropelPlugin/test/unit/fixtures/new_schema.yml)
• branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/test/unit/fixtures/schema.xml (copied) (copied from branches/1.1/lib/plugins/sfPropelPlugin/test/unit/fixtures/schema.xml)
• branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/test/unit/fixtures/schema.yml (modified) (1 diff)
• branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/test/unit/sfPropelDatabaseSchemaTest.php (modified) (2 diffs)

branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/propel/addon/sfPropelDatabaseSchema.class.php

@@ -3 +3 @@
-/*
- * This file is part of the symfony package.
-
+
+
- *
- * For the full copyright and license information, please view the LICENSE
@@ -28 +29 @@
-  }
-
+  public function loadArray($schema_array)
+  {
+    $database = array();
+    $connection_name = '';
+
+    if (isset($schema_array['classes']))
+    {
+      // New schema syntax
+      $schema_array = $this->convertNewToOldYaml($schema_array);
+    }
+
+    if (count($schema_array) > 1)
+    {
+      throw new sfException('A schema.yml must only contain 1 database entry.');
+    }
+
+    $tmp = array_keys($schema_array);
+    $connection_name = array_shift($tmp);
+
+    if ($connection_name)
+    {
+      $database = $schema_array[$connection_name];
+    }
+
+    $this->connection_name = $connection_name;
+    $this->database = $database;
+    
+    $this->fixYAMLDatabase();
+    $this->fixYAMLI18n();
+    $this->fixYAMLColumns();
+  }
+  
-  public function loadYAML($file)
-  {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    $tmp = array_keys($schema);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -58 +239 @@
-    foreach ($this->getChildren($this->database) as $tb_name => $table)
-    {
-
+
+
+
+
+
+
-
-      // columns
@@ -227 +413 @@
-              'required'      => true,
-              'primaryKey'    => true,
-i
+I
-            );
-            $has_primary_key = true;
@@ -241 +427 @@
-              $this->database[$table][$column] = array(
-                'type'             => 'integer',
-                'required'         => true,
-                'foreignTable'     => $foreign_table,
-,
+
-              );
-            }
-            else
-            {
-
+.
-            }
-          }
+          
-        }
-        else
@@ -281 +467 @@
-          'required'      => true,
-          'primaryKey'    => true,
-i
+I
-        );
-      }
@@ -314 +500 @@
-    foreach ($this->getTables() as $tb_name => $table)
-    {
-
+
+
+
+
+
+
+
+
+
-      {
-        $table_match = $tb_name;
+        break;
-      }
-    }
@@ -330 +525 @@
-      foreach ($column as $key => $value)
-      {
-Table', 'foreignReference', 'onDelete', 'onUpdate', 'index', 'uniqu
+Class', 'foreignTable', 'foreignReference', 'onDelete', 'onUpdate', 'index', 'unique', 'sequenc
-        {
-          $attributes_string .= " $key=\"".htmlspecialchars($this->getCorrectValueFor($key, $value))."\"";
@@ -339 +534 @@
-    else
-    {
-%s
+"%s".
-    }
-
-    // conventions for foreign key attributes
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      if (isset($column['onDelete']))
-      {
@@ -660 +871 @@
-      foreach ($columns as $column => $attributes)
-      {
-i
+I
-        {
-          // simplify primary keys
@@ -705 +916 @@
-    foreach ($hash as $attribute => $value)
-    {
-strval($value)
+(string) $value
-    }
-

branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/propel/builder/SfObjectBuilder.php

@@ -349 +349 @@
-    $script .= $tmp;
-  }
+  
+  protected function addClassClose(&$script)
+  {
+    parent::addClassClose($script);
+    
+    $behaviors = $this->getTable()->getAttribute('behaviors');
+    if($behaviors)
+    {
+      $behavior_file_name = 'Base'.$this->getTable()->getPhpName().'Behaviors';
+      $behavior_file_path = $this->getFilePath($this->getStubObjectBuilder()->getPackage().'.om.'.$behavior_file_name);
+      $script .= sprintf("\n\ninclude_once '%s';\n", $behavior_file_path);
+    }
+  }
-}

branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/propel/builder/SfPeerBuilder.php

@@ -389 +389 @@
-    $script .= $tmp;
-  }
+  
+  protected function addClassClose(&$script)
+  {
+    parent::addClassClose($script);
+
+    $behavior_file_name = 'Base'.$this->getTable()->getPhpName().'Behaviors';
+    $behavior_file_path = $this->getFilePath($this->getStubObjectBuilder()->getPackage().'.om.'.$behavior_file_name);
+    $absolute_behavior_file_path = sfConfig::get('sf_root_dir').'/'.$behavior_file_path;
+    
+    if(file_exists($absolute_behavior_file_path))
+    {
+      unlink($absolute_behavior_file_path);
+    }
+    
+    $behaviors = $this->getTable()->getAttribute('behaviors');
+    if($behaviors)
+    {
+      file_put_contents($absolute_behavior_file_path, sprintf("<?php\nsfPropelBehavior::add('%s', %s);\n", $this->getTable()->getPhpName(), var_export(unserialize($behaviors), true)));
+      $script .= sprintf("\n\ninclude_once '%s';\n", $behavior_file_path);
+    }
+  }
-}

branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBaseTask.class.php

@@ -103 +103 @@
-
-    $dbSchema = new sfPropelDatabaseSchema();
+    
-    foreach ($schemas as $schema)
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-      $this->dispatcher->notify(new sfEvent($this, 'command.log', array($this->formatter->formatSection('schema', sprintf('converting "%s" to XML', $schema)))));

branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/test/unit/fixtures/schema.yml

@@ -1 +1 @@
-propel:
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/test/unit/sfPropelDatabaseSchemaTest.php

@@ -3 +3 @@
-/*
- * This file is part of the symfony package.
-
-
+
+
+
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
@@ -11 +12 @@
-require_once(dirname(__FILE__).'/../../../../../test/bootstrap/unit.php');
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+  public function is_line_by_line($exp1, $exp2)
+  {
+    $array_exp1 = explode("\n", $exp1);
+    $array_exp2 = explode("\n", $exp2);
+    $nb_lines = count($array_exp1);
+    for ($i=0; $i < $nb_lines; $i++)
+    {
+      if(!$array_exp1[$i]) continue; // Skip blank lines to avoid testing nothing
+      $this->is(trim($array_exp1[$i]), trim($array_exp2[$i]), sprintf('Line %d matches %s', $i, $array_exp1[$i]));
+    }
+  }
+}
+
+require_once(dirname(__FILE__).'/../../../../../test/bootstrap/unit.php');
+require_once(dirname(__FILE__).'/../../lib/propel/addon/sfPropelDatabaseSchema.class.php');
+require_once(dirname(__FILE__).'/../../../../util/sfInflector.class.php');
+require_once(dirname(__FILE__).'/../../../../util/sfToolkit.class.php');
+require_once(dirname(__FILE__).'/../../../../util/sfYaml.class.php');
+
+$t = new my_lime_test(261, new lime_output_color());
+
+$t->diag('Classical YAML to XML conversion');
-$p = new sfPropelDatabaseSchema();
-$p->loadYAML(dirname(__FILE__).'/fixtures/schema.yml');
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+