valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into pdo

This commit is contained in:
Andrew Dolgov 2013-04-18 00:20:21 +04:00
parent e441b5837b fa8e7ea261
commit b6a7429591
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
classes/dbupdater.php
View File

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

2
classes/handler/public.php
View File

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

2
classes/logger/sql.php
View File

@ -5,7 +5,7 @@ class Logger_SQL {
if ($errno == E_NOTICE) return false; if ($errno == E_NOTICE) return false;
if (Db::get()) { if (Db::get() && get_schema_version() > 117) {
$errno = Db::get()->escape_string($errno); $errno = Db::get()->escape_string($errno);
$errstr = Db::get()->escape_string($errstr); $errstr = Db::get()->escape_string($errstr);

2
include/sanity_check.php
View File

@ -118,7 +118,7 @@
array_push($errors, "PHP support for JSON is required, but was not found."); array_push($errors, "PHP support for JSON is required, but was not found.");
} }
if (DB_TYPE == "mysql" && !function_exists("mysql_connect")) { if (DB_TYPE == "mysql" && !function_exists("mysql_connect") && !function_exists("mysqli_connect")) {
array_push($errors, "PHP support for MySQL is required for configured DB_TYPE in config.php."); array_push($errors, "PHP support for MySQL is required for configured DB_TYPE in config.php.");
} }

2
update.php
View File

@ -320,7 +320,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_TYPE, SCHEMA_VERSION); $updater = new DbUpdater(Db::get(), 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);