@@ -101,13 +101,11 @@ public function addValueSortToCollectionDataProvider()
101
101
'expectedJoinCondition ' => [
102
102
0 => [
103
103
'requisites ' => ['code_t1 ' => "table " ],
104
- 'condition ' =>
105
- "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0' " ,
104
+ 'condition ' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0' " ,
106
105
],
107
106
1 => [
108
107
'requisites ' => ['code_t2 ' => "table " ],
109
- 'condition ' =>
110
- "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12' " ,
108
+ 'condition ' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12' " ,
111
109
],
112
110
],
113
111
'expectedOrder ' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) ASC ' ,
@@ -118,13 +116,11 @@ public function addValueSortToCollectionDataProvider()
118
116
'expectedJoinCondition ' => [
119
117
0 => [
120
118
'requisites ' => ['code_t1 ' => "table " ],
121
- 'condition ' =>
122
- "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0' " ,
119
+ 'condition ' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0' " ,
123
120
],
124
121
1 => [
125
122
'requisites ' => ['code_t2 ' => "table " ],
126
- 'condition ' =>
127
- "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12' " ,
123
+ 'condition ' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12' " ,
128
124
],
129
125
],
130
126
'expectedOrder ' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) DESC ' ,
@@ -135,8 +131,7 @@ public function addValueSortToCollectionDataProvider()
135
131
'expectedJoinCondition ' => [
136
132
0 => [
137
133
'requisites ' => ['code_t ' => "table " ],
138
- 'condition ' =>
139
- "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0' " ,
134
+ 'condition ' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0' " ,
140
135
],
141
136
],
142
137
'expectedOrder ' => 'code_t.value DESC ' ,
@@ -147,8 +142,7 @@ public function addValueSortToCollectionDataProvider()
147
142
'expectedJoinCondition ' => [
148
143
0 => [
149
144
'requisites ' => ['code_t ' => "table " ],
150
- 'condition ' =>
151
- "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0' " ,
145
+ 'condition ' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0' " ,
152
146
],
153
147
],
154
148
'expectedOrder ' => 'code_t.value ASC ' ,
0 commit comments