-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
feat: add SQLite3 config synchronous #9202
Open
michalsn
wants to merge
2
commits into
codeigniter4:4.6
Choose a base branch
from
michalsn:sqlite-synchronous
base: 4.6
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 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 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 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 |
---|---|---|
@@ -0,0 +1,52 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
/** | ||
* This file is part of CodeIgniter 4 framework. | ||
* | ||
* (c) CodeIgniter Foundation <[email protected]> | ||
* | ||
* For the full copyright and license information, please view | ||
* the LICENSE file that was distributed with this source code. | ||
*/ | ||
|
||
namespace CodeIgniter\Database\Live\SQLite3; | ||
|
||
use CodeIgniter\Test\CIUnitTestCase; | ||
use Config\Database; | ||
use InvalidArgumentException; | ||
use PHPUnit\Framework\Attributes\Group; | ||
|
||
/** | ||
* @internal | ||
*/ | ||
#[Group('DatabaseLive')] | ||
final class ConnectTest extends CIUnitTestCase | ||
{ | ||
protected function setUp(): void | ||
{ | ||
parent::setUp(); | ||
|
||
$this->db = Database::connect($this->DBGroup); | ||
|
||
if ($this->db->DBDriver !== 'SQLite3') { | ||
$this->markTestSkipped('This test is only for SQLite3.'); | ||
} | ||
} | ||
|
||
public function testShowErrorMessageWhenSettingInvalidSynchronous(): void | ||
{ | ||
$this->expectException(InvalidArgumentException::class); | ||
$this->expectExceptionMessage('Invalid synchronous value.'); | ||
|
||
$config = config('Database'); | ||
$group = $config->tests; | ||
// Sets invalid synchronous. | ||
$group['synchronous'] = 123; | ||
$db = Database::connect($group); | ||
|
||
// Actually connect to DB. | ||
$db->initialize(); | ||
} | ||
} |
This file contains 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 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.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might be a good idea to add validation or throw a database exception in this section. Since we are directly passing
$this->synchronous
into the PRAGMA statement, without validating whether the value is one of the expected integers(0, 1, 2, 3)
, we risk unexpected behavior or incorrect PRAGMA settings if an invalid value is provided. Adding validation would ensure we are handling only valid inputs and would prevent potential silent failures.Additionally, it might be worth considering the use of an enum to define the valid values for synchronous. This would provide a clearer and more structured way to enforce the allowed options and make the code easier to maintain.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added synchronous value validation and test.
I think using an enum here would mess with simplicity a bit - but if more people say we should go this way I can add it. Although I don't think we have a single enum in the project at the moment (I might have missed something).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think using an enum is necessary in this case. The reason enums weren't used in the framework was due to older PHP versions, but I believe we should use enums where possible.
In general, I'm a fan of enums as they improve code readability, but I don't see a strong need for them here.