RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-21 14:43:14 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Fixes issue with optimistic timestamp locking (closes #2451)

Browse Source
This commit is contained in:
jwage 2009-09-08 17:09:32 +00:00
parent 8f75565277
commit adbfbf5417
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
View File

@ -264,7 +264,11 @@ class MySqlPlatform extends AbstractPlatform
*/ */
public function getDateTimeTypeDeclarationSql(array $fieldDeclaration) public function getDateTimeTypeDeclarationSql(array $fieldDeclaration)
{ {
return 'DATETIME'; if ($fieldDeclaration['version']) {
return 'TIMESTAMP';
} else {
return 'DATETIME';
}
} }
/** /**

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

@ -249,6 +249,7 @@ class SchemaTool
$column['length'] = isset($mapping['length']) ? $mapping['length'] : null; $column['length'] = isset($mapping['length']) ? $mapping['length'] : null;
$column['notnull'] = isset($mapping['nullable']) ? ! $mapping['nullable'] : false; $column['notnull'] = isset($mapping['nullable']) ? ! $mapping['nullable'] : false;
$column['unique'] = isset($mapping['unique']) ? $mapping['unique'] : false; $column['unique'] = isset($mapping['unique']) ? $mapping['unique'] : false;
$column['version'] = $class->isVersioned && $class->versionField == $mapping['fieldName'] ? true : false;
if (isset($mapping['precision'])) { if (isset($mapping['precision'])) {
$column['precision'] = $mapping['precision']; $column['precision'] = $mapping['precision'];