DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor reformatting of sql

Browse Source
This commit is contained in:
Jörn Friedrich Dreyer 2013-08-28 15:24:41 +02:00
parent 7bc25ec0ce
commit d756b5fbaa
5 changed files with 66 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/download.php
View File

@ -36,7 +36,7 @@ class Download {
$this->filepath = $filepath; $this->filepath = $filepath;
$this->view = $view; $this->view = $view;
if (isset($_SERVER['HTTP_RANGE'])) { if (isset($_SERVER['HTTP_RANGE'])) {
$this->instance = new Download\Range($view, $filepath); $this->instance = new Download\Range($view, $filepath);
} else { } else {
$this->instance = new Download\Simple($view, $filepath); $this->instance = new Download\Simple($view, $filepath);

9
lib/invite.php
View File

@ -18,7 +18,10 @@ class Invite {
const STATUS_ACCEPTED = 2; const STATUS_ACCEPTED = 2;
public static function add($esId, $userId){ public static function add($esId, $userId){
$query = \OCP\DB::prepare('INSERT INTO `*PREFIX*documents_invite` (`es_id`, `uid`, `status`, `sent_on`) VALUES (?, ?, ?, ?) '); $query = \OCP\DB::prepare('
INSERT INTO `*PREFIX*documents_invite` (`es_id`, `uid`, `status`, `sent_on`)
VALUES (?, ?, ?, ?)
');
$query->execute(array( $query->execute(array(
$esId, $esId,
$userId, $userId,
@ -30,7 +33,7 @@ class Invite {
} }
public static function accept($esId){ public static function accept($esId){
$query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_invite` SET `status`=? WHERE `es_id`=? AND `uid`=?'); $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_invite` SET `status`=? WHERE `es_id`=? AND `uid`=?');
$query->execute(array( $query->execute(array(
self::STATUS_ACCEPTED, self::STATUS_ACCEPTED,
$esId, $esId,
@ -39,7 +42,7 @@ class Invite {
} }
public static function decline($esId){ public static function decline($esId){
$query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_invite` SET `status`=? WHERE `es_id`=? AND `uid`=?'); $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_invite` SET `status`=? WHERE `es_id`=? AND `uid`=?');
$query->execute(array( $query->execute(array(
self::STATUS_DECLINED, self::STATUS_DECLINED,
$esId, $esId,

26
lib/member.php
View File

@ -20,7 +20,10 @@ class Member {
const MEMBER_STATUS_INACTIVE = 2; const MEMBER_STATUS_INACTIVE = 2;
public static function add($esId, $displayname, $color){ public static function add($esId, $displayname, $color){
$query = \OCP\DB::prepare('INSERT INTO `*PREFIX*documents_member` (`es_id`, `uid`, `color`, `last_activity`) VALUES (?, ?, ?, ?) '); $query = \OCP\DB::prepare('
INSERT INTO `*PREFIX*documents_member` (`es_id`, `uid`, `color`, `last_activity`)
VALUES (?, ?, ?, ?)
');
$query->execute(array( $query->execute(array(
$esId, $esId,
\OCP\User::getUser(), \OCP\User::getUser(),
@ -45,13 +48,13 @@ class Member {
$placeholders = array_fill(0, $memberCount, '?'); $placeholders = array_fill(0, $memberCount, '?');
$stmt = implode(', ', $placeholders); $stmt = implode(', ', $placeholders);
$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_member` WHERE `member_id`IN (' . $stmt . ')'); $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_member` WHERE `member_id` IN (' . $stmt . ')');
$result = $query->execute($ids); $result = $query->execute($ids);
return $result->fetchAll(); return $result->fetchAll();
} }
public static function updateMemberActivity($memberId){ public static function updateMemberActivity($memberId){
$query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_member` SET `last_activity`=? WHERE `member_id`=?'); $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_member` SET `last_activity`=? WHERE `member_id`=?');
$query->execute(array( $query->execute(array(
time(), time(),
$memberId $memberId
@ -65,7 +68,7 @@ class Member {
$activeSince = $lastActivity; $activeSince = $lastActivity;
} }
$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_member` WHERE `es_id`= ? and `last_activity` > ?'); $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_member` WHERE `es_id`= ? AND `last_activity` > ?');
$result = $query->execute(array($esId, $activeSince)); $result = $query->execute(array($esId, $activeSince));
return $result->fetchAll(); return $result->fetchAll();
} }
@ -78,7 +81,13 @@ class Member {
public static function cleanSession($esId){ public static function cleanSession($esId){
$time = self::getInactivityPeriod(); $time = self::getInactivityPeriod();
$query = \OCP\DB::prepare('SELECT `member_id` FROM `*PREFIX*documents_member` WHERE `es_id`= ? AND `last_activity`<? AND `status`=?'); $query = \OCP\DB::prepare('
SELECT `member_id`
FROM `*PREFIX*documents_member`
WHERE `es_id`= ?
AND `last_activity`<?
AND `status`=?
');
$result = $query->execute(array( $result = $query->execute(array(
$esId, $esId,
$time, $time,
@ -97,7 +106,12 @@ class Member {
* @param timestamp $time * @param timestamp $time
*/ */
protected static function deactivate($esId, $time){ protected static function deactivate($esId, $time){
$query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_member` SET `status`=? WHERE `es_id`=? AND `last_activity`<?'); $query = \OCP\DB::prepare('
UPDATE `*PREFIX*documents_member`
SET `status`=?
WHERE `es_id`=?
AND `last_activity`<?
');
$query->execute(array( $query->execute(array(
self::MEMBER_STATUS_INACTIVE, self::MEMBER_STATUS_INACTIVE,
$esId, $esId,

20
lib/op.php
View File

@ -14,7 +14,10 @@ namespace OCA\Documents;
class Op { class Op {
public static function add($esId, $memberId, $opspec){ public static function add($esId, $memberId, $opspec){
$query = \OCP\DB::prepare('INSERT INTO `*PREFIX*documents_op` (`es_id`, `member`, `opspec`) VALUES (?, ?, ?) '); $query = \OCP\DB::prepare('
INSERT INTO `*PREFIX*documents_op` (`es_id`, `member`, `opspec`)
VALUES (?, ?, ?)
');
$query->execute(array( $query->execute(array(
$esId, $esId,
$memberId, $memberId,
@ -38,7 +41,12 @@ class Op {
* @returns "" when there are no Ops, or the seq of the last Op * @returns "" when there are no Ops, or the seq of the last Op
*/ */
public static function getHeadSeq($esId){ public static function getHeadSeq($esId){
$query = \OCP\DB::prepare('SELECT `seq` FROM `*PREFIX*documents_op` WHERE `es_id`=? ORDER BY `seq` DESC LIMIT 1'); $query = \OCP\DB::prepare('
SELECT `seq`
FROM `*PREFIX*documents_op`
WHERE `es_id`=?
ORDER BY `seq` DESC
', 1);
$result = $query->execute(array( $result = $query->execute(array(
$esId $esId
)) ))
@ -67,7 +75,13 @@ class Op {
if ($seq == ""){ if ($seq == ""){
$seq = -1; $seq = -1;
} }
$query = \OCP\DB::prepare('SELECT `opspec` FROM `*PREFIX*documents_op` WHERE `es_id`=? AND `seq`>? ORDER BY `seq` ASC'); $query = \OCP\DB::prepare('
SELECT `opspec`
FROM `*PREFIX*documents_op`
WHERE `es_id`=?
AND `seq`>?
ORDER BY `seq` ASC
');
$result = $query->execute(array($esId, $seq)); $result = $query->execute(array($esId, $seq));
return $result->fetchAll(); return $result->fetchAll();
} }

25
lib/session.php
View File

@ -14,7 +14,10 @@ namespace OCA\Documents;
class Session { class Session {
public static function add($genesis, $hash, $fileId){ public static function add($genesis, $hash, $fileId){
$query = \OCP\DB::prepare('INSERT INTO `*PREFIX*documents_session` (`es_id`, `genesis_url`, `genesis_hash`, `owner`, `file_id`) VALUES (?, ?, ?, ?, ?) '); $query = \OCP\DB::prepare('
INSERT INTO `*PREFIX*documents_session` (`es_id`, `genesis_url`, `genesis_hash`, `owner`, `file_id`)
VALUES (?, ?, ?, ?, ?)
');
$data = array( $data = array(
'es_id' => self::getUniqueSessionId(), 'es_id' => self::getUniqueSessionId(),
@ -45,7 +48,15 @@ class Session {
public static function getInfo($esId){ public static function getInfo($esId){
$query = \OCP\DB::prepare('SELECT s.*, COUNT(`m`.`member_id`) AS users FROM `*PREFIX*documents_session` AS s LEFT JOIN `*PREFIX*documents_member` AS m ON `s`.`es_id`=`m`.`es_id` AND `m`.`status`='. Member::MEMBER_STATUS_ACTIVE .' AND `m`.`uid` != ? WHERE `s`.`es_id` = ? GROUP BY `m`.`es_id`'); $query = \OCP\DB::prepare('
SELECT `s`.*, COUNT(`m`.`member_id`) AS `users`
FROM `*PREFIX*documents_session` AS `s`
LEFT JOIN `*PREFIX*documents_member` AS `m` ON `s`.`es_id`=`m`.`es_id`
AND `m`.`status`='. Member::MEMBER_STATUS_ACTIVE .'
AND `m`.`uid` != ?
WHERE `s`.`es_id` = ?
GROUP BY `m`.`es_id`
');
$result = $query->execute( $result = $query->execute(
array( array(
\OCP\User::getUser(), \OCP\User::getUser(),
@ -74,7 +85,15 @@ class Session {
$placeholders = array_fill(0, $fileIdCount, '?'); $placeholders = array_fill(0, $fileIdCount, '?');
$stmt = implode(', ', $placeholders); $stmt = implode(', ', $placeholders);
$query = \OCP\DB::prepare('SELECT s.*, COUNT(`m`.`member_id`) AS users FROM `*PREFIX*documents_session` AS s LEFT JOIN `*PREFIX*documents_member` AS m ON `s`.`es_id`=`m`.`es_id` AND `m`.`status`='. Member::MEMBER_STATUS_ACTIVE .' AND `m`.`uid` != ? WHERE `s`.`file_id` IN (' . $stmt .') GROUP BY `m`.`es_id`'); $query = \OCP\DB::prepare('
SELECT `s`.*, COUNT(`m`.`member_id`) AS `users`
FROM `*PREFIX*documents_session` AS `s`
LEFT JOIN `*PREFIX*documents_member` AS `m` ON `s`.`es_id`=`m`.`es_id`
AND `m`.`status`='. Member::MEMBER_STATUS_ACTIVE .'
AND `m`.`uid` != ?
WHERE `s`.`file_id` IN (' . $stmt .')
GROUP BY `m`.`es_id`
');
$result = $query->execute( $result = $query->execute(
array_merge(array(\OCP\User::getUser()), $fileIds) array_merge(array(\OCP\User::getUser()), $fileIds)
); );