1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 17:25:55 +00:00

classes: use OO DB interface

This commit is contained in:
Andrew Dolgov
2013-04-17 20:12:14 +04:00
parent b4b45b4534
commit d9c85e0f11
17 changed files with 707 additions and 707 deletions

View File

@@ -2,18 +2,18 @@
class DbUpdater {
private $dbh;
private $db_type;
private $$this->dbh->type;
private $need_version;
function __construct($dbh, $db_type, $need_version) {
function __construct($dbh, $$this->dbh->type, $need_version) {
$this->dbh = $dbh;
$this->db_type = $db_type;
$this->$this->dbh->type = $db_type;
$this->need_version = (int) $need_version;
}
function getSchemaVersion() {
$result = db_query("SELECT schema_version FROM ttrss_version");
return (int) db_fetch_result($result, 0, "schema_version");
$result = $this->dbh->query("SELECT schema_version FROM ttrss_version");
return (int) $this->dbh->fetch_result($result, 0, "schema_version");
}
function isUpdateRequired() {
@@ -21,7 +21,7 @@ class DbUpdater {
}
function getSchemaLines($version) {
$filename = "schema/versions/".$this->db_type."/$version.sql";
$filename = "schema/versions/".$this->$this->dbh->type."/$version.sql";
if (file_exists($filename)) {
return explode(";", preg_replace("/[\r\n]/", "", file_get_contents($filename)));
@@ -37,21 +37,21 @@ class DbUpdater {
if (is_array($lines)) {
db_query("BEGIN");
$this->dbh->query("BEGIN");
foreach ($lines as $line) {
if (strpos($line, "--") !== 0 && $line) {
db_query($line);
$this->dbh->query($line);
}
}
$db_version = $this->getSchemaVersion();
$$this->dbh->version = $this->getSchemaVersion();
if ($db_version == $version) {
db_query("COMMIT");
if ($$this->dbh->version == $version) {
$this->dbh->query("COMMIT");
return true;
} else {
db_query("ROLLBACK");
$this->dbh->query("ROLLBACK");
return false;
}
} else {