File tree Expand file tree Collapse file tree 6 files changed +17
-122
lines changed
Sales/Model/ResourceModel/Order Expand file tree Collapse file tree 6 files changed +17
-122
lines changed Original file line number Diff line number Diff line change @@ -93,8 +93,11 @@ protected function _initSelect()
93
93
parent ::_initSelect ();
94
94
95
95
$ tableDescription = $ this ->getConnection ()->describeTable ($ this ->getMainTable ());
96
- foreach ($ tableDescription as $ columnInfo ) {
97
- $ this ->addFilterToMap ($ columnInfo ['COLUMN_NAME ' ], 'main_table. ' .$ columnInfo ['COLUMN_NAME ' ]);
96
+
97
+ if ($ tableDescription ) {
98
+ foreach ($ tableDescription as $ columnInfo ) {
99
+ $ this ->addFilterToMap ($ columnInfo ['COLUMN_NAME ' ], 'main_table. ' . $ columnInfo ['COLUMN_NAME ' ]);
100
+ }
98
101
}
99
102
100
103
return $ this ;
Original file line number Diff line number Diff line change @@ -93,8 +93,11 @@ protected function _initSelect()
93
93
parent ::_initSelect ();
94
94
95
95
$ tableDescription = $ this ->getConnection ()->describeTable ($ this ->getMainTable ());
96
- foreach ($ tableDescription as $ columnInfo ) {
97
- $ this ->addFilterToMap ($ columnInfo ['COLUMN_NAME ' ], 'main_table. ' .$ columnInfo ['COLUMN_NAME ' ]);
96
+
97
+ if ($ tableDescription ) {
98
+ foreach ($ tableDescription as $ columnInfo ) {
99
+ $ this ->addFilterToMap ($ columnInfo ['COLUMN_NAME ' ], 'main_table. ' .$ columnInfo ['COLUMN_NAME ' ]);
100
+ }
98
101
}
99
102
100
103
return $ this ;
Original file line number Diff line number Diff line change @@ -27,9 +27,9 @@ class CollectionFilter extends SearchResult
27
27
* @param Logger $logger
28
28
* @param FetchStrategy $fetchStrategy
29
29
* @param EventManager $eventManager
30
+ * @param TimezoneInterface $timeZone
30
31
* @param string $mainTable
31
32
* @param string $resourceModel
32
- * @param TimezoneInterface $timeZone
33
33
*/
34
34
public function __construct (
35
35
EntityFactory $ entityFactory ,
@@ -47,13 +47,16 @@ public function __construct(
47
47
/**
48
48
* @inheritdoc
49
49
*/
50
- protected function _initSelect ()
50
+ public function _initSelect ()
51
51
{
52
52
parent ::_initSelect ();
53
53
54
54
$ tableDescription = $ this ->getConnection ()->describeTable ($ this ->getMainTable ());
55
- foreach ($ tableDescription as $ columnInfo ) {
56
- $ this ->addFilterToMap ($ columnInfo ['COLUMN_NAME ' ], 'main_table. ' .$ columnInfo ['COLUMN_NAME ' ]);
55
+
56
+ if ($ tableDescription ) {
57
+ foreach ($ tableDescription as $ columnInfo ) {
58
+ $ this ->addFilterToMap ($ columnInfo ['COLUMN_NAME ' ], 'main_table. ' . $ columnInfo ['COLUMN_NAME ' ]);
59
+ }
57
60
}
58
61
59
62
return $ this ;
Load Diff This file was deleted.
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments