Fix title field name guessing (#835)

mvorisek · web-flow · commit 10b7ab13cb08 · 2021-03-02T21:41:29.000+02:00
* fix title field collision

* fix title field name guess

* ii

* stricter replace
diff --git a/src/Reference.php b/src/Reference.php
@@ -195,8 +195,8 @@ protected function initTableAlias(): void
             $ourModel = $this->getOurModel();
 
             $this->table_alias = $this->link;
-            $this->table_alias = preg_replace('/_' . ($ourModel->id_field ?: 'id') . '/', '', $this->table_alias);
-            $this->table_alias = preg_replace('/([a-zA-Z])[a-zA-Z]*[^a-zA-Z]*/', '\1', $this->table_alias);
+            $this->table_alias = preg_replace('~_(' . preg_quote($ourModel->id_field, '~') . '|id)$~', '', $this->table_alias);
+            $this->table_alias = preg_replace('~([a-z])[a-z]*[^a-z]*~i', '$1', $this->table_alias);
             if (isset($ourModel->table_alias)) {
                 $this->table_alias = $ourModel->table_alias . '_' . $this->table_alias;
             }
diff --git a/src/Reference/HasOneSql.php b/src/Reference/HasOneSql.php
@@ -177,7 +177,7 @@ public function addTitle(array $defaults = []): FieldSqlExpression
     {
         $ourModel = $this->getOurModel();
 
-        $fieldName = $defaults['field'] ?? preg_replace('/_' . $ourModel->id_field . '$/i', '', $this->link);
+        $fieldName = $defaults['field'] ?? preg_replace('~_(' . preg_quote($ourModel->id_field, '~') . '|id)$~', '', $this->link);
 
         if ($ourModel->hasField($fieldName)) {
             throw (new Exception('Field with this name already exists. Please set title field name manually addTitle([\'field\'=>\'field_name\'])'))

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ public function addTitle(array $defaults = []): FieldSqlExpression`
`177`	`177`	`{`
`178`	`178`	`$ourModel = $this->getOurModel();`
`179`	`179`
`180`		`- $fieldName = $defaults['field'] ?? preg_replace('/_' . $ourModel->id_field . '$/i', '', $this->link);`
	`180`	`+ $fieldName = $defaults['field'] ?? preg_replace('~_(' . preg_quote($ourModel->id_field, '~') . '\|id)$~', '', $this->link);`
`181`	`181`
`182`	`182`	`if ($ourModel->hasField($fieldName)) {`
`183`	`183`	`throw (new Exception('Field with this name already exists. Please set title field name manually addTitle([\'field\'=>\'field_name\'])'))`