RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[2.0][DDC-5] Fixed.

Browse source
This commit is contained in:
romanb 2009-09-19 12:17:01 +00:00
parent 92801ba8bd
commit 8c5887d05d
5 changed files with 1 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

4
lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
View file

@ -56,13 +56,11 @@ final class JoinColumns extends Annotation {}
final class Column extends Annotation { final class Column extends Annotation {
public $type; public $type;
public $length; public $length;
public $fixed = false;
public $precision = 0; // The precision for a decimal (exact numeric) column (Applies only for decimal column) 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 $scale = 0; // The scale for a decimal (exact numeric) column (Applies only for decimal column)
public $unsigned = false;
public $unique = false; public $unique = false;
public $nullable = false; public $nullable = false;
public $default; public $default; //TODO: remove?
public $name; public $name;
public $options = array(); public $options = array();
} }

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

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

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

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

12
lib/Doctrine/ORM/Tools/SchemaTool.php
View file

@ -569,24 +569,12 @@ class SchemaTool
$columnInfo['fixed'] = $fieldMapping['fixed']; $columnInfo['fixed'] = $fieldMapping['fixed'];
$columnChanged = true; $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 // Only add to column changed list if it was actually changed
if ($columnChanged) { if ($columnChanged) {
$updateFields[] = $columnInfo; $updateFields[] = $columnInfo;
} }
//var_dump($columnInfo);
echo PHP_EOL . PHP_EOL;
unset($currentColumns[$index]); unset($currentColumns[$index]);
$exists = true; $exists = true;
break; break;