Merge branch 'master' of github.com:doctrine/doctrine2
This commit is contained in:
commit
53ca54ced6
1 changed files with 4 additions and 1 deletions
|
@ -275,7 +275,6 @@ class ClassMetadata extends ClassMetadataInfo
|
||||||
{
|
{
|
||||||
// This metadata is always serialized/cached.
|
// This metadata is always serialized/cached.
|
||||||
$serialized = array(
|
$serialized = array(
|
||||||
'namedQueries',
|
|
||||||
'associationMappings',
|
'associationMappings',
|
||||||
'columnNames', //TODO: Not really needed. Can use fieldMappings[$fieldName]['columnName']
|
'columnNames', //TODO: Not really needed. Can use fieldMappings[$fieldName]['columnName']
|
||||||
'fieldMappings',
|
'fieldMappings',
|
||||||
|
@ -331,6 +330,10 @@ class ClassMetadata extends ClassMetadataInfo
|
||||||
$serialized[] = 'lifecycleCallbacks';
|
$serialized[] = 'lifecycleCallbacks';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($this->namedQueries) {
|
||||||
|
$serialized[] = 'namedQueries';
|
||||||
|
}
|
||||||
|
|
||||||
return $serialized;
|
return $serialized;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue