rooty/OwncloudBookmarksOfficial
1
0
Fork 0
mirror of https://github.com/owncloud/bookmarks.git synced 2024-11-30 05:24:09 +01:00
Code Issues Releases Activity

Fix sql style and add backticks... thanks @Kondou-ger

Browse Source 
Ref owncloud/apps#912
This commit is contained in:
Brice Maron 2013-04-23 21:44:04 +02:00
parent 2d0b0577bf
commit b4447b1e9f
1 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
lib/bookmarks.php
View File

@ -36,16 +36,16 @@ class OC_Bookmarks_Bookmarks{
array_unshift($params, OCP\USER::getUser()); array_unshift($params, OCP\USER::getUser());
$not_in = ''; $not_in = '';
if(!empty($filterTags) ) { if(!empty($filterTags) ) {
$exist_clause = " AND exists (select 1 from *PREFIX*bookmarks_tags $exist_clause = " AND exists (select 1 from `*PREFIX*bookmarks_tags`
t2 where t2.bookmark_id = t.bookmark_id and tag = ?) "; `t2` where `t2`.`bookmark_id` = `t`.`bookmark_id` and `tag` = ?) ";
$not_in = ' AND tag not in ('. implode(',', array_fill(0, count($filterTags), '?') ) .')'. $not_in = ' AND `tag` not in ('. implode(',', array_fill(0, count($filterTags), '?') ) .')'.
str_repeat($exist_clause, count($filterTags)); str_repeat($exist_clause, count($filterTags));
} }
$sql = 'SELECT tag, count(*) as nbr from *PREFIX*bookmarks_tags t '. $sql = 'SELECT tag, count(*) as nbr from *PREFIX*bookmarks_tags t '.
' WHERE EXISTS( SELECT 1 from *PREFIX*bookmarks bm where t.bookmark_id = bm.id and user_id = ?) '. ' WHERE EXISTS( SELECT 1 from *PREFIX*bookmarks bm where t.bookmark_id = bm.id and user_id = ?) '.
$not_in. $not_in.
' group by tag Order by nbr DESC '; ' GROUP BY `tag` ORDER BY `nbr` DESC ';
$query = OCP\DB::prepare($sql, $limit, $offset); $query = OCP\DB::prepare($sql, $limit, $offset);
$tags = $query->execute($params)->fetchAll(); $tags = $query->execute($params)->fetchAll();
@ -55,14 +55,14 @@ class OC_Bookmarks_Bookmarks{
public static function findOneBookmark($id) { public static function findOneBookmark($id) {
$CONFIG_DBTYPE = OCP\Config::getSystemValue( 'dbtype', 'sqlite' ); $CONFIG_DBTYPE = OCP\Config::getSystemValue( 'dbtype', 'sqlite' );
if($CONFIG_DBTYPE == 'pgsql') { if($CONFIG_DBTYPE == 'pgsql') {
$group_fct = 'array_agg(tag)'; $group_fct = 'array_agg(`tag`)';
} }
else { else {
$group_fct = 'GROUP_CONCAT(tag)'; $group_fct = 'GROUP_CONCAT(`tag`)';
} }
$sql = "SELECT *, (select $group_fct from *PREFIX*bookmarks_tags where bookmark_id = b.id) as tags $sql = "SELECT *, (select $group_fct from `*PREFIX*bookmarks_tags` where `bookmark_id` = `b`.`id`) as `tags`
FROM *PREFIX*bookmarks b FROM `*PREFIX*bookmarks` `b`
WHERE user_id = ? and id = ?"; WHERE `user_id` = ? AND `id` = ?";
$query = OCP\DB::prepare($sql); $query = OCP\DB::prepare($sql);
$result = $query->execute(array(OCP\USER::getUser(), $id))->fetchRow(); $result = $query->execute(array(OCP\USER::getUser(), $id))->fetchRow();
$result['tags'] = explode(',', $result['tags']); $result['tags'] = explode(',', $result['tags']);
@ -85,27 +85,27 @@ class OC_Bookmarks_Bookmarks{
$params=array(OCP\USER::getUser()); $params=array(OCP\USER::getUser());
if($CONFIG_DBTYPE == 'pgsql') { if($CONFIG_DBTYPE == 'pgsql') {
$sql = "select * from (SELECT *, (select array_to_string(array_agg(tag),'') from *PREFIX*bookmarks_tags where bookmark_id = b.id) as tags $sql = "SELECT * FROM (SELECT *, (select array_to_string(array_agg(`tag`),'') from `*PREFIX*bookmarks_tags` where `bookmark_id` = `b`.`id`) as `tags`
FROM *PREFIX*bookmarks b FROM `*PREFIX*bookmarks` `b`
WHERE user_id = ? ) as x WHERE true "; WHERE `user_id` = ? ) as `x` WHERE true ";
} }
else { else {
$sql = "SELECT *, (select GROUP_CONCAT(tag) from *PREFIX*bookmarks_tags where bookmark_id = b.id) as tags $sql = "SELECT *, (SELECT GROUP_CONCAT(`tag`) from `*PREFIX*bookmarks_tags` WHERE `bookmark_id` = `b`.`id`) as `tags`
FROM *PREFIX*bookmarks b FROM `*PREFIX*bookmarks` `b`
WHERE user_id = ? "; WHERE `user_id` = ? ";
} }
if($filterTagOnly) { if($filterTagOnly) {
$exist_clause = " AND exists (select id from *PREFIX*bookmarks_tags $exist_clause = " AND exists (SELECT `id` FROM `*PREFIX*bookmarks_tags`
t2 where t2.bookmark_id = b.id and tag = ?) "; `t2` WHERE `t2`.`bookmark_id` = `b`.`id` AND `tag` = ?) ";
$sql .= str_repeat($exist_clause, count($filters)); $sql .= str_repeat($exist_clause, count($filters));
$params = array_merge($params, $filters); $params = array_merge($params, $filters);
} else { } else {
if($CONFIG_DBTYPE == 'mysql') { //Dirty hack to allow usage of alias in where if($CONFIG_DBTYPE == 'mysql') { //Dirty hack to allow usage of alias in where
$sql .= ' having true '; $sql .= ' HAVING true ';
} }
foreach($filters as $filter) { foreach($filters as $filter) {
$sql .= ' AND lower(url || title || description || tags ) like ? '; $sql .= ' AND lower(`url` || `title` || `description` || `tags` ) LIKE ? ';
$params[] = '%' . strtolower($filter) . '%'; $params[] = '%' . strtolower($filter) . '%';
} }
} }
@ -166,10 +166,10 @@ class OC_Bookmarks_Bookmarks{
if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ) { if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ) {
// Update tags to the new label unless it already exists a tag like this // Update tags to the new label unless it already exists a tag like this
$query = OCP\DB::prepare(" $query = OCP\DB::prepare("
UPDATE OR REPLACE *PREFIX*bookmarks_tags UPDATE OR REPLACE `*PREFIX*bookmarks_tags`
SET tag = ? SET `tag` = ?
WHERE tag = ? WHERE `tag` = ?
AND exists( select b.id from *PREFIX*bookmarks b where b.user_id = ? and bookmark_id = b.id) AND exists( select `b`.`id` from `*PREFIX*bookmarks` `b` WHERE `b`.`user_id` = ? AND `bookmark_id` = `b`.`id`)
"); ");
$params=array( $params=array(
@ -183,9 +183,9 @@ class OC_Bookmarks_Bookmarks{
// Remove potentialy duplicated tags // Remove potentialy duplicated tags
$query = OCP\DB::prepare(" $query = OCP\DB::prepare("
DELETE FROM *PREFIX*bookmarks_tags as tgs where tgs.tag = ? DELETE FROM `*PREFIX*bookmarks_tags` as `tgs` WHERE `tgs`.`tag` = ?
AND exists( select id from *PREFIX*bookmarks where user_id = ? and tgs.bookmark_id = id) AND exists( SELECT `id` FROM `*PREFIX*bookmarks` WHERE `user_id` = ? AND `tgs`.`bookmark_id` = `id`)
AND exists( select t.tag from *PREFIX*bookmarks_tags t where t.tag=? and tgs.bookmark_id = tbookmark_id"); AND exists( SELECT `t`.`tag` FROM `*PREFIX*bookmarks_tags` `t` where `t`.`tag` = ? AND `tgs`.`bookmark_id` = `t`.`bookmark_id`");
$params=array( $params=array(
$new, $new,
@ -197,10 +197,10 @@ class OC_Bookmarks_Bookmarks{
// Update tags to the new label unless it already exists a tag like this // Update tags to the new label unless it already exists a tag like this
$query = OCP\DB::prepare(" $query = OCP\DB::prepare("
UPDATE *PREFIX*bookmarks_tags UPDATE `*PREFIX*bookmarks_tags`
SET tag = ? SET `tag` = ?
WHERE tag = ? WHERE `tag` = ?
AND exists( select b.id from *PREFIX*bookmarks b where b.user_id = ? and bookmark_id = b.id) AND exists( SELECT `b`.`id` FROM `*PREFIX*bookmarks` `b` WHERE `b`.`user_id` = ? AND `bookmark_id` = `b`.`id`)
"); ");
$params=array( $params=array(
@ -223,9 +223,9 @@ class OC_Bookmarks_Bookmarks{
// Update the record // Update the record
$query = OCP\DB::prepare(" $query = OCP\DB::prepare("
DELETE FROM *PREFIX*bookmarks_tags DELETE FROM `*PREFIX*bookmarks_tags`
WHERE tag = ? WHERE `tag` = ?
AND exists( select id from *PREFIX*bookmarks where user_id = ? and bookmark_id = id) AND exists( SELECT `id` FROM `*PREFIX*bookmarks` WHERE `user_id` = ? AND `bookmark_id` = `id`)
"); ");
$params=array( $params=array(
@ -271,11 +271,11 @@ class OC_Bookmarks_Bookmarks{
// Update the record // Update the record
$query = OCP\DB::prepare(" $query = OCP\DB::prepare("
UPDATE *PREFIX*bookmarks SET UPDATE `*PREFIX*bookmarks` SET
url = ?, title = ?, public = ?, description = ?, `url` = ?, `title` = ?, `public` = ?, `description` = ?,
lastmodified = ".self::getNowValue() ." `lastmodified` = ".self::getNowValue() ."
WHERE id = ? WHERE `id` = ?
AND user_id = ? AND `user_id` = ?
"); ");
$params=array( $params=array(
@ -295,7 +295,7 @@ class OC_Bookmarks_Bookmarks{
// Remove old tags // Remove old tags
$sql = "DELETE from *PREFIX*bookmarks_tags WHERE bookmark_id = ?"; $sql = "DELETE FROM `*PREFIX*bookmarks_tags` WHERE `bookmark_id` = ?";
$query = OCP\DB::prepare($sql); $query = OCP\DB::prepare($sql);
$query->execute(array($id)); $query->execute(array($id));
@ -317,7 +317,7 @@ class OC_Bookmarks_Bookmarks{
$enc_url = htmlspecialchars_decode($url); $enc_url = htmlspecialchars_decode($url);
$_ut = self::getNowValue(); $_ut = self::getNowValue();
// Change lastmodified date if the record if already exists // Change lastmodified date if the record if already exists
$sql = "SELECT * from *PREFIX*bookmarks WHERE url = ? and user_id = ?"; $sql = "SELECT * from `*PREFIX*bookmarks` WHERE `url` = ? AND `user_id` = ?";
$query = OCP\DB::prepare($sql, 1); $query = OCP\DB::prepare($sql, 1);
$result = $query->execute(array($enc_url, OCP\USER::getUser())); $result = $query->execute(array($enc_url, OCP\USER::getUser()));
if ($row = $result->fetchRow()){ if ($row = $result->fetchRow()){
@ -332,7 +332,7 @@ class OC_Bookmarks_Bookmarks{
$desc_str = ' , description = ?'; $desc_str = ' , description = ?';
$params[] = $description; $params[] = $description;
} }
$sql = "UPDATE *PREFIX*bookmarks SET lastmodified = $_ut $title_str $desc_str WHERE url = ? and user_id = ?"; $sql = "UPDATE `*PREFIX*bookmarks` SET `lastmodified` = $_ut $title_str $desc_str WHERE `url` = ? and `user_id` = ?";
$params[] = $enc_url; $params[] = $enc_url;
$params[] = OCP\USER::getUser(); $params[] = OCP\USER::getUser();
$query = OCP\DB::prepare($sql); $query = OCP\DB::prepare($sql);
@ -340,8 +340,8 @@ class OC_Bookmarks_Bookmarks{
return $row['id']; return $row['id'];
} }
$query = OCP\DB::prepare(" $query = OCP\DB::prepare("
INSERT INTO *PREFIX*bookmarks INSERT INTO `*PREFIX*bookmarks`
(url, title, user_id, public, added, lastmodified, description) (`url`, `title`, `user_id`, `public`, `added`, `lastmodified`, `description`)
VALUES (?, ?, ?, ?, $_ut, $_ut, ?) VALUES (?, ?, ?, ?, $_ut, $_ut, ?)
"); ");
@ -370,8 +370,8 @@ class OC_Bookmarks_Bookmarks{
**/ **/
private static function addTags($bookmark_id, $tags) { private static function addTags($bookmark_id, $tags) {
$query = OCP\DB::prepare(" $query = OCP\DB::prepare("
INSERT INTO *PREFIX*bookmarks_tags INSERT INTO `*PREFIX*bookmarks_tags`
(bookmark_id, tag) (`bookmark_id`, `tag`)
VALUES (?, ?)"); VALUES (?, ?)");
foreach ($tags as $tag) { foreach ($tags as $tag) {