Improvements to the Install Utilities

This commit is contained in:
Darko Gjorgjijoski
2024-02-08 01:53:32 +01:00
parent c0ff832080
commit 49a11f08e9

View File

@@ -2,6 +2,7 @@
namespace InvoiceShelf\Space; namespace InvoiceShelf\Space;
use Illuminate\Database\QueryException;
use League\Flysystem\FilesystemException; use League\Flysystem\FilesystemException;
class InstallUtils class InstallUtils
@@ -13,7 +14,7 @@ class InstallUtils
*/ */
public static function isDbCreated() public static function isDbCreated()
{ {
return self::tableExists('users'); return self::dbMarkerExists() && self::tableExists('users');
} }
/** /**
@@ -30,19 +31,14 @@ class InstallUtils
} }
try { try {
$flag = self::dbMarkerExists(); $flag = \Schema::hasTable($table);
if ($flag) { } catch (QueryException|\Exception $e) {
$flag &= \Schema::hasTable($table);
}
} catch (\Illuminate\Database\QueryException $e) {
$flag = false;
} catch (\Exception $e) {
$flag = false; $flag = false;
} }
$cache[$table] = $flag; $cache[$table] = $flag;
return $flag; return $cache[$table];
} }
/** /**
@@ -68,7 +64,7 @@ class InstallUtils
*/ */
public static function createDbMarker() public static function createDbMarker()
{ {
\Storage::disk('local')->put('database_created', 'database_created'); \Storage::disk('local')->put('database_created', time());
} }
/** /**