mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-06 15:02:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进Relation类

Browse Source
This commit is contained in:
thinkphp
2016-05-17 17:53:33 +08:00
parent f6efaba3e6
commit baebe7899e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
library/think/model/Relation.php
View File

@@ -534,9 +534,7 @@ class Relation
if (is_array($data)) { if (is_array($data)) {
// 保存关联表数据 // 保存关联表数据
$model = new $this->model; $model = new $this->model;
$model->save($data); $id = $model->save($data);
$relationFk = $model->getPk();
$id = $model->$relationFk;
} elseif (is_int($data)) { } elseif (is_int($data)) {
// 根据关联表主键直接写入中间表 // 根据关联表主键直接写入中间表
$id = $data; $id = $data;
@@ -551,7 +549,8 @@ class Relation
$pk = $this->parent->getPk(); $pk = $this->parent->getPk();
$pivot[$this->localKey] = $this->parent->$pk; $pivot[$this->localKey] = $this->parent->$pk;
$pivot[$this->foreignKey] = $id; $pivot[$this->foreignKey] = $id;
return Db::table($this->middle)->insert($pivot); $query = clone $this->parent->db();
return $query->table($this->middle)->insert($pivot);
} else { } else {
throw new Exception(' miss relation data'); throw new Exception(' miss relation data');
} }
@@ -580,7 +579,8 @@ class Relation
$pk = $this->parent->getPk(); $pk = $this->parent->getPk();
$pivot[$this->localKey] = $this->parent->$pk; $pivot[$this->localKey] = $this->parent->$pk;
$pivot[$this->foreignKey] = is_array($id) ? ['in', $id] : $id; $pivot[$this->foreignKey] = is_array($id) ? ['in', $id] : $id;
Db::table($this->middle)->where($pivot)->delete(); $query = clone $this->parent->db();
$query->table($this->middle)->where($pivot)->delete();
// 删除关联表数据 // 删除关联表数据
if ($relationDel) { if ($relationDel) {
@@ -593,7 +593,7 @@ class Relation
{ {
if ($this->model) { if ($this->model) {
$model = new $this->model; $model = new $this->model;
$db = $model->db(); $db = $model::db();
if (self::HAS_MANY == $this->type && isset($this->parent->{$this->localKey})) { if (self::HAS_MANY == $this->type && isset($this->parent->{$this->localKey})) {
// 关联查询带入关联条件 // 关联查询带入关联条件
$db->where($this->foreignKey, $this->parent->{$this->localKey}); $db->where($this->foreignKey, $this->parent->{$this->localKey});