malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update insert and update in model to work with set() and more like the builder version. #967

Browse Source
This commit is contained in:
Lonnie Ezell 2018-07-15 22:35:22 -05:00
parent f89c8698a0
commit 1075094af1
No known key found for this signature in database
GPG Key ID: 8EB408F8D82F5002
3 changed files with 158 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
system/Database/BaseBuilder.php
View File

@ -1305,6 +1305,28 @@ class BaseBuilder
//--------------------------------------------------------------------
/**
* Returns the previously set() data, alternatively resetting it
* if needed.
*
* @param bool $clean
*
* @return array
*/
public function getSetData(bool $clean = false)
{
$data = $this->QBSet;
if ($clean)
{
$this->QBSet = [];
}
return $data;
}
//--------------------------------------------------------------------
/**
* Get SELECT query string
*

74
system/Model.php
View File

@ -250,6 +250,15 @@ class Model
protected $beforeDelete = [];
protected $afterDelete = [];
/**
* Holds information passed in via 'set'
* so that we can capture it (not the builder)
* and ensure it gets validated first.
*
* @var array
*/
protected $tempData = [];
//--------------------------------------------------------------------
/**
@ -436,6 +445,31 @@ class Model
//--------------------------------------------------------------------
/**
* Captures the builder's set() method so that we can validate the
* data here. This allows it to be used with any of the other
* builder methods and still get validated data, like replace.
*
* @param $key
* @param string $value
* @param bool|null $escape
*
* @return $this
*/
public function set($key, $value = '', bool $escape = null)
{
$data = is_array($key)
? $key
: [$key => $value];
$this->tempData['escape'] = $escape;
$this->tempData['data'] = array_merge($this->tempData['data'] ?? [], $data);
return $this;
}
//--------------------------------------------------------------------
/**
* A convenience method that will attempt to determine whether the
* data should be inserted or updated. Will work with either
@ -449,8 +483,6 @@ class Model
*/
public function save($data)
{
$saveData = $data;
// If $data is using a custom class with public or protected
// properties representing the table elements, we need to grab
// them as an array.
@ -538,8 +570,17 @@ class Model
*
* @return int|string|bool
*/
public function insert($data, bool $returnID = true)
public function insert($data = null, bool $returnID = true)
{
$escape = null;
if (empty($data))
{
$data = $this->tempData['data'] ?? null;
$escape = $this->tempData['escape'] ?? null;
$this->tempData = [];
}
// If $data is using a custom class with public or protected
// properties representing the table elements, we need to grab
// them as an array.
@ -590,7 +631,7 @@ class Model
// Must use the set() method to ensure objects get converted to arrays
$result = $this->builder()
->set($data['data'])
->set($data['data'], '', $escape)
->insert();
$this->trigger('afterInsert', ['data' => $originalData, 'result' => $result]);
@ -616,8 +657,17 @@ class Model
*
* @return bool
*/
public function update($id, $data)
public function update($id = null, $data = null)
{
$escape = null;
if (empty($data))
{
$data = $this->tempData['data'] ?? null;
$escape = $this->tempData['escape'] ?? null;
$this->tempData = [];
}
// If $data is using a custom class with public or protected
// properties representing the table elements, we need to grab
// them as an array.
@ -664,10 +714,16 @@ class Model
throw DataException::forEmptyDataset('update');
}
$builder = $this->builder();
if ($id)
{
$builder = $builder->where($this->primaryKey, $id);
}
// Must use the set() method to ensure objects get converted to arrays
$result = $this->builder()
->where($this->primaryKey, $id)
->set($data['data'])
$result = $builder
->set($data['data'], '', $escape)
->update();
$this->trigger('afterUpdate', ['id' => $id, 'data' => $originalData, 'result' => $result]);
@ -1129,7 +1185,7 @@ class Model
*/
public function validate($data): bool
{
if ($this->skipValidation === true || empty($this->validationRules))
if ($this->skipValidation === true || empty($this->validationRules) || empty($data))
{
return true;
}

71
tests/system/Database/Live/ModelTest.php
View File

@ -565,4 +565,75 @@ class ModelTest extends CIDatabaseTestCase
$this->assertTrue($model->hasToken('afterDelete'));
}
public function testSetWorksWithInsert()
{
$model = new EventModel();
$this->dontSeeInDatabase('user', [
'email' => 'foo@example.com'
]);
$model->set([
'email' => 'foo@example.com',
'name' => 'Foo Bar',
'country' => 'US'
])->insert();
$this->seeInDatabase('user', [
'email' => 'foo@example.com'
]);
}
public function testSetWorksWithUpdate()
{
$model = new EventModel();
$this->dontSeeInDatabase('user', [
'email' => 'foo@example.com'
]);
$userId = $model->insert([
'email' => 'foo@example.com',
'name' => 'Foo Bar',
'country' => 'US'
]);
$model->set([
'name' => 'Fred Flintstone'
])->update($userId);
$this->seeInDatabase('user', [
'id' => $userId,
'email' => 'foo@example.com',
'name' => 'Fred Flintstone'
]);
}
public function testSetWorksWithUpdateNoId()
{
$model = new EventModel();
$this->dontSeeInDatabase('user', [
'email' => 'foo@example.com'
]);
$userId = $model->insert([
'email' => 'foo@example.com',
'name' => 'Foo Bar',
'country' => 'US'
]);
$model
->where('id', $userId)
->set([
'name' => 'Fred Flintstone'
])->update();
$this->seeInDatabase('user', [
'id' => $userId,
'email' => 'foo@example.com',
'name' => 'Fred Flintstone'
]);
}
}