Skip to content

refactor: move functionality to options table #18

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
EvanWashkow merged 1 commit into from
May 12, 2021
Merged

refactor: move functionality to options table #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 14 additions & 20 deletions ...ocess/Adapter/Out/MySql/SiteMetaTable.php → ...rocess/Adapter/Out/MySql/OptionsTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use mysqli_sql_exception;
use Psr\Log\LoggerInterface;

final class SiteMetaTable implements BatchTable
final class OptionsTable implements BatchTable
{
/**
* @var mysqli
Expand All @@ -22,11 +22,6 @@ final class SiteMetaTable implements BatchTable
*/
private $tableName;

/**
* @var int
*/
private $siteId;

/**
* @var string
*/
Expand All @@ -42,12 +37,11 @@ final class SiteMetaTable implements BatchTable
*/
private $logger;

public function __construct(LoggerInterface $logger, mysqli $mysqli, string $prefix, int $siteId, string $actionName)
public function __construct(LoggerInterface $logger, mysqli $mysqli, string $prefix, string $actionName)
{
$this->logger = $logger;
$this->mysqli = $mysqli;
$this->tableName = "${prefix}sitemeta";
$this->siteId = $siteId;
$this->tableName = "${prefix}options";
$this->batchPrefix = $actionName . '_batch_';
$this->lockMetaKey = "lock_{$actionName}";
}
Expand All @@ -60,8 +54,8 @@ public function insert(BatchItem $item): void
$data = $this->mysqli->escape_string($data);

$query = "
INSERT INTO {$this->tableName} (site_id, meta_key, meta_value)
VALUES ({$this->siteId}, '{$item->key()}', \"${data}\");";
INSERT INTO {$this->tableName} (option_name, option_value, autoload)
VALUES ('{$item->key()}', \"${data}\", 'no');";

$result = $this->mysqli->query($query);

Expand All @@ -77,8 +71,8 @@ public function readAll(): array
$query = "
SELECT *
FROM {$this->tableName}
WHERE meta_key LIKE '{$this->batchPrefix}%'
ORDER BY meta_key ASC";
WHERE option_name LIKE '{$this->batchPrefix}%'
ORDER BY option_name ASC";

$results = $this->mysqli->query($query);
if ($results === false)
Expand All @@ -90,7 +84,7 @@ public function readAll(): array

foreach ($results as $result)
{
$batchItems[] = new BatchItem($result['meta_key'], maybe_unserialize($result['meta_value']));
$batchItems[] = new BatchItem($result['option_name'], maybe_unserialize($result['option_value']));
}

return $batchItems;
Expand All @@ -100,7 +94,7 @@ public function readAll(): array
public function delete(BatchItem $item): void
{
$query = "
DELETE FROM {$this->tableName} WHERE meta_key='{$item->key()}'";
DELETE FROM {$this->tableName} WHERE option_name='{$item->key()}'";

$result = $this->mysqli->query($query);

Expand Down Expand Up @@ -144,7 +138,7 @@ public function tryGetLock(): bool

$query = "
SELECT * FROM {$this->tableName}
WHERE meta_key = '{$this->lockMetaKey}'
WHERE option_name = '{$this->lockMetaKey}'
FOR UPDATE";

$result = $this->mysqli->query($query);
Expand All @@ -167,11 +161,11 @@ public function hasItems(): bool
private function tryCreateLockRow(): void
{
$query = "
INSERT INTO wp_sitemeta(site_id, meta_key, meta_value)
SELECT 1, '{$this->lockMetaKey}', false FROM DUAL
INSERT INTO {$this->tableName}(option_name, option_value, autoload)
SELECT '{$this->lockMetaKey}', false, 'no' FROM DUAL
WHERE NOT EXISTS (
SELECT * FROM wp_sitemeta
WHERE meta_key = '{$this->lockMetaKey}'
SELECT * FROM {$this->tableName}
WHERE option_name = '{$this->lockMetaKey}'
);
";
$result = $this->mysqli->query($query);
Expand Down