tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use `PDO::fetchColumn()` where applicable

This commit is contained in:
Yonas Habteab 2023-09-15 14:04:59 +02:00 committed by Johannes Meyer
parent d2ce60d4c0
commit 47b214ee1b
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/Icinga/Application/Hook/DbMigrationHook.php
View File

@ -64,13 +64,13 @@ abstract class DbMigrationHook implements Countable
*/
public static function tableExists(Connection $conn, string $table): bool
{
/** @var stdClass $query */
$query = $conn->prepexec(
/** @var false|int $exists */
$exists = $conn->prepexec(
'SELECT EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = ?) AS result',
$table
)->fetch(PDO::FETCH_OBJ);
)->fetchColumn();
return $query->result;
return (bool) $exists;
}
/**
@ -122,18 +122,13 @@ abstract class DbMigrationHook implements Countable
return null;
}
$pdoStmt = $conn->prepexec(
/** @var false|string $collation */
$collation = $conn->prepexec(
'SELECT collation_name FROM information_schema.columns WHERE table_name = ? AND column_name = ?',
[$table, $column]
);
)->fetchColumn();
/** @var false|stdClass $result */
$result = $pdoStmt->fetch(PDO::FETCH_OBJ);
if ($result === false) {
return null;
}
return $result->collation_name;
return ! $collation ? null : $collation;
}
/**