EntityFieldQuery does not handle ordering correctly

We need to yank entityOrder, fieldOrder, propertyOrder and add one order, it will be a list of ('type' => $type, 'specifier' => something, direction' => ASC) where $type can be entity, property, field and specifier will be the respective name / for field a list of the field and the column name. We need to keep a fieldIndex going. The fields array will become sparse (ie it wontbe indexed from 0...count-1 but it will 0,1 , 5, 9 as it needs to be the same index as the order array which contains nonfield things) but who cares?

I know + foreach ($this->propertyConditions as $entity_condition) { is from HEAD but care to fix it? it reads really WTFish. You can change + $index = $specifier['index']; $table_alias = $table_aliases[$index]; into just $table_alias = $table_aliases[$specifier['index']]. thanks for the great work. Are you sure there is no need for new tests?

This is quite a find and quite a fix. We are getting closer to tablesort. A lot closer because we can ask the users to give us tablesort arrays in the form order stores them (almost).

Note that once this is committed we have #885014: Add pager and tablesort to EntityFieldQuery ready too.

+++ includes/entity.inc
@@ -1023,16 +1009,21 @@ class EntityFieldQuery {
+    ¶
...
+    ¶

+++ modules/field/modules/field_sql_storage/field_sql_storage.module
@@ -538,35 +538,53 @@ function field_sql_storage_field_storage_query(EntityFieldQuery $query) {
+  ¶
...
+  ¶
...
+  ¶

+++ modules/simpletest/tests/entity_query.test
@@ -416,30 +416,59 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase {
+    ¶

Trailing white-space here.

Powered by Dreditor.

Let's get that fixed quickly then. :)

Committed to CVS HEAD. Thanks.