[update] remove unnecessary check for id_field

atk4 · Jul 26, 2020 · 5196ace · 5196ace
1 parent 6156ae2
commit 5196ace
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/Reference.php b/src/Reference.php
@@ -90,7 +90,7 @@ public function __construct($link)
     public function init(): void
     {
         $this->_init();
-        
+
         $this->initTableAlias();
     }
 
@@ -132,8 +132,7 @@ public function getTheirModel($defaults = []): Model
             if ($this->model instanceof \Closure) {
                 // if model is Closure, then call the closure and whci should return a model
                 $theirModel = ($this->model)($this->getOurModel(), $this, $defaults);
-            }
-            else {
+            } else {
                 // if model is set, then use clone of this model
                 $theirModel = clone $this->model;
             }

diff --git a/src/Reference/HasMany.php b/src/Reference/HasMany.php
@@ -31,7 +31,7 @@ protected function getOurValue()
 
         // create expression based on existing conditions
         return $ourModel->action('field', [
-            $this->our_field ?: ($ourModel->id_field ?: 'id'),
+            $this->our_field ?: $ourModel->id_field,
         ]);
     }
 
@@ -44,7 +44,7 @@ protected function referenceOurValue(): Field
 
         $ourModel->persistence_data['use_table_prefixes'] = true;
 
-        return $ourModel->getField($this->our_field ?: ($ourModel->id_field ?: 'id'));
+        return $ourModel->getField($this->our_field ?: $ourModel->id_field);
     }
 
     /**
@@ -57,7 +57,7 @@ public function ref($defaults = []): Model
         $ourModel = $this->getOurModel();
 
         return $this->getTheirModel($defaults)->addCondition(
-            $this->their_field ?: ($ourModel->table . '_' . ($ourModel->id_field ?: 'id')),
+            $this->their_field ?: ($ourModel->table . '_' . $ourModel->id_field),
             $this->getOurValue()
         );
     }
@@ -72,7 +72,7 @@ public function refLink($defaults = []): Model
         $ourModel = $this->getOurModel();
 
         $theirModelLinked = $this->getTheirModel($defaults)->addCondition(
-            $this->their_field ?: ($ourModel->table . '_' . ($ourModel->id_field ?: 'id')),
+            $this->their_field ?: ($ourModel->table . '_' . $ourModel->id_field),
             $this->referenceOurValue()
         );
 

diff --git a/src/Reference/HasOneSql.php b/src/Reference/HasOneSql.php
@@ -191,7 +191,7 @@ public function addTitle($defaults = []): FieldSqlExpression
 
         $ourModel = $this->getOurModel();
 
-        $field = $defaults['field'] ?? preg_replace('/_' . ($ourModel->id_field ?: 'id') . '$/i', '', $this->link);
+        $field = $defaults['field'] ?? preg_replace('/_' . $ourModel->id_field . '$/i', '', $this->link);
 
         if ($ourModel->hasField($field)) {
             throw (new Exception('Field with this name already exists. Please set title field name manually addTitle([\'field\'=>\'field_name\'])'))