diff options
Diffstat (limited to 'modules/field/tests/field_test.entity.inc')
| -rw-r--r-- | modules/field/tests/field_test.entity.inc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/modules/field/tests/field_test.entity.inc b/modules/field/tests/field_test.entity.inc index 953b0a01c..cdd3b0c34 100644 --- a/modules/field/tests/field_test.entity.inc +++ b/modules/field/tests/field_test.entity.inc @@ -164,11 +164,19 @@ function field_test_create_stub_entity($id = 1, $vid = 1, $bundle = 'test_bundle function field_test_entity_test_load($ftid, $ftvid = NULL) { // Load basic strucure. $query = db_select('test_entity', 'fte', array()) - ->fields('fte') - ->condition('ftid', $ftid); + ->condition('fte.ftid', $ftid); + if ($ftvid) { - $query->condition('ftvid', $ftvid); + $query->join('test_entity_revision', 'fter', 'fte.ftid = fter.ftid'); + $query->addField('fte', 'ftid'); + $query->addField('fte', 'fttype'); + $query->addField('fter', 'ftvid'); + $query->condition('fter.ftvid', $ftvid); + } + else { + $query->fields('fte'); } + $entities = $query->execute()->fetchAllAssoc('ftid'); // Attach fields. |