From dbcb0d18186bbe2aca3b61517d7ac29730261afe Mon Sep 17 00:00:00 2001 From: Jozef Rebjak Date: Tue, 10 Jan 2023 15:16:32 +0100 Subject: [PATCH 1/4] fix: ForeignKey should return strings --- src/Structures/ForeignKey.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Structures/ForeignKey.php b/src/Structures/ForeignKey.php index 4a4c86b..e0987d3 100644 --- a/src/Structures/ForeignKey.php +++ b/src/Structures/ForeignKey.php @@ -21,7 +21,7 @@ public function __construct($foreignKeyData = null) $this->constraint_name = $foreignKeyData; } else { foreach ($foreignKeyData as $key => $value) { - $this->{$key} = $value; + $this->{$key} = is_array($value) ? $value[0] : $value; } } } From 80c0d9fdd6fe9b6cbb3ee241ae5608e5d707071f Mon Sep 17 00:00:00 2001 From: Jozef Rebjak Date: Mon, 12 Jun 2023 12:16:12 +0200 Subject: [PATCH 2/4] fix: hack for singular of word onus is not working --- src/Drafter/BaseDrafter.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Drafter/BaseDrafter.php b/src/Drafter/BaseDrafter.php index c77c276..27c72a1 100644 --- a/src/Drafter/BaseDrafter.php +++ b/src/Drafter/BaseDrafter.php @@ -65,10 +65,11 @@ protected function findKeyToForeignTable(Table $table, string $tableName): ?stri { // Check a few common conventions $tests = [ - $tableName, - $tableName . '_id', - singular($tableName), - singular($tableName) . '_id', + $tableName !== 'onus' ? $tableName : 'onu', + $tableName !== 'onus' ? $tableName : 'onu' . '_id', + // Hacked because missing regex in Framework. Remove after merge of PR. + $tableName !== 'onus' ? singular($tableName) : 'onu', + $tableName !== 'onus' ? singular($tableName) : 'onu' . '_id', ]; foreach ($tests as $fieldName) { From 3eefe67b95341ee46a9fff9c66d1b664486a9139 Mon Sep 17 00:00:00 2001 From: Jozef Rebjak Date: Mon, 12 Jun 2023 12:26:57 +0200 Subject: [PATCH 3/4] fix: hack of word 'onus' --- src/Drafter/BaseDrafter.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Drafter/BaseDrafter.php b/src/Drafter/BaseDrafter.php index 27c72a1..52662aa 100644 --- a/src/Drafter/BaseDrafter.php +++ b/src/Drafter/BaseDrafter.php @@ -63,14 +63,14 @@ protected function findPrimaryKey(Table $table): ?string */ protected function findKeyToForeignTable(Table $table, string $tableName): ?string { - // Check a few common conventions + // Hacked 'onus' is not returned as singular because of missing regex in Framework. + // Remove after merge of PR. $tests = [ $tableName !== 'onus' ? $tableName : 'onu', - $tableName !== 'onus' ? $tableName : 'onu' . '_id', - // Hacked because missing regex in Framework. Remove after merge of PR. + $tableName !== 'onus' ? $tableName . '_id' : 'onu_id', $tableName !== 'onus' ? singular($tableName) : 'onu', - $tableName !== 'onus' ? singular($tableName) : 'onu' . '_id', - ]; + $tableName !== 'onus' ? singular($tableName) . '_id' : 'onu_id', + ] foreach ($tests as $fieldName) { if (isset($table->fields->{$fieldName})) { From 2071d76eea22f96a1fa6bbab47bce887e9f0bc08 Mon Sep 17 00:00:00 2001 From: Jozef Rebjak Date: Mon, 12 Jun 2023 12:27:55 +0200 Subject: [PATCH 4/4] fix: typo --- src/Drafter/BaseDrafter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Drafter/BaseDrafter.php b/src/Drafter/BaseDrafter.php index 52662aa..70ef752 100644 --- a/src/Drafter/BaseDrafter.php +++ b/src/Drafter/BaseDrafter.php @@ -70,7 +70,7 @@ protected function findKeyToForeignTable(Table $table, string $tableName): ?stri $tableName !== 'onus' ? $tableName . '_id' : 'onu_id', $tableName !== 'onus' ? singular($tableName) : 'onu', $tableName !== 'onus' ? singular($tableName) . '_id' : 'onu_id', - ] + ]; foreach ($tests as $fieldName) { if (isset($table->fields->{$fieldName})) {