From 4b82c6fbb2dca4012f4b9baba857b17eabf98a57 Mon Sep 17 00:00:00 2001 From: "Jonathan.Wage" Date: Fri, 21 Sep 2007 19:19:25 +0000 Subject: [PATCH] Removed code to auto complete relationships. --- lib/Doctrine/Import/Schema.php | 16 ---------------- playground/index.php | 5 ++++- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/lib/Doctrine/Import/Schema.php b/lib/Doctrine/Import/Schema.php index 5132af5eb..18e9ca8af 100644 --- a/lib/Doctrine/Import/Schema.php +++ b/lib/Doctrine/Import/Schema.php @@ -143,7 +143,6 @@ class Doctrine_Import_Schema $class = isset($relation['class']) ? $relation['class']:$alias; $relation['foreign'] = isset($relation['foreign'])?$relation['foreign']:'id'; - $relation['foreignAlias'] = isset($relation['alias'])?$relation['alias']:null; $relation['alias'] = $alias; $relation['class'] = $class; @@ -156,20 +155,5 @@ class Doctrine_Import_Schema $this->relations[$className][$class] = $relation; } } - - // Fix the other end of the relations - foreach($this->relations as $className => $relations) { - foreach ($relations AS $alias => $relation) { - - $newRelation = array(); - $newRelation['foreign'] = $relation['local']; - $newRelation['local'] = $relation['foreign']; - $newRelation['class'] = $className; - $newRelation['alias'] = isset($relation['foreignAlias'])?$relation['foreignAlias']:$className; - $newRelation['type'] = $relation['type'] === Doctrine_Relation::ONE ? Doctrine_Relation::MANY:Doctrine_Relation::ONE; - - $this->relations[$relation['class']][$className] = $newRelation; - } - } } } \ No newline at end of file diff --git a/playground/index.php b/playground/index.php index 764990286..99b30ce3a 100644 --- a/playground/index.php +++ b/playground/index.php @@ -2,4 +2,7 @@ require_once('playground.php'); require_once('connection.php'); require_once('models.php'); -require_once('data.php'); \ No newline at end of file +require_once('data.php'); + +$import = new Doctrine_Import_Schema(); +$import->importSchema('../tests/schema.yml', 'yml', 'test_models', $tables); \ No newline at end of file