blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

dbupdater: use PDO

Browse source
This commit is contained in:
Andrew Dolgov 2017-12-02 01:28:30 +03:00
parent c949a9282e
commit 1d92297a96
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
classes/dbupdater.php
View file

@ -1,19 +1,19 @@
<?php <?php
class DbUpdater { class DbUpdater {
private $dbh; private $pdo;
private $db_type; private $db_type;
private $need_version; private $need_version;
function __construct($dbh, $db_type, $need_version) { function __construct($pdo, $db_type, $need_version) {
$this->dbh = $dbh; $this->pdo = Db::pdo(); //$pdo;
$this->db_type = $db_type; $this->db_type = $db_type;
$this->need_version = (int) $need_version; $this->need_version = (int) $need_version;
} }
function getSchemaVersion() { function getSchemaVersion() {
$result = db_query("SELECT schema_version FROM ttrss_version"); $row = $this->pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
return (int) db_fetch_result($result, 0, "schema_version"); return (int) $row['schema_version'];
} }
function isUpdateRequired() { function isUpdateRequired() {
@ -26,6 +26,7 @@ class DbUpdater {
if (file_exists($filename)) { if (file_exists($filename)) {
return explode(";", preg_replace("/[\r\n]/", "", file_get_contents($filename))); return explode(";", preg_replace("/[\r\n]/", "", file_get_contents($filename)));
} else { } else {
user_error("DB Updater: schema file for version $version is not found.");
return false; return false;
} }
} }
@ -37,17 +38,17 @@ class DbUpdater {
if (is_array($lines)) { if (is_array($lines)) {
db_query("BEGIN"); $this->pdo->beginTransaction();
foreach ($lines as $line) { foreach ($lines as $line) {
if (strpos($line, "--") !== 0 && $line) { if (strpos($line, "--") !== 0 && $line) {
if (!db_query($line, false)) { if (!$this->pdo->query($line)) {
if ($html_output) { if ($html_output) {
print_notice("Query: $line"); print_notice("Query: $line");
print_error("Error: " . db_last_query_error()); print_error("Error: " . implode(", ", $this->pdo->errorInfo()));
} else { } else {
_debug("Query: $line"); _debug("Query: $line");
_debug("Error: " . db_last_query_error()); _debug("Error: " . implode(", ", $this->pdo->errorInfo()));
} }
return false; return false;
@ -58,10 +59,10 @@ class DbUpdater {
$db_version = $this->getSchemaVersion(); $db_version = $this->getSchemaVersion();
if ($db_version == $version) { if ($db_version == $version) {
db_query("COMMIT"); $this->pdo->commit();
return true; return true;
} else { } else {
db_query("ROLLBACK"); $this->pdo->rollBack();
return false; return false;
} }
} else { } else {

2
classes/handler/public.php
View file

@ -855,7 +855,7 @@ class Handler_Public extends Handler {
<?php <?php
@$op = $_REQUEST["subop"]; @$op = $_REQUEST["subop"];
$updater = new DbUpdater(Db::get(), DB_TYPE, SCHEMA_VERSION); $updater = new DbUpdater(Db::pdo(), DB_TYPE, SCHEMA_VERSION);
if ($op == "performupdate") { if ($op == "performupdate") {
if ($updater->isUpdateRequired()) { if ($updater->isUpdateRequired()) {

2
update.php
View file

@ -317,7 +317,7 @@
if (isset($options["update-schema"])) { if (isset($options["update-schema"])) {
_debug("checking for updates (" . DB_TYPE . ")..."); _debug("checking for updates (" . DB_TYPE . ")...");
$updater = new DbUpdater(Db::get(), DB_TYPE, SCHEMA_VERSION); $updater = new DbUpdater(Db::pdo(), DB_TYPE, SCHEMA_VERSION);
if ($updater->isUpdateRequired()) { if ($updater->isUpdateRequired()) {
_debug("schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION); _debug("schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);