From 811bbabd32254764389832a9b776084ebb728581 Mon Sep 17 00:00:00 2001 From: Much Yusron Arif <3467343+yusronarif@users.noreply.github.com> Date: Wed, 6 Mar 2024 08:29:00 +0700 Subject: [PATCH 1/2] update userKeyType on blueprint --- src/Database/Schema/Blueprint.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Database/Schema/Blueprint.php b/src/Database/Schema/Blueprint.php index ed9bbc9..c9979fa 100644 --- a/src/Database/Schema/Blueprint.php +++ b/src/Database/Schema/Blueprint.php @@ -19,7 +19,7 @@ class Blueprint extends BaseBlueprint * @var string */ private string $tableUser = ''; - private string $userKeyType; + private string $userKeyType = 'int'; /** * Create a new schema blueprint. @@ -33,10 +33,6 @@ class Blueprint extends BaseBlueprint public function __construct($table, Closure $callback = null, $prefix = '') { parent::__construct($table, $callback, $prefix); - - $userModel = config('koffinate.core.model.users'); - $this->tableUser = (new $userModel)->getTable(); - $this->userKeyType = config('koffinate.core.model.user_key_type', 'int'); } /** @@ -113,6 +109,15 @@ public function softDeletesTz($column = 'deleted_at', $precision = 0): ColumnDef private function makePerformerColumn(string $column): void { + if (empty($this->userKeyType)) { + $this->userKeyType = config('koffinate.core.model.user_key_type', 'int'); + } + + if (empty($this->tableUser)) { + $userModel = config('koffinate.core.model.users'); + $this->tableUser = (new $userModel)->getTable(); + } + if (config('koffinate.core.model.use_perform_by')) { if ($this->performerMode == 'users') { $foreignType = in_array($this->userKeyType, ['int', 'integer']) ? 'foreignId' : 'foreignUuid'; From ed325b201616654b143c8275e7e9d9a43cf2e7b6 Mon Sep 17 00:00:00 2001 From: Much Yusron Arif <3467343+yusronarif@users.noreply.github.com> Date: Wed, 6 Mar 2024 08:31:58 +0700 Subject: [PATCH 2/2] update --- src/Database/Schema/Blueprint.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Database/Schema/Blueprint.php b/src/Database/Schema/Blueprint.php index c9979fa..848ded8 100644 --- a/src/Database/Schema/Blueprint.php +++ b/src/Database/Schema/Blueprint.php @@ -18,8 +18,8 @@ class Blueprint extends BaseBlueprint /** * @var string */ - private string $tableUser = ''; - private string $userKeyType = 'int'; + private string $tableUser; + private string $userKeyType; /** * Create a new schema blueprint.