diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-09-15 04:34:27 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-09-15 04:34:27 +0000 |
| commit | a3bc10c4ab9bf30adc031f20c4aac38355bd90e4 (patch) | |
| tree | 99fec441bf593a3ed87747ae3089f19f9df77c9b | |
| parent | b1d2adf26af61f57ab9df046a020db6142fe74de (diff) | |
| download | brdo-a3bc10c4ab9bf30adc031f20c4aac38355bd90e4.tar.gz brdo-a3bc10c4ab9bf30adc031f20c4aac38355bd90e4.tar.bz2 | |
#910190 by sun: Remove schema cache from needlessly being loaded on all pages. Performance improvement.
| -rw-r--r-- | includes/common.inc | 8 | ||||
| -rw-r--r-- | includes/entity.inc | 4 | ||||
| -rw-r--r-- | modules/simpletest/tests/entity_cache_test_dependency.module | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/includes/common.inc b/includes/common.inc index 03bf41151..07422d08d 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -6689,6 +6689,14 @@ function entity_get_info($entity_type = NULL) { 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'])); } + // 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. drupal_alter('entity_info', $entity_info); diff --git a/includes/entity.inc b/includes/entity.inc index 59473c276..b67a31798 100644 --- a/includes/entity.inc +++ b/includes/entity.inc @@ -251,11 +251,11 @@ class DrupalDefaultEntityController implements DrupalEntityControllerInterface { } // 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) { // 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. unset($entity_revision_fields[$this->idKey]); diff --git a/modules/simpletest/tests/entity_cache_test_dependency.module b/modules/simpletest/tests/entity_cache_test_dependency.module index 19d51cc36..1f9c1c3ba 100644 --- a/modules/simpletest/tests/entity_cache_test_dependency.module +++ b/modules/simpletest/tests/entity_cache_test_dependency.module @@ -13,7 +13,6 @@ function entity_cache_test_dependency_entity_info() { return array( 'entity_cache_test' => array( 'label' => 'Entity Cache Test', - 'base table' => 'entity_cache_test', ), ); } |