调整关联模型的save方法返回值

This commit is contained in:
thinkphp
2017-03-10 14:36:17 +08:00
parent d086406a54
commit fdd6558d69
4 changed files with 10 additions and 10 deletions

View File

@@ -91,7 +91,7 @@ abstract class Relation
}
/**
* 执行基础查询(执行一次)
* 执行基础查询(执行一次)
* @access protected
* @return void
*/

View File

@@ -183,7 +183,7 @@ class HasMany extends Relation
* 保存(新增)当前关联数据对象
* @access public
* @param mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
* @return integer
* @return Model|false
*/
public function save($data)
{
@@ -191,9 +191,9 @@ class HasMany extends Relation
$data = $data->getData();
}
// 保存关联表数据
$data[$this->foreignKey] = $this->parent->{$this->localKey};
$model = new $this->model;
return $model->save($data);
$data[$this->foreignKey] = $this->parent->{$this->localKey};
return $model->save($data) ? $model : false;
}
/**

View File

@@ -215,7 +215,7 @@ class MorphMany extends Relation
* 保存(新增)当前关联数据对象
* @access public
* @param mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
* @return integer
* @return Model|false
*/
public function save($data)
{
@@ -225,10 +225,10 @@ class MorphMany extends Relation
// 保存关联表数据
$pk = $this->parent->getPk();
$model = new $this->model;
$data[$this->morphKey] = $this->parent->$pk;
$data[$this->morphType] = $this->type;
$model = new $this->model;
return $model->save($data);
return $model->save($data) ? $model : false;
}
/**

View File

@@ -162,17 +162,17 @@ abstract class OneToOne extends Relation
* 保存(新增)当前关联数据对象
* @access public
* @param mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
* @return integer
* @return Model|false
*/
public function save($data)
{
if ($data instanceof Model) {
$data = $data->getData();
}
$model = new $this->model;
// 保存关联表数据
$data[$this->foreignKey] = $this->parent->{$this->localKey};
$model = new $this->model;
return $model->save($data);
return $model->save($data) ? $model : false;
}
/**