Changeset 56e582

Timestamp:

05/09/15 22:15:55 (2 years ago)

Author:

pierre-alain <pierre-alain@…>

Branches:

master

Children:

f0dadb

Parents:

2b0b08

git-author:

pierre-alain <pierre-alain@…> (05/09/15 22:15:55)

git-committer:

pierre-alain <pierre-alain@…> (05/09/15 22:15:55)

Message:

fixing unique field checking

File:

• OWR/DAO.php (modified) (5 diffs)

OWR/DAO.php

@@ -264 +264 @@
         $checkUnique = $insert = $update = false;
 
+        if(isset($this->_fields['uid']))
+            $this->uid = $this->uid ?: User::iGet()->getUid();
+
         if($this->_idField)
         {
@@ -274 +277 @@
                 $wheres[] = $this->_idField;
                 if(isset($this->_fields['uid']))
-                {
-                    $this->uid = $this->uid ?: User::iGet()->getUid();
                     empty($wheres) || ($wheres[] = 'uid');
-                }
             }
             else
@@ -329 +329 @@
             }
 
-            if($whereFields)
+            if(!empty($whereFields) && ($this->_idField || isset($this->_fields['uid'])))
             {
                 $chkUniQuery = '
@@ -335 +335 @@
         FROM '.$this->_name.'
         WHERE ';
-                $chkUniQuery .= '('.join('=? OR ', $whereFields).'=?)';
-
-                if(isset($this->_fields['uid']))
-                {
-                    $this->uid = $this->uid ?: User::iGet()->getUid();
-                    $chkUniQuery .= ' AND uid='.$this->uid;
-                }
-
-                if($this->_idField && isset($this->{$this->_idField}) && $this->{$this->_idField} > 0)
-                    $chkUniQuery .= ' AND '.$this->_idField.'!='.self::$_db->quote($this->{$this->_idField});
-
-                $exists = self::$_db->executeP($chkUniQuery, new DBRequest(Object::toArray($this), $whereFieldsDecl, true));
-
-                if($exists->next() && $exists->nb > 0)
-                {
-                    throw new Exception('Some values are not uniques', 409);
-                }
-                unset($exists);
+
+                if($this->_idField)
+                {
+                    $chkUniQuery .= '('.join('=? OR ', $whereFields).'=?)';
+                    
+                    if(isset($this->{$this->_idField}) && $this->{$this->_idField} > 0)
+                        $chkUniQuery .= ' AND '.$this->_idField.'!='.self::$_db->quote($this->{$this->_idField});
+                        
+                    if(isset($this->_fields['uid']))
+                        $chkUniQuery .= ' AND uid='.$this->uid;
+                }
+                else
+                {
+                // there is no key id field
+                // and $this->_fields['uid'] is set so we assume we are checking for relations between object and user
+                    $tmpChkUniQuery = array();
+                    foreach($whereFields as $field)
+                    {
+                        foreach($this->_relations as $krel => $vrel)
+                        {
+                            if(isset($vrel[$field]))
+                            {
+                                unset($whereFieldsDecl[$field]);
+                                continue 2; // it's an id relation field
+                            }
+                        }
+                        foreach($this->_userRelations as $krel => $vrel)
+                        {
+                            if(isset($vrel[$field]))
+                            {
+                                unset($whereFieldsDecl[$field]);
+                                continue 2; // it's an id relation field
+                            }
+                        }
+                        $tmpChkUniQuery[] = '(' . $field . '=? AND uid=' . $this->uid . ')';
+                    }
+                    if(empty($tmpChkUniQuery)) $skip = 1;
+                    $chkUniQuery .= '(' . join(') OR (', $tmpChkUniQuery) . ')';
+                }            
+
+                if(!isset($skip))
+                {
+                    $exists = self::$_db->executeP($chkUniQuery, new DBRequest(Object::toArray($this), $whereFieldsDecl, true));
+
+                    if($exists->next() && $exists->nb > 0)
+                        throw new Exception('Some values are not uniques ' . $chkUniQuery . '          /          ' . $query, 409);
+
+                    unset($exists);
+                }
             }
 
@@ -378 +409 @@
                 if($decl['required'])
                 {
-                    if('uid' === $field)
-                    {
-                        $this->uid = $this->uid ?: User::iGet()->getUid();
-                    }
-                    else
-                    {
-                        if(!isset($this->$field))
-                            throw new Exception(sprintf(Utilities::iGet()->_('Missing value for required parameter "%s"'), $field), Exception::E_OWR_BAD_REQUEST);
-
-                        switch($decl['type'])
-                        {
-                            case DBRequest::PARAM_PASSWD:
-                                if(!empty($this->{$this->_idField}))
-                                    break;
-
-                            case DBRequest::PARAM_RIGHTS:
-                            case DBRequest::PARAM_LOGIN:
-                            case DBRequest::PARAM_LANG:
-                            case DBRequest::PARAM_EMAIL:
-                            case DBRequest::PARAM_URL:
-                            case DBRequest::PARAM_TIMEZONE:
-                            case DBRequest::PARAM_HASH:
-                            case DBRequest::PARAM_IP:
-                            case \PDO::PARAM_STR:
-                                if(empty($this->$field))
-                                    throw new Exception(sprintf(Utilities::iGet()->_('Missing value for required parameter "%s"'), $field), Exception::E_OWR_BAD_REQUEST);
-
-                            default:
+                    if(!isset($this->$field))
+                        throw new Exception(sprintf(Utilities::iGet()->_('Missing value for required parameter "%s"'), $field), Exception::E_OWR_BAD_REQUEST);
+
+                    switch($decl['type'])
+                    {
+                        case DBRequest::PARAM_PASSWD:
+                            if(!empty($this->{$this->_idField}))
                                 break;
-                        }
+
+                        case DBRequest::PARAM_RIGHTS:
+                        case DBRequest::PARAM_LOGIN:
+                        case DBRequest::PARAM_LANG:
+                        case DBRequest::PARAM_EMAIL:
+                        case DBRequest::PARAM_URL:
+                        case DBRequest::PARAM_TIMEZONE:
+                        case DBRequest::PARAM_HASH:
+                        case DBRequest::PARAM_IP:
+                        case \PDO::PARAM_STR:
+                            if(empty($this->$field))
+                                throw new Exception(sprintf(Utilities::iGet()->_('Missing value for required parameter "%s"'), $field), Exception::E_OWR_BAD_REQUEST);
+
+                        default:
+                            break;
                     }
                 }