|
@@ -151,11 +151,11 @@ discard block |
|
|
block discarded – undo |
|
151
|
151
|
|
|
152
|
152
|
Type::registerCustomTypes(); |
|
153
|
153
|
|
|
154
|
|
- $conn = 'database.connections.' . config('database.default'); |
|
|
154
|
+ $conn = 'database.connections.'.config('database.default'); |
|
155
|
155
|
|
|
156
|
|
- $table['options']['collate'] = $table['options']['collation'] ?? config($conn . '.collation', 'utf8mb4_unicode_ci'); |
|
|
156
|
+ $table['options']['collate'] = $table['options']['collation'] ?? config($conn.'.collation', 'utf8mb4_unicode_ci'); |
|
157
|
157
|
if (Driver::isMysql()) { |
|
158
|
|
- $table['options']['charset'] = $table['options']['charset'] ?? config($conn . '.charset', 'utf8mb4'); |
|
|
158
|
+ $table['options']['charset'] = $table['options']['charset'] ?? config($conn.'.charset', 'utf8mb4'); |
|
159
|
159
|
} |
|
160
|
160
|
|
|
161
|
161
|
$tableName = $table['name']; |
|
@@ -279,7 +279,7 @@ discard block |
|
|
block discarded – undo |
|
279
|
279
|
$items = static::all(); |
|
280
|
280
|
$collection = $items instanceof Collection ? $items : Collection::make($items); |
|
281
|
281
|
if (!empty($query)) { |
|
282
|
|
- $collection = $collection->filter(function ($value, $key) use ($query) { |
|
|
282
|
+ $collection = $collection->filter(function($value, $key) use ($query) { |
|
283
|
283
|
return false !== stristr($value, $query); |
|
284
|
284
|
}); |
|
285
|
285
|
} |
Please login to merge, or discard this patch.