diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-06-07 00:00:57 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-06-07 00:00:57 +0000 |
| commit | 395713ba4ee13c5eba520047011731c34633b1be (patch) | |
| tree | e859bad65e6adf0afabde7854dad3a169ec54cbf /modules/field | |
| parent | 967564af461946b132be4b9c654932bdec294627 (diff) | |
| download | brdo-395713ba4ee13c5eba520047011731c34633b1be.tar.gz brdo-395713ba4ee13c5eba520047011731c34633b1be.tar.bz2 | |
#392494 follow-up by yched: Clean-ups to Field API scalar search patch.
Diffstat (limited to 'modules/field')
| -rw-r--r-- | modules/field/field.attach.inc | 2 | ||||
| -rw-r--r-- | modules/field/field.test | 2 | ||||
| -rw-r--r-- | modules/field/modules/field_sql_storage/field_sql_storage.module | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/modules/field/field.attach.inc b/modules/field/field.attach.inc index 9b9e92a3f..db5c59935 100644 --- a/modules/field/field.attach.inc +++ b/modules/field/field.attach.inc @@ -833,7 +833,7 @@ function field_attach_query($field_name, $conditions, $result_format = FIELD_QUE // are therefore called on each object separately, which might cause // performance issues when large numbers of revisions are retrieved. foreach ($pseudo_objects as $vid => $pseudo_object) { - list($id) = _field_attach_extract_ids($obj_type, $pseudo_object); + list($id) = field_attach_extract_ids($obj_type, $pseudo_object); $objects = array($id => $pseudo_object); // Invoke hook_field_load(). diff --git a/modules/field/field.test b/modules/field/field.test index 826410bd3..c4aee219b 100644 --- a/modules/field/field.test +++ b/modules/field/field.test @@ -467,8 +467,6 @@ class FieldAttachTestCase extends DrupalWebTestCase { ), ); $this->assertEqual($result, $expected, t('FIELD_QUERY_RETURN_VALUES result format returns the expect result')); - - // TODO : test } function testFieldAttachViewAndPreprocess() { diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.module b/modules/field/modules/field_sql_storage/field_sql_storage.module index 5a3d659b9..7b813835c 100644 --- a/modules/field/modules/field_sql_storage/field_sql_storage.module +++ b/modules/field/modules/field_sql_storage/field_sql_storage.module @@ -384,10 +384,6 @@ function field_sql_storage_field_storage_query($field_name, $conditions, $result @list($column, $value, $operator) = $condition; // Translate operator and value if needed. switch ($operator) { - case NULL: - $operator = is_array($value) ? 'IN' : '='; - break; - case 'STARTS_WITH': $operator = 'LIKE'; $value .= '%'; |