From 438d970f4065a35e133084013463b6ccc2be2fe7 Mon Sep 17 00:00:00 2001 From: jwage Date: Sun, 15 Feb 2009 00:27:20 +0000 Subject: [PATCH] [2.0] More removing of old code --- lib/Doctrine/ORM/Export/Schema.php | 131 -------- lib/Doctrine/ORM/Import/Exception.php | 2 +- lib/Doctrine/ORM/Import/Import.php | 81 ----- lib/Doctrine/ORM/Import/Reader/Db.php | 2 +- lib/Doctrine/ORM/Import/Schema.php | 459 -------------------------- 5 files changed, 2 insertions(+), 673 deletions(-) delete mode 100644 lib/Doctrine/ORM/Export/Schema.php delete mode 100644 lib/Doctrine/ORM/Import/Import.php delete mode 100644 lib/Doctrine/ORM/Import/Schema.php diff --git a/lib/Doctrine/ORM/Export/Schema.php b/lib/Doctrine/ORM/Export/Schema.php deleted file mode 100644 index a915637ee..000000000 --- a/lib/Doctrine/ORM/Export/Schema.php +++ /dev/null @@ -1,131 +0,0 @@ -. - */ - -/** - * Doctrine_Export_Schema - * - * Used for exporting a schema to a yaml file - * - * @package Doctrine - * @subpackage Export - * @link www.phpdoctrine.org - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version $Revision: 1838 $ - * @author Nicolas Bérard-Nault - * @author Jonathan H. Wage - */ -class Doctrine_Export_Schema -{ - /** - * buildSchema - * - * Build schema array that can be dumped to file - * - * @param string $directory - * @return void - */ - public function buildSchema($directory = null, $models = array()) - { - if ($directory) { - $loadedModels = Doctrine::loadModels($directory); - } else { - $loadedModels = Doctrine::getLoadedModels(); - } - - $array = array(); - - $parent = new ReflectionClass('Doctrine_ORM_Entity'); - - $sql = array(); - $fks = array(); - - // we iterate trhough the diff of previously declared classes - // and currently declared classes - foreach ($loadedModels as $className) { - if ( ! empty($models) && !in_array($className, $models)) { - continue; - } - - $record = new $className(); - $recordTable = $record->getTable(); - - $data = $recordTable->getExportableFormat(); - - $table = array(); - - foreach ($data['columns'] AS $name => $column) { - $data['columns'][$name]['type'] = $column['type'] . '(' . $column['length'] . ')'; - unset($data['columns'][$name]['length']); - } - - $table['columns'] = $data['columns']; - - $relations = $recordTable->getRelations(); - foreach ($relations as $key => $relation) { - $relationData = $relation->toArray(); - - $relationKey = $relationData['alias']; - - if (isset($relationData['refTable']) && $relationData['refTable']) { - $table['relations'][$relationKey]['refClass'] = $relationData['refTable']->getComponentName(); - } - - if (isset($relationData['class']) && $relationData['class'] && $relation['class'] != $relationKey) { - $table['relations'][$relationKey]['class'] = $relationData['class']; - } - - $table['relations'][$relationKey]['local'] = $relationData['local']; - $table['relations'][$relationKey]['foreign'] = $relationData['foreign']; - - if ($relationData['type'] === Doctrine_Relation::ONE) { - $table['relations'][$relationKey]['type'] = 'one'; - } else if($relationData['type'] === Doctrine_Relation::MANY) { - $table['relations'][$relationKey]['type'] = 'many'; - } else { - $table['relations'][$relationKey]['type'] = 'one'; - } - } - - $array[$className] = $table; - } - - return $array; - } - - /** - * exportSchema - * - * @param string $schema - * @param string $directory - * @return string $string of data in the specified format - * @return void - */ - public function exportSchema($schema, $format = 'yml', $directory = null, $models = array()) - { - $array = $this->buildSchema($directory, $models); - - if (is_dir($schema)) { - $schema = $schema . DIRECTORY_SEPARATOR . 'schema.' . $format; - } - - return Doctrine_Parser::dump($array, $format, $schema); - } -} \ No newline at end of file diff --git a/lib/Doctrine/ORM/Import/Exception.php b/lib/Doctrine/ORM/Import/Exception.php index a1ca43600..0800208e3 100644 --- a/lib/Doctrine/ORM/Import/Exception.php +++ b/lib/Doctrine/ORM/Import/Exception.php @@ -18,7 +18,7 @@ * and is licensed under the LGPL. For more information, see * . */ -Doctrine::autoload('Doctrine_Exception'); + /** * class Doctrine_Import_Exception * diff --git a/lib/Doctrine/ORM/Import/Import.php b/lib/Doctrine/ORM/Import/Import.php deleted file mode 100644 index d7214697a..000000000 --- a/lib/Doctrine/ORM/Import/Import.php +++ /dev/null @@ -1,81 +0,0 @@ -. - */ - -#namespace Doctrine::ORM::Import; - -/** - * class Doctrine_Import - * Main responsible of performing import operation. Delegates database schema - * reading to a reader object and passes the result to a builder object which - * builds a Doctrine data model. - * - * @package Doctrine - * @subpackage Import - * @link www.phpdoctrine.org - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @since 1.0 - * @version $Revision: 4866 $ - * @author Konsta Vesterinen - * @author Jukka Hassinen - */ -class Doctrine_Import extends Doctrine_Connection_Module -{ - /** - * importSchema - * - * method for importing existing schema to Doctrine_Entity classes - * - * @param string $directory - * @param array $databases - * @return array the names of the imported classes - * @todo ORM stuff - */ - public function importSchema($directory, array $databases = array(), array $options = array()) - { - $connections = Doctrine_Manager::getInstance()->getConnections(); - - foreach ($connections as $name => $connection) { - // Limit the databases to the ones specified by $databases. - // Check only happens if array is not empty - if ( ! empty($databases) && !in_array($name, $databases)) { - continue; - } - - $builder = new Doctrine_Builder_Record(); - $builder->setTargetPath($directory); - $builder->setOptions($options); - - $classes = array(); - foreach ($connection->getSchemaManager()->listTables() as $table) { - $definition = array(); - $definition['tableName'] = $table; - $definition['className'] = Doctrine_Inflector::classify($table); - $definition['columns'] = $connection->getSchemaManager()->listTableColumns($table); - - $builder->buildRecord($definition); - - $classes[] = $definition['className']; - } - } - - return $classes; - } -} \ No newline at end of file diff --git a/lib/Doctrine/ORM/Import/Reader/Db.php b/lib/Doctrine/ORM/Import/Reader/Db.php index 73bdacd4a..7286661fb 100644 --- a/lib/Doctrine/ORM/Import/Reader/Db.php +++ b/lib/Doctrine/ORM/Import/Reader/Db.php @@ -18,7 +18,7 @@ * and is licensed under the LGPL. For more information, see * . */ -Doctrine::autoload('Doctrine_Import_Reader'); + /** * class Doctrine_Import_Reader_Db * Reads a database using the given PDO connection and constructs a database diff --git a/lib/Doctrine/ORM/Import/Schema.php b/lib/Doctrine/ORM/Import/Schema.php deleted file mode 100644 index 9dbe78a7c..000000000 --- a/lib/Doctrine/ORM/Import/Schema.php +++ /dev/null @@ -1,459 +0,0 @@ -. - */ - -/** - * class Doctrine_Import_Schema - * - * Different methods to import a XML schema. The logic behind using two different - * methods is simple. Some people will like the idea of producing Doctrine_Entity - * objects directly, which is totally fine. But in fast and growing application, - * table definitions tend to be a little bit more volatile. importArr() can be used - * to output a table definition in a PHP file. This file can then be stored - * independantly from the object itself. - * - * @package Doctrine - * @subpackage Import - * @link www.phpdoctrine.org - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version $Revision: 1838 $ - * @author Nicolas Bérard-Nault - * @author Jonathan H. Wage - */ -class Doctrine_Import_Schema -{ - protected $_relations = array(); - protected $_options = array('packagesPrefix' => 'Package', - 'packagesPath' => '', - 'generateBaseClasses' => true, - 'baseClassesDirectory' => 'generated', - 'baseClassName' => 'Doctrine_ORM_Entity', - 'suffix' => '.php'); - - /** - * getOption - * - * @param string $name - * @return void - */ - public function getOption($name) - { - if (isset($this->_options[$name])) { - return $this->_options[$name]; - } - } - - /** - * getOptions - * - * @return void - */ - public function getOptions() - { - return $this->_options; - } - - /** - * setOption - * - * @param string $name - * @param string $value - * @return void - */ - public function setOption($name, $value) - { - if (isset($this->_options[$name])) { - $this->_options[$name] = $value; - } - } - - /** - * setOptions - * - * @param string $options - * @return void - */ - public function setOptions($options) - { - if (!empty($options)) { - $this->_options = $options; - } - } - - /** - * buildSchema - * - * Loop throug directories of schema files and part them all in to one complete array of schema information - * - * @param string $schema Array of schema files or single schema file. Array of directories with schema files or single directory - * @param string $format Format of the files we are parsing and building from - * @return array $array - */ - public function buildSchema($schema, $format) - { - $array = array(); - - foreach ((array) $schema AS $s) { - if (is_file($s)) { - $array = array_merge($array, $this->parseSchema($s, $format)); - } else if (is_dir($s)) { - $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($s), - RecursiveIteratorIterator::LEAVES_ONLY); - - foreach ($it as $file) { - $e = explode('.', $file->getFileName()); - if (end($e) === $format) { - $array = array_merge($array, $this->parseSchema($file->getPathName(), $format)); - } - } - } else { - $array = array_merge($array, $this->parseSchema($s, $format)); - } - } - - $array = $this->_buildRelationships($array); - - return $array; - } - - /** - * importSchema - * - * A method to import a Schema and translate it into a Doctrine_Entity object - * - * @param string $schema The file containing the XML schema - * @param string $directory The directory where the Doctrine_Entity class will be written - * @param array $models Optional array of models to import - * - * @return void - */ - public function importSchema($schema, $format = 'yml', $directory = null, $models = array()) - { - $builder = new Doctrine_Builder_Record(); - $builder->setTargetPath($directory); - $builder->setOptions($this->getOptions()); - - $array = $this->buildSchema($schema, $format); - - foreach ($array as $name => $definition) { - if ( ! empty($models) && !in_array($definition['className'], $models)) { - continue; - } - - $builder->buildRecord($definition); - } - } - - /** - * parseSchema - * - * A method to parse a Schema and translate it into a property array. - * The function returns that property array. - * - * @param string $schema Path to the file containing the schema - * @return array $build Built array of schema information - */ - public function parseSchema($schema, $type) - { - $defaults = array('className' => null, - 'tableName' => null, - 'connection' => null, - 'relations' => array(), - 'indexes' => array(), - 'attributes' => array(), - 'templates' => array(), - 'actAs' => array(), - 'options' => array(), - 'package' => null, - 'inheritance' => array(), - 'subclasses' => array(), - 'detect_relations' => false, - 'generate_accessors' => false); - - $array = Doctrine_Parser::load($schema, $type); - - // Go through the schema and look for global values so we can assign them to each table/class - $globals = array(); - $globalKeys = array('connection', - 'attributes', - 'templates', - 'actAs', - 'options', - 'package', - 'inheritance', - 'detect_relations', - 'generate_accessors'); - - // Loop over and build up all the global values and remove them from the array - foreach ($array as $key => $value) { - if (in_array($key, $globalKeys)) { - unset($array[$key]); - $globals[$key] = $value; - } - } - - // Apply the globals to each table if it does not have a custom value set already - foreach ($array as $className => $table) { - foreach ($globals as $key => $value) { - if (!isset($array[$className][$key])) { - $array[$className][$key] = $value; - } - } - } - - $build = array(); - - foreach ($array as $className => $table) { - $columns = array(); - - $className = isset($table['className']) ? (string) $table['className']:(string) $className; - - if (isset($table['tableName']) && $table['tableName']) { - $tableName = $table['tableName']; - } else { - if (isset($table['inheritance']['extends'])) { - $tableName = null; - } else { - $tableName = Doctrine::tableize($className); - } - } - - $columns = isset($table['columns']) ? $table['columns']:array(); - - if ( ! empty($columns)) { - foreach ($columns as $columnName => $field) { - // Support short syntax: my_column: integer(4) - if (!is_array($field)) { - $original = $field; - $field = array(); - $field['type'] = $original; - } - - $colDesc = array(); - $colDesc['name'] = $columnName; - - // Support short type(length) syntax: my_column: { type: integer(4) } - $e = explode('(', $field['type']); - if (isset($e[0]) && isset($e[1])) { - $colDesc['type'] = $e[0]; - $colDesc['length'] = substr($e[1], 0, strlen($e[1]) - 1); - } else { - $colDesc['type'] = isset($field['type']) ? (string) $field['type']:null; - $colDesc['length'] = isset($field['length']) ? (int) $field['length']:null; - $colDesc['length'] = isset($field['size']) ? (int) $field['size']:$colDesc['length']; - } - - $colDesc['fixed'] = isset($field['fixed']) ? (int) $field['fixed']:null; - $colDesc['primary'] = isset($field['primary']) ? (bool) (isset($field['primary']) && $field['primary']):null; - $colDesc['default'] = isset($field['default']) ? $field['default']:null; - $colDesc['autoincrement'] = isset($field['autoincrement']) ? (bool) (isset($field['autoincrement']) && $field['autoincrement']):null; - $colDesc['sequence'] = isset($field['sequence']) ? (string) $field['sequence']:null; - $colDesc['values'] = isset($field['values']) ? (array) $field['values']:null; - - // Include all the specified and valid validators in the colDesc - $validators = Doctrine_Lib::getValidators(); - - foreach ($validators as $validator) { - if (isset($field[$validator])) { - $colDesc[$validator] = $field[$validator]; - } - } - - $columns[(string) $colDesc['name']] = $colDesc; - } - } - - // Apply the default values - foreach ($defaults as $key => $defaultValue) { - if (isset($table[$key]) && !isset($build[$className][$key])) { - $build[$className][$key] = $table[$key]; - } else { - $build[$className][$key] = isset($build[$className][$key]) ? $build[$className][$key]:$defaultValue; - } - } - - $build[$className]['className'] = $className; - $build[$className]['tableName'] = $tableName; - $build[$className]['columns'] = $columns; - - // Make sure that anything else that is specified in the schema makes it to the final array - $build[$className] = Doctrine_Lib::arrayDeepMerge($table, $build[$className]); - - // We need to keep track of the className for the connection - $build[$className]['connectionClassName'] = $build[$className]['className']; - } - - return $build; - } - - /** - * buildRelationships - * - * Loop through an array of schema information and build all the necessary relationship information - * Will attempt to auto complete relationships and simplify the amount of information required for defining a relationship - * - * @param string $array - * @return void - */ - protected function _buildRelationships($array) - { - // Handle auto detecting relations by the names of columns - // User.contact_id will automatically create User hasOne Contact local => contact_id, foreign => id - foreach ($array as $className => $properties) { - if (isset($properties['columns']) && !empty($properties['columns']) && isset($properties['detect_relations']) && $properties['detect_relations']) { - foreach ($properties['columns'] as $column) { - $columnClassName = Doctrine_Inflector::classify(str_replace('_id', '', $column['name'])); - if (isset($array[$columnClassName]) && !isset($array[$className]['relations'][$columnClassName])) { - $array[$className]['relations'][$columnClassName] = array(); - } - } - } - } - - foreach ($array as $name => $properties) { - if ( ! isset($properties['relations'])) { - continue; - } - - $className = $properties['className']; - $relations = $properties['relations']; - - foreach ($relations as $alias => $relation) { - $class = isset($relation['class']) ? $relation['class']:$alias; - - // Attempt to guess the local and foreign - if (isset($relation['refClass'])) { - $relation['local'] = isset($relation['local']) ? $relation['local']:Doctrine::tableize($name) . '_id'; - $relation['foreign'] = isset($relation['foreign']) ? $relation['foreign']:Doctrine::tableize($class) . '_id'; - } else { - $relation['local'] = isset($relation['local']) ? $relation['local']:Doctrine::tableize($class) . '_id'; - $relation['foreign'] = isset($relation['foreign']) ? $relation['foreign']:'id'; - } - - $relation['alias'] = isset($relation['alias']) ? $relation['alias'] : $alias; - $relation['class'] = $class; - - if (isset($relation['refClass'])) { - $relation['type'] = 'many'; - } - - if (isset($relation['type']) && $relation['type']) { - $relation['type'] = $relation['type'] === 'one' ? Doctrine_Relation::ONE:Doctrine_Relation::MANY; - } else { - $relation['type'] = Doctrine_Relation::ONE; - } - - if (isset($relation['foreignType']) && $relation['foreignType']) { - $relation['foreignType'] = $relation['foreignType'] === 'one' ? Doctrine_Relation::ONE:Doctrine_Relation::MANY; - } - - $relation['key'] = $this->_buildUniqueRelationKey($relation); - - $this->_relations[$className][$alias] = $relation; - } - } - - // Now we auto-complete opposite ends of relationships - $this->_autoCompleteOppositeRelations(); - - // Make sure we do not have any duplicate relations - $this->_fixDuplicateRelations(); - - foreach ($this->_relations as $className => $relations) { - $array[$className]['relations'] = $relations; - } - - return $array; - } - - /** - * fixRelationships - * - * Loop through all relationships building the opposite ends of each relationship - * and make sure no duplicate relations exist - * - * @return void - */ - protected function _autoCompleteOppositeRelations() - { - foreach($this->_relations as $className => $relations) { - foreach ($relations AS $alias => $relation) { - $newRelation = array(); - $newRelation['foreign'] = $relation['local']; - $newRelation['local'] = $relation['foreign']; - $newRelation['class'] = isset($relation['foreignClass']) ? $relation['foreignClass']:$className; - $newRelation['alias'] = isset($relation['foreignAlias']) ? $relation['foreignAlias']:$className; - - // this is so that we know that this relation was autogenerated and - // that we do not need to include it if it is explicitly declared in the schema by the users. - $newRelation['autogenerated'] = true; - - if (isset($relation['refClass'])) { - $newRelation['refClass'] = $relation['refClass']; - $newRelation['type'] = isset($relation['foreignType']) ? $relation['foreignType']:$relation['type']; - } else { - if(isset($relation['foreignType'])) { - $newRelation['type'] = $relation['foreignType']; - } else { - $newRelation['type'] = $relation['type'] === Doctrine_Relation::ONE ? Doctrine_Relation::MANY:Doctrine_Relation::ONE; - } - } - - if ( ! isset($this->_relations[$relation['class']][$newRelation['alias']])) { - $newRelation['key'] = $this->_buildUniqueRelationKey($newRelation); - $this->_relations[$relation['class']][$newRelation['alias']] = $newRelation; - } - } - } - } - - protected function _fixDuplicateRelations() - { - foreach($this->_relations as $className => $relations) { - // This is for checking for duplicates between alias-relations and a auto-generated relations to ensure the result set of unique relations - $existingRelations = array(); - $uniqueRelations = array(); - foreach ($relations as $relation) { - if ( ! in_array($relation['key'], $existingRelations)) { - $existingRelations[] = $relation['key']; - $uniqueRelations = array_merge($uniqueRelations, array($relation['alias'] => $relation)); - } else { - // check to see if this relationship is not autogenerated, if it's not, then the user must have explicitly declared it - if (!isset($relation['autogenerated']) || $relation['autogenerated'] != true) { - $uniqueRelations = array_merge($uniqueRelations, array($relation['alias'] => $relation)); - } - } - } - - $this->_relations[$className] = $uniqueRelations; - } - } - - /** - * _buildUniqueRelationKey - * - * @param string $relation - * @return void - */ - protected function _buildUniqueRelationKey($relation) - { - return md5($relation['local'].$relation['foreign'].$relation['class'].(isset($relation['refClass']) ? $relation['refClass']:null)); - } -} \ No newline at end of file