RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 22:41:43 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Some work over SchemaTool update of schema (affects directly the CLI schema-tool task on --update option.

Browse Source
This commit is contained in:
guilhermeblanco 2009-09-12 23:25:47 +00:00
parent 93445983fb
commit 7ef91a6449
10 changed files with 143 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
View File

@ -762,7 +762,8 @@ abstract class AbstractPlatform
public function getDecimalTypeDeclarationSql(array $columnDef)
{
$columnDef['precision'] = ( ! isset($columnDef['precision']) || empty($columnDef['precision']))
? 10 : $columnDef['precision'];
? (( ! isset($columnDef['length']) || empty($columnDef['length'])) ? 10 : $columnDef['length'])
: $columnDef['precision'];
$columnDef['scale'] = ( ! isset($columnDef['scale']) || empty($columnDef['scale']))
? 0 : $columnDef['scale'];

13
lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
View File

@ -109,7 +109,7 @@ class MySqlSchemaManager extends AbstractSchemaManager
$values = null;
$scale = null;
switch ($dbType) {
case 'tinyint':
$type = 'integer';
@ -239,27 +239,24 @@ class MySqlSchemaManager extends AbstractSchemaManager
'unsigned' => (bool) $unsigned,
'fixed' => (bool) $fixed
);
if ($values !== null) {
$def['values'] = $values;
}
if ($scale !== null) {
$def['scale'] = $scale;
}
$values = isset($def['values']) ? $def['values'] : array();
$values = ($values !== null) ? $values : array();
$column = array(
'name' => $tableColumn['Field'],
'values' => $values,
'primary' => (bool) (strtolower($tableColumn['Key']) == 'pri'),
'unique' => (bool) (strtolower($tableColumn['Key']) == 'uni'),
'default' => $tableColumn['Default'],
'notnull' => (bool) ($tableColumn['Null'] != 'YES'),
'autoincrement' => (bool) (strpos($tableColumn['Extra'], 'auto_increment') !== false),
);
$column = array_merge($column, $def);
return $column;
return array_merge($column, $def);
}
public function _getPortableTableForeignKeyDefinition($tableForeignKey)

4
lib/Doctrine/ORM/Mapping/ClassMetadata.php
View File

@ -628,11 +628,11 @@ final class ClassMetadata
* @param string $fieldName The field name
* @return boolean TRUE if the field is not null, FALSE otherwise.
*/
public function isNotNull($fieldName)
public function isNullable($fieldName)
{
$mapping = $this->getFieldMapping($fieldName);
if ($mapping !== false) {
return isset($mapping['nullable']) && $mapping['nullable'] == false;
return isset($mapping['nullable']) && $mapping['nullable'] == true;
}
return false;
}

12
lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
View File

@ -30,11 +30,13 @@ use Doctrine\Common\DoctrineException,
* metadata mapping informations of a class which describes how a class should be mapped
* to a relational database.
*
* @author Roman Borschel <roman@code-factory.org>
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @version $Revision$
* @link www.doctrine-project.org
* @since 2.0
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 2.0
* @version $Revision: 3938 $
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
* @author Jonathan Wage <jonwage@gmail.com>
* @author Roman Borschel <roman@code-factory.org>
*/
class ClassMetadataFactory
{

2
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
View File

@ -169,8 +169,10 @@ class AnnotationDriver implements Driver
$mapping['type'] = $columnAnnot->type;
$mapping['length'] = $columnAnnot->length;
$mapping['fixed'] = $columnAnnot->fixed;
$mapping['precision'] = $columnAnnot->precision;
$mapping['scale'] = $columnAnnot->scale;
$mapping['unsigned'] = $columnAnnot->unsigned;
$mapping['nullable'] = $columnAnnot->nullable;
$mapping['options'] = $columnAnnot->options;
$mapping['unique'] = $columnAnnot->unique;

2
lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
View File

@ -56,8 +56,10 @@ final class JoinColumns extends Annotation {}
final class Column extends Annotation {
public $type;
public $length;
public $fixed = false;
public $precision = 0; // The precision for a decimal (exact numeric) column (Applies only for decimal column)
public $scale = 0; // The scale for a decimal (exact numeric) column (Applies only for decimal column)
public $unsigned = false;
public $unique = false;
public $nullable = false;
public $default;

8
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
View File

@ -125,6 +125,10 @@ class XmlDriver extends AbstractFileDriver
$mapping['length'] = (int)$fieldMapping['length'];
}
if (isset($fieldMapping['fixed'])) {
$mapping['fixed'] = (bool)$fieldMapping['fixed'];
}
if (isset($fieldMapping['precision'])) {
$mapping['precision'] = (int)$fieldMapping['precision'];
}
@ -133,6 +137,10 @@ class XmlDriver extends AbstractFileDriver
$mapping['scale'] = (int)$fieldMapping['scale'];
}
if (isset($fieldMapping['unsigned'])) {
$mapping['unsigned'] = (bool)$fieldMapping['unsigned'];
}
if (isset($fieldMapping['unique'])) {
$mapping['unique'] = (bool)$fieldMapping['unique'];
}

8
lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
View File

@ -128,6 +128,10 @@ class YamlDriver extends AbstractFileDriver
$mapping['length'] = $fieldMapping['length'];
}
if (isset($fieldMapping['fixed'])) {
$mapping['fixed'] = (bool)$fieldMapping['fixed'];
}
if (isset($fieldMapping['precision'])) {
$mapping['precision'] = $fieldMapping['precision'];
}
@ -136,6 +140,10 @@ class YamlDriver extends AbstractFileDriver
$mapping['scale'] = $fieldMapping['scale'];
}
if (isset($fieldMapping['unsigned'])) {
$mapping['unsigned'] = (bool)$fieldMapping['unsigned'];
}
if (isset($fieldMapping['unique'])) {
$mapping['unique'] = (bool)$fieldMapping['unique'];
}

9
lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
View File

@ -33,8 +33,13 @@ use Doctrine\Common\DoctrineException,
* Specifies that the schema of the classes should be updated.
*
*
* @author robo
* @since 2.0
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 2.0
* @version $Revision: 3938 $
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
* @author Jonathan Wage <jonwage@gmail.com>
* @author Roman Borschel <roman@code-factory.org>
*/
class SchemaToolTask extends AbstractTask
{

103
lib/Doctrine/ORM/Tools/SchemaTool.php
View File

@ -497,20 +497,95 @@ class SchemaTool
$newClasses[] = $class;
} else {
$newFields = array();
$updateFields = array();
$dropIndexes = array();
$newJoinColumns = array();
$currentColumns = $sm->listTableColumns($tableName);
foreach ($class->fieldMappings as $fieldMapping) {
foreach ($class->fieldMappings as $fieldName => $fieldMapping) {
$exists = false;
foreach ($currentColumns as $index => $column) {
if ($column['name'] == $fieldMapping['columnName']) {
// Column exists, check for changes
$columnInfo = $column;
$columnChanged = false;
echo $column['name'] . ' ';
// 1. check for nullability change
$columnInfo['notnull'] = ( ! isset($columnInfo['notnull']))
? false : $columnInfo['notnull'];
$notnull = ! $class->isNullable($fieldName);
if ($columnInfo['notnull'] != $notnull) {
$columnInfo['notnull'] = $notnull;
$columnChanged = true;
}
unset($notnull);
// 2. check for uniqueness change
// 3. check for length change if type string
// 4. check for type change
$columnInfo['unique'] = ( ! isset($columnInfo['unique']))
? false : $columnInfo['unique'];
$unique = $class->isUniqueField($fieldName);
if ($columnInfo['unique'] != $unique) {
// We need to call a special DROP INDEX if it was defined
if ($columnInfo['unique']) {
$dropIndexes[] = $column['name'];
}
$columnInfo['unique'] = $unique;
$columnChanged = true;
}
unset($unique);
// 3. check for type change
$type = Type::getType($fieldMapping['type']);
if ($columnInfo['type'] != $type) {
$columnInfo['type'] = $type;
$columnChanged = true;
}
unset($type);
// 4. check for length change
// 5. check for scale and precision change
/*if (isset($fieldMapping['scale'])) {
$columnInfo['length'] = $fieldMapping['precision'];
$columnInfo['scale'] = $fieldMapping['scale'];
} else {
$columnInfo['length'] = $fieldMapping['length'];
}*/
// 6. check for flexible and fixed length
$fieldMapping['fixed'] = ( ! isset($fieldMapping['fixed']))
? false : $fieldMapping['fixed'];
if ($columnInfo['fixed'] != $fieldMapping['fixed']) {
$columnInfo['fixed'] = $fieldMapping['fixed'];
$columnChanged = true;
}
// 7. check for unsigned change
$fieldMapping['unsigned'] = ( ! isset($fieldMapping['unsigned']))
? false : $fieldMapping['unsigned'];
if ($columnInfo['unsigned'] != $fieldMapping['unsigned']) {
$columnInfo['unsigned'] = $fieldMapping['unsigned'];
$columnChanged = true;
}
// Only add to column changed list if it was actually changed
if ($columnChanged) {
$updateFields[] = $columnInfo;
}
//var_dump($columnInfo);
echo PHP_EOL . PHP_EOL;
unset($currentColumns[$index]);
$exists = true;
@ -550,6 +625,14 @@ class SchemaTool
}
}
// Drop indexes
if ($dropIndexes) {
foreach ($dropIndexes as $dropIndex) {
$sql[] = $this->_platform->getDropIndexSql($tableName, $dropIndex);
}
}
// Create new columns
if ($newFields || $newJoinColumns) {
$changes = array();
@ -565,6 +648,20 @@ class SchemaTool
$sql[] = $this->_platform->getAlterTableSql($tableName, $changes);
}
// Update existent columns
if ($updateFields) {
$changes = array();
foreach ($updateFields as $updateField) {
// Now we pick the Type instance
$changes['change'][$updateField['name']] = array(
'definition' => $updateField
);
}
$sql[] = $this->_platform->getAlterTableSql($tableName, $changes);
}
// Drop any remaining columns
if ($currentColumns) {
$changes = array();