|
@@ -198,7 +198,7 @@ class Easy
|
|
*/
|
|
*/
|
|
public function getValues()
|
|
public function getValues()
|
|
{
|
|
{
|
|
- return $this->fields->getValues();
|
|
|
|
|
|
+ return $this->fields->getValueAsArray();
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -298,7 +298,7 @@ class Easy
|
|
if (count($rule) > 0 && !$this->validateFields(array($key => $rule))) {
|
|
if (count($rule) > 0 && !$this->validateFields(array($key => $rule))) {
|
|
return $this->_response;
|
|
return $this->_response;
|
|
}
|
|
}
|
|
- if ($this->fields->isField($key)) $where[] = "`{$key}` = '" . $this->db->setQuote($this->fields->getField($key)) . "'";
|
|
|
|
|
|
+ if ($this->fields->hasField($key)) $where[] = "`{$key}` = '" . $this->db->setQuote($this->fields->getField($key)) . "'";
|
|
}
|
|
}
|
|
$result = $this->db->limit(1)->where(join(' AND ', $where))->select($this->getTableName());
|
|
$result = $this->db->limit(1)->where(join(' AND ', $where))->select($this->getTableName());
|
|
if(!$result)
|
|
if(!$result)
|
|
@@ -338,7 +338,7 @@ class Easy
|
|
$this->_response = Response::Exist('_save', array('_result' => \Qii::i(1511, join(',', $this->getPrivateValue()))));
|
|
$this->_response = Response::Exist('_save', array('_result' => \Qii::i(1511, join(',', $this->getPrivateValue()))));
|
|
return $this->_response;
|
|
return $this->_response;
|
|
}
|
|
}
|
|
- $result = $this->db->insertObject($this->getTableName(), $this->fields->getValues());
|
|
|
|
|
|
+ $result = $this->db->insertObject($this->getTableName(), $this->fields->getValueAsArray());
|
|
if ($this->db->isError()) {
|
|
if ($this->db->isError()) {
|
|
return $this->db->getResponse();
|
|
return $this->db->getResponse();
|
|
}
|
|
}
|
|
@@ -355,10 +355,16 @@ class Easy
|
|
$this->checkInstance();
|
|
$this->checkInstance();
|
|
if (!$this->validateFields($this->easyRules->getRulesByOperate('update'))) return $this->_response;
|
|
if (!$this->validateFields($this->easyRules->getRulesByOperate('update'))) return $this->_response;
|
|
$this->resetPrivateKey('update');
|
|
$this->resetPrivateKey('update');
|
|
- if (count($this->_exist()) == 0) {
|
|
|
|
|
|
+ if (count($this->_exist()->getResult()) == 0) {
|
|
return $this->_response = Response::NotExist('_update', \Qii::i(1512, join(',', $this->getPrivateValue())));
|
|
return $this->_response = Response::NotExist('_update', \Qii::i(1512, join(',', $this->getPrivateValue())));
|
|
}
|
|
}
|
|
- $result = $this->db->updateObject($this->getTableName(), $this->fields->getValues(), $this->privateKeys);
|
|
|
|
|
|
+ $values = $this->fields->getValueAsArray();
|
|
|
|
+ $where = [];
|
|
|
|
+ foreach ($this->privateKeys as $field) {
|
|
|
|
+ $where[$field] = $values[$field];
|
|
|
|
+ unset($values[$field]);
|
|
|
|
+ }
|
|
|
|
+ $result = $this->db->updateObject($this->getTableName(), $this->fields->getValueAsArray(), $where);
|
|
if ($this->db->isError()) {
|
|
if ($this->db->isError()) {
|
|
return $this->_response = $this->db->getResponse();
|
|
return $this->_response = $this->db->getResponse();
|
|
}
|
|
}
|
|
@@ -374,10 +380,10 @@ class Easy
|
|
$this->checkInstance();
|
|
$this->checkInstance();
|
|
if (!$this->validateFields($this->easyRules->getRulesByOperate('remove'))) return $this->_response;
|
|
if (!$this->validateFields($this->easyRules->getRulesByOperate('remove'))) return $this->_response;
|
|
$this->resetPrivateKey('remove');
|
|
$this->resetPrivateKey('remove');
|
|
- if (count($this->_exist()) == 0) {
|
|
|
|
|
|
+ if (count($this->_exist()->getResult()) == 0) {
|
|
return $this->_response = Response::NotExist('_remove', \Qii::i(1512, join(',', $this->getPrivateValue())));
|
|
return $this->_response = Response::NotExist('_remove', \Qii::i(1512, join(',', $this->getPrivateValue())));
|
|
}
|
|
}
|
|
- $result = $this->db->deleteObject($this->getTableName(), $this->fields->getValues());
|
|
|
|
|
|
+ $result = $this->db->deleteObject($this->getTableName(), $this->fields->getValueAsArray());
|
|
if ($this->db->isError()) {
|
|
if ($this->db->isError()) {
|
|
return $this->_response = $this->db->getResponse();
|
|
return $this->_response = $this->db->getResponse();
|
|
}
|
|
}
|