Skip to content

New MySQLPDOLock class on NinjaMutex and MySQL driver with options #28

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.

Sign up for GitHub

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
merged 2 commits into from
Jul 11, 2022
Merged

New MySQLPDOLock class on NinjaMutex and MySQL driver with options #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
851eb62
New MySQLPDOLock class on NinjaMutex and MySQL driver with options
rafacouto Jul 8, 2022
e2daa2c
Compliance with styleci
rafacouto Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}],
"require": {
"php": "^8.0.2",
"arvenil/ninja-mutex": "^0.6",
"arvenil/ninja-mutex": "dev-master#82cbb2c",
"illuminate/console": "^9.0",
"illuminate/support": "^9.0",
"ramsey/collection": "^1.2"
Expand Down
11 changes: 7 additions & 4 deletions src/Mutex.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use NinjaMutex\Lock\FlockLock;
use NinjaMutex\Lock\LockAbstract;
use NinjaMutex\Lock\MemcachedLock;
use NinjaMutex\Lock\MySqlLock;
use NinjaMutex\Lock\MySQLPDOLock;
use NinjaMutex\Lock\PhpRedisLock;
use NinjaMutex\Lock\PredisRedisLock;
use NinjaMutex\Mutex as NinjaMutex;
Expand Down Expand Up @@ -58,11 +58,14 @@ public function getNinjaMutexLock(): LockAbstract
$strategy = $this->command->getMutexStrategy();
switch ($strategy) {
case 'mysql':
return new MySqlLock(
return new MySQLPDOLock(
'mysql:' . implode(';', [
'host=' . config('database.connections.mysql.host'),
'port=' . config('database.connections.mysql.port', 3306),
]),
config('database.connections.mysql.username'),
config('database.connections.mysql.password'),
config('database.connections.mysql.host'),
config('database.connections.mysql.port', 3306)
config('database.connections.mysql.options')
);

case 'redis':
Expand Down
11 changes: 7 additions & 4 deletions tests/MutexTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use Mockery\Mock;
use NinjaMutex\Lock\FlockLock;
use NinjaMutex\Lock\MemcachedLock;
use NinjaMutex\Lock\MySqlLock;
use NinjaMutex\Lock\MySQLPDOLock;
use NinjaMutex\Lock\PhpRedisLock;
use NinjaMutex\Lock\PredisRedisLock;
use Predis\Client as PredisClient;
Expand Down Expand Up @@ -65,11 +65,14 @@ public function it_supports_mysql_strategy()
$this->command->expects('getMutexStrategy')->andReturn('mysql');

$mutex = new Mutex($this->command);
$expectedLock = new MySqlLock(
$expectedLock = new MySqlPdoLock(
'mysql:' . implode(';', [
'host=' . config('database.connections.mysql.host'),
'port=' . config('database.connections.mysql.port', 3306),
]),
config('database.connections.mysql.username'),
config('database.connections.mysql.password'),
config('database.connections.mysql.host'),
config('database.connections.mysql.port', 3306)
config('database.connections.mysql.options')
);
$this->assertEquals($expectedLock, $mutex->getNinjaMutexLock());
}
Expand Down