-
Notifications
You must be signed in to change notification settings - Fork 2k
fix: Casting in insertBatch and updateBatch methods. #9698
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+160
−71
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
af878a4
fix: Casting in insertBatch and updateBatch methods.
patel-vansh d8af403
Fixed coding styles and done requested changes in BaseModel.php
patel-vansh efde523
Changed assertion to seeInDatabase function
patel-vansh 6b659e8
Changed assertion to seeInDatabase function in testUpdateBatchWithCasts
patel-vansh 252cd49
Added comment to ignore argument.type by phpstan.
patel-vansh 2b1c604
Attempt to fix CPD by introducing a common casting function.
patel-vansh 2a5b1e4
Ran composer phpstan:baseline
patel-vansh cd06c43
Replaced "casting only" function to more generic one.
patel-vansh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,6 +22,7 @@ | |
use stdClass; | ||
use Tests\Support\Entity\User; | ||
use Tests\Support\Models\JobModel; | ||
use Tests\Support\Models\UserCastsTimestampModel; | ||
use Tests\Support\Models\UserModel; | ||
use Tests\Support\Models\UserObjModel; | ||
use Tests\Support\Models\WithoutAutoIncrementModel; | ||
|
@@ -376,4 +377,34 @@ public function testInsertWithDefaultValue(): void | |
$id = $this->model->getInsertID(); | ||
$this->assertSame($entity->country, $this->model->find($id)->country); | ||
} | ||
|
||
public function testInsertBatchWithCasts(): void | ||
{ | ||
$userData = [ | ||
[ | ||
'name' => 'Smriti', | ||
'email' => [ | ||
'personal' => '[email protected]', | ||
'work' => '[email protected]', | ||
], | ||
'country' => 'India', | ||
], | ||
[ | ||
'name' => 'Rahul', | ||
'email' => [ | ||
'personal' => '[email protected]', | ||
'work' => '[email protected]', | ||
], | ||
'country' => 'India', | ||
], | ||
]; | ||
$this->createModel(UserCastsTimestampModel::class); | ||
|
||
$numRows = $this->model->insertBatch($userData); // @phpstan-ignore argument.type | ||
|
||
$this->assertSame(2, $numRows); | ||
|
||
$this->seeInDatabase('user', ['email' => json_encode($userData[0]['email'])]); | ||
$this->seeInDatabase('user', ['email' => json_encode($userData[1]['email'])]); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,6 +26,7 @@ | |
use Tests\Support\Models\EventModel; | ||
use Tests\Support\Models\JobModel; | ||
use Tests\Support\Models\SecondaryModel; | ||
use Tests\Support\Models\UserCastsTimestampModel; | ||
use Tests\Support\Models\UserModel; | ||
use Tests\Support\Models\UserTimestampModel; | ||
use Tests\Support\Models\UUIDPkeyModel; | ||
|
@@ -602,4 +603,43 @@ public function testUpdateEntityUpdateOnlyChangedFalse(): void | |
$this->assertTrue($result); | ||
$this->assertNotSame($updateAtBefore, $updateAtAfter); | ||
} | ||
|
||
public function testUpdateBatchWithCasts(): void | ||
michalsn marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{ | ||
$this->createModel(UserCastsTimestampModel::class); | ||
|
||
$rows = $this->db->table('user')->limit(2)->orderBy('id', 'asc')->get()->getResultArray(); | ||
|
||
$this->assertNotEmpty($rows); | ||
$this->assertCount(2, $rows); | ||
|
||
$row1 = $rows[0]; | ||
$row2 = $rows[1]; | ||
|
||
$this->assertNotNull($row1); | ||
$this->assertNotNull($row2); | ||
|
||
$updateData = [ | ||
[ | ||
'id' => $row1['id'], | ||
'email' => [ | ||
'personal' => '[email protected]', | ||
'work' => '[email protected]', | ||
], | ||
], | ||
[ | ||
'id' => $row2['id'], | ||
'email' => [ | ||
'personal' => '[email protected]', | ||
'work' => '[email protected]', | ||
], | ||
], | ||
]; | ||
|
||
$numRows = $this->model->updateBatch($updateData, 'id'); // @phpstan-ignore argument.type | ||
$this->assertSame(2, $numRows); | ||
|
||
$this->seeInDatabase('user', ['email' => json_encode($updateData[0]['email'])]); | ||
$this->seeInDatabase('user', ['email' => json_encode($updateData[1]['email'])]); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.