mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
refs #4119, another check for binary uuid
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8074 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
1654c3f339
commit
7dc627dd19
1 changed files with 6 additions and 2 deletions
|
@ -1277,8 +1277,12 @@ class Model extends Overloadable {
|
|||
'fields' => $this->hasAndBelongsToMany[$assoc]['associationForeignKey']
|
||||
));
|
||||
|
||||
$isUUID = !empty($this->{$join}->primaryKey) && (($this->{$join}->_schema[$this->{$join}->primaryKey]['type'] === 'string' && $this->{$join}->_schema[$this->{$join}->primaryKey]['length'] === 36)
|
||||
|| ($this->{$join}->_schema[$this->{$join}->primaryKey]['type'] === 'binary' && $this->{$join}->_schema[$this->{$join}->primaryKey]['length'] === 16));
|
||||
$isUUID = !empty($this->{$join}->primaryKey) && (
|
||||
$this->{$join}->_schema[$this->{$join}->primaryKey]['length'] === 36 && (
|
||||
$this->{$join}->_schema[$this->{$join}->primaryKey]['type'] === 'string' ||
|
||||
$this->{$join}->_schema[$this->{$join}->primaryKey]['type'] === 'binary'
|
||||
)
|
||||
);
|
||||
|
||||
$newData = $newValues = array();
|
||||
$primaryAdded = false;
|
||||
|
|
Loading…
Reference in a new issue