8000 Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin · laraveladmin-cn/laraveladmin@816c381 · GitHub
[go: up one dir, main page]

Skip to content

Commit 816c381

Browse files
author
张世平
committed
2 parents da7ad81 + c2df5a4 commit 816c381

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

app/Console/Commands/MigrateAllCommand.php

+15
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,25 @@ class MigrateAllCommand extends BaseCommand
3232
public function handle()
3333
{
3434
$directories = Storage::disk('migrations')->allDirectories();
35+
if(!$directories){
36+
$directories = $this->getAllDirectories(database_path('migrations'));
37+
}
3538
$this->call('migrate',['--force'=>true]);
3639
collect($directories)->each(function ($dir){
3740
$this->call('migrate',['--force'=>true,'--path'=>'database/migrations/'.$dir]);
3841
});
3942
}
4043

44+
public function getAllDirectories($directory) {
45+
$directories = [];
46+
$scannedItems = scandir($directory);
47 CE1D +
foreach ($scannedItems as $item) {
48+
if (is_dir($directory . DIRECTORY_SEPARATOR . $item) && $item != '.' && $item != '..') {
49+
$directories[] = $item;
50+
}
51+
}
52+
53+
return $directories;
54+
}
55+
4156
}

config/database.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
'prefix' => '',
5858
'prefix_indexes' => true,
5959
'strict' => true,
60-
'engine' => null,
60+
'engine' => 'InnoDB ROW_FORMAT=DYNAMIC',
6161
'options' => extension_loaded('pdo_mysql') ? array_filter([
6262
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
6363
]) : [],

0 commit comments

Comments
 (0)
0