Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#910190 by sun: Remove schema cache from needlessly being loaded on all pages. Performance improvement.

merge-requests/26/head
Angie Byron 2010-09-15 04:34:27 +00:00
parent b1d2adf26a
commit a3bc10c4ab
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/common.inc
View File

@ -6689,6 +6689,14 @@ function entity_get_info($entity_type = NULL) {
if (empty($entity_info[$name]['entity keys']['bundle']) && empty($entity_info[$name]['bundles'])) { if (empty($entity_info[$name]['entity keys']['bundle']) && empty($entity_info[$name]['bundles'])) {
$entity_info[$name]['bundles'] = array($name => array('label' => $entity_info[$name]['label'])); $entity_info[$name]['bundles'] = array($name => array('label' => $entity_info[$name]['label']));
} }
// Prepare entity schema fields SQL info for
// DrupalEntityControllerInterface::buildQuery().
if (isset($entity_info[$name]['base table'])) {
$entity_info[$name]['schema_fields_sql']['base table'] = drupal_schema_fields_sql($entity_info[$name]['base table']);
if (isset($entity_info[$name]['revision table'])) {
$entity_info[$name]['schema_fields_sql']['revision table'] = drupal_schema_fields_sql($entity_info[$name]['revision table']);
}
}
} }
// Let other modules alter the entity info. // Let other modules alter the entity info.
drupal_alter('entity_info', $entity_info); drupal_alter('entity_info', $entity_info);

4
includes/entity.inc
View File

@ -251,11 +251,11 @@ class DrupalDefaultEntityController implements DrupalEntityControllerInterface {
} }
// Add fields from the {entity} table. // Add fields from the {entity} table.
$entity_fields = drupal_schema_fields_sql($this->entityInfo['base table']); $entity_fields = $this->entityInfo['schema_fields_sql']['base table'];
if ($this->revisionKey) { if ($this->revisionKey) {
// Add all fields from the {entity_revision} table. // Add all fields from the {entity_revision} table.
$entity_revision_fields = drupal_map_assoc(drupal_schema_fields_sql($this->revisionTable)); $entity_revision_fields = drupal_map_assoc($this->entityInfo['schema_fields_sql']['revision table']);
// The id field is provided by entity, so remove it. // The id field is provided by entity, so remove it.
unset($entity_revision_fields[$this->idKey]); unset($entity_revision_fields[$this->idKey]);

1
modules/simpletest/tests/entity_cache_test_dependency.module
View File

@ -13,7 +13,6 @@ function entity_cache_test_dependency_entity_info() {
return array( return array(
'entity_cache_test' => array( 'entity_cache_test' => array(
'label' => 'Entity Cache Test', 'label' => 'Entity Cache Test',
'base table' => 'entity_cache_test',
), ),
); );
} }