Skip to content
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

Jump to bottom

Changes to work in postgres #196

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Changes to work in postgres #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2679fa
remove all " of colum names
vitormattos Dec 29, 2020
2dd4515
Changes to prevent error
vitormattos Dec 29, 2020
269b5bc
Changes to prevent errors
vitormattos Dec 29, 2020
292ecc5
Maintain all columns in uppercase
vitormattos Dec 29, 2020
0897fea
Update index.php
vitormattos Dec 29, 2020
e295989
Merge branch 'master' into changes-to-work-in-postgres
vitormattos Oct 12, 2021
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
2 changes: 1 addition & 1 deletion controller/btdownloader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public function add()
(`UID`, `GID`, `FILENAME`, `PROTOCOL`, `STATUS`, `TIMESTAMP`) VALUES(?, ?, ?, ?, ?, ?)';
if ($this->DbType == 1) {
$SQL = 'INSERT INTO *PREFIX*ocdownloader_queue
("UID", "GID", "FILENAME", "PROTOCOL", "STATUS", "TIMESTAMP") VALUES(?, ?, ?, ?, ?, ?)';
(UID, GID, FILENAME, PROTOCOL, STATUS, TIMESTAMP) VALUES(?, ?, ?, ?, ?, ?)';
}

$Query = \OC_DB::prepare($SQL);
Expand Down
2 changes: 1 addition & 1 deletion controller/ftpdownloader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function add()
(`UID`, `GID`, `FILENAME`, `PROTOCOL`, `STATUS`, `TIMESTAMP`) VALUES(?, ?, ?, ?, ?, ?)';
if ($this->DbType == 1) {
$SQL = 'INSERT INTO *PREFIX*ocdownloader_queue
("UID", "GID", "FILENAME", "PROTOCOL", "STATUS", "TIMESTAMP") VALUES(?, ?, ?, ?, ?, ?)';
(UID, GID, FILENAME, PROTOCOL, STATUS, TIMESTAMP) VALUES(?, ?, ?, ?, ?, ?)';
}

$Query = \OC_DB::prepare($SQL);
Expand Down
2 changes: 1 addition & 1 deletion controller/httpdownloader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public function add()
(`UID`, `GID`, `FILENAME`, `PROTOCOL`, `STATUS`, `TIMESTAMP`) VALUES(?, ?, ?, ?, ?, ?)';
if ($this->DbType == 1) {
$SQL = 'INSERT INTO *PREFIX*ocdownloader_queue
("UID", "GID", "FILENAME", "PROTOCOL", "STATUS", "TIMESTAMP") VALUES(?, ?, ?, ?, ?, ?)';
(UID, GID, FILENAME, PROTOCOL, STATUS, TIMESTAMP) VALUES(?, ?, ?, ?, ?, ?)';
}

$Query = \OC_DB::prepare($SQL);
Expand Down
2 changes: 1 addition & 1 deletion controller/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function __construct($AppName, IRequest $Request, $CurrentUID, IL10N $L10
$this->Settings = new Settings();
$this->Settings->setKey('WhichDownloader');
$this->WhichDownloader = $this->Settings->getValue();
$this->WhichDownloader = is_null($this->WhichDownloader) ? 'ARIA2' : $this->WhichDownloader;
$this->WhichDownloader = !$this->WhichDownloader ? 'ARIA2' : $this->WhichDownloader;

$this->Settings->setKey('AllowProtocolHTTP');
$this->AllowProtocolHTTP = $this->Settings->getValue();
Expand Down
12 changes: 6 additions & 6 deletions controller/lib/api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public static function add($URL)
VALUES(?, ?, ?, ?, ?, ?, ?)';
if (self::$DbType == 1) {
$SQL = 'INSERT INTO *PREFIX*ocdownloader_queue
("UID", "GID", "FILENAME", "PROTOCOL", "IS_CLEANED", "STATUS", "TIMESTAMP")
(UID, GID, FILENAME, PROTOCOL, IS_CLEANED, STATUS, TIMESTAMP)
VALUES(?, ?, ?, ?, ?, ?, ?)';
}

Expand Down Expand Up @@ -213,8 +213,8 @@ public static function getQueue()
.' ORDER BY `TIMESTAMP` ASC';
if (self::$DbType == 1) {
$SQL = 'SELECT * FROM *PREFIX*ocdownloader_queue
WHERE "UID" = ? AND "STATUS" IN '.$StatusReq.' AND "IS_CLEANED" IN '.$IsCleanedReq
.' ORDER BY "TIMESTAMP" ASC';
WHERE uid = ? AND status IN '.$StatusReq.' AND is_cleaned IN '.$IsCleanedReq
.' ORDER BY timestamp ASC';
}
$Query = \OC_DB::prepare($SQL);
$Request = $Query->execute($Params);
Expand Down Expand Up @@ -278,7 +278,7 @@ public static function getQueue()
WHERE `UID` = ? AND `GID` = ?';
if (self::$DbType == 1) {
$SQL = 'DELETE FROM *PREFIX*ocdownloader_queue
WHERE "UID" = ? AND "GID" = ?';
WHERE uid = ? AND gid = ?';
}

$Query = \OC_DB::prepare($SQL);
Expand All @@ -294,7 +294,7 @@ public static function getQueue()
(`UID`, `GID`, `FILENAME`, `PROTOCOL`, `STATUS`, `TIMESTAMP`) VALUES(?, ?, ?, ?, ?, ?)';
if (self::$DbType == 1) {
$addSQL = 'INSERT INTO *PREFIX*ocdownloader_queue
("UID", "GID", "FILENAME", "PROTOCOL", "STATUS", "TIMESTAMP") VALUES(?, ?, ?, ?, ?, ?)';
(uid, gid, filename, protocol, status, timestamp) VALUES(?, ?, ?, ?, ?, ?)';
}
$addQuery = \OC_DB::prepare($addSQL);
$addQuery->execute(array(
Expand All @@ -313,7 +313,7 @@ public static function getQueue()
SET `STATUS` = ? WHERE `UID` = ? AND `GID` = ? AND `STATUS` != ?';
if (self::$DbType == 1) {
$SQL = 'UPDATE *PREFIX*ocdownloader_queue
SET "STATUS" = ? WHERE "UID" = ? AND "GID" = ? AND "STATUS" != ?';
SET status = ? WHERE uid = ? AND gid = ? AND status != ?';
}

$Query = \OC_DB::prepare($SQL);
Expand Down
20 changes: 10 additions & 10 deletions controller/lib/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ public function checkIfKeyExists()
$SQL = 'SELECT `VAL` FROM `*PREFIX*ocdownloader_'.$this->Table.'` WHERE `KEY` = ?'
.(!is_null($this->UID) ? ' AND `UID` = ?' : '') . ' LIMIT 1';
if ($this->DbType == 1) {
$SQL = 'SELECT "val" FROM *PREFIX*ocdownloader_'.$this->Table.' WHERE "key" = ?'
.(!is_null($this->UID) ? ' AND "uid" = ?' : '').' LIMIT 1';
$SQL = 'SELECT val FROM *PREFIX*ocdownloader_'.$this->Table.' WHERE key = ?'
.(!is_null($this->UID) ? ' AND uid = ?' : '').' LIMIT 1';
}
$Query = \OC_DB::prepare($SQL);
if (!is_null($this->UID)) {
Expand All @@ -74,8 +74,8 @@ public function getValue()
$SQL = 'SELECT `VAL` FROM `*PREFIX*ocdownloader_'.$this->Table.'` WHERE `KEY` = ?'
.(!is_null($this->UID) ? ' AND `UID` = ?' : '').' LIMIT 1';
if ($this->DbType == 1) {
$SQL = 'SELECT "val" FROM *PREFIX*ocdownloader_'.$this->Table.' WHERE "key" = ?'
.(!is_null($this->UID) ? ' AND "uid" = ?' : '').' LIMIT 1';
$SQL = 'SELECT val FROM *PREFIX*ocdownloader_'.$this->Table.' WHERE key = ?'
.(!is_null($this->UID) ? ' AND uid = ?' : '').' LIMIT 1';
}
$Query = \OC_DB::prepare($SQL);

Expand All @@ -96,8 +96,8 @@ public function getAllValues()
$SQL = 'SELECT `KEY`, `VAL` FROM `*PREFIX*ocdownloader_'.$this->Table.'`'
.(!is_null($this->UID) ? ' WHERE `UID` = ?' : '');
if ($this->DbType == 1) {
$SQL = 'SELECT "key", "val" FROM *PREFIX*ocdownloader_'.$this->Table.''
.(!is_null($this->UID) ? ' WHERE "uid" = ?' : '');
$SQL = 'SELECT key, val FROM *PREFIX*ocdownloader_'.$this->Table.''
.(!is_null($this->UID) ? ' WHERE uid = ?' : '');
}
$Query = \OC_DB::prepare($SQL);

Expand All @@ -113,8 +113,8 @@ public function updateValue($Value)
$SQL = 'UPDATE `*PREFIX*ocdownloader_' . $this->Table . '`SET `VAL` = ? WHERE `KEY` = ?'
.(!is_null($this->UID) ? ' AND `UID` = ?' : '');
if ($this->DbType == 1) {
$SQL = 'UPDATE *PREFIX*ocdownloader_' . $this->Table . 'SET "val" = ? WHERE "key" = ?'
.(!is_null($this->UID) ? ' AND "uid" = ?' : '');
$SQL = 'UPDATE *PREFIX*ocdownloader_' . $this->Table . ' SET val = ? WHERE key = ?'
.(!is_null($this->UID) ? ' AND uid = ?' : '');
}
$Query = \OC_DB::prepare($SQL);

Expand All @@ -130,8 +130,8 @@ public function insertValue($Value)
$SQL = 'INSERT INTO `*PREFIX*ocdownloader_'.$this->Table.'`(`KEY`, `VAL`'
.(!is_null($this->UID) ? ', `UID`' : '') . ') VALUES(?, ?' .(!is_null($this->UID) ? ', ?' : '').')';
if ($this->DbType == 1) {
$SQL = 'INSERT INTO *PREFIX*ocdownloader_'.$this->Table.'("key", "val"'
.(!is_null($this->UID) ? ', "uid"' : '') . ') VALUES(?, ?' .(!is_null($this->UID) ? ', ?' : '').')';
$SQL = 'INSERT INTO *PREFIX*ocdownloader_'.$this->Table.'(key, val'
.(!is_null($this->UID) ? ', uid' : '') . ') VALUES(?, ?' .(!is_null($this->UID) ? ', ?' : '').')';
}
$Query = \OC_DB::prepare($SQL);

Expand Down
12 changes: 6 additions & 6 deletions controller/lib/tools.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,12 @@ public static function getCounters($DbType, $UID)
.'(SELECT COUNT(*) FROM `*PREFIX*ocdownloader_queue` WHERE `STATUS` = ? AND `UID` = ?) as `STOPPED`,'
.'(SELECT COUNT(*) FROM `*PREFIX*ocdownloader_queue` WHERE `STATUS` = ? AND `UID` = ?) as `REMOVED`';
if ($DbType == 1) {
$SQL = 'SELECT(SELECT COUNT(*) FROM *PREFIX*ocdownloader_queue WHERE "STATUS" < ? AND "UID" = ?) as "ALL",'
.'(SELECT COUNT(*) FROM *PREFIX*ocdownloader_queue WHERE "STATUS" = ? AND "UID" = ?) as "COMPLETES",'
.'(SELECT COUNT(*) FROM *PREFIX*ocdownloader_queue WHERE "STATUS" = ? AND "UID" = ?) as "ACTIVES",'
.'(SELECT COUNT(*) FROM *PREFIX*ocdownloader_queue WHERE "STATUS" = ? AND "UID" = ?) as "WAITINGS",'
.'(SELECT COUNT(*) FROM *PREFIX*ocdownloader_queue WHERE "STATUS" = ? AND "UID" = ?) as "STOPPED",'
.'(SELECT COUNT(*) FROM *PREFIX*ocdownloader_queue WHERE "STATUS" = ? AND "UID" = ?) as "REMOVED"';
$SQL = 'SELECT(SELECT COUNT(*) FROM *PREFIX*ocdownloader_queue WHERE STATUS < ? AND UID = ?) as "ALL",'
.'(SELECT COUNT(*) FROM *PREFIX*ocdownloader_queue WHERE STATUS = ? AND UID = ?) as "COMPLETES",'
.'(SELECT COUNT(*) FROM *PREFIX*ocdownloader_queue WHERE STATUS = ? AND UID = ?) as "ACTIVES",'
.'(SELECT COUNT(*) FROM *PREFIX*ocdownloader_queue WHERE STATUS = ? AND UID = ?) as "WAITINGS",'
.'(SELECT COUNT(*) FROM *PREFIX*ocdownloader_queue WHERE STATUS = ? AND UID = ?) as "STOPPED",'
.'(SELECT COUNT(*) FROM *PREFIX*ocdownloader_queue WHERE STATUS = ? AND UID = ?) as "REMOVED"';
}
$Query = \OC_DB::prepare($SQL);
$Request = $Query->execute(array(5, $UID, 0, $UID, 1, $UID, 2, $UID, 3, $UID, 4, $UID));
Expand Down
Loading