blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

search_to_sql: leftover tsquery query fix for pgsql

Browse source
This commit is contained in:
Andrew Dolgov 2017-12-02 23:11:28 +03:00
parent a2d77092fe
commit 1e78803c44
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/functions.php
View file

@ -1388,7 +1388,7 @@
$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%') ."))"); $pdo->quote('%' . mb_strtolower($commandpair[1]) . '%') ."))");
} else { } else {
array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))"); OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
array_push($search_words, $k); array_push($search_words, $k);
} }
break; break;
@ -1398,7 +1398,7 @@
$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))"); $pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
} else { } else {
array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))"); OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
array_push($search_words, $k); array_push($search_words, $k);
} }
break; break;
@ -1412,8 +1412,8 @@
array_push($query_keywords, "($not (LOWER(note) LIKE ". array_push($query_keywords, "($not (LOWER(note) LIKE ".
$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))"); $pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
} else { } else {
array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))"); OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
if (!$not) array_push($search_words, $k); if (!$not) array_push($search_words, $k);
} }
break; break;
@ -1425,8 +1425,8 @@
else else
array_push($query_keywords, "($not (marked = false))"); array_push($query_keywords, "($not (marked = false))");
} else { } else {
array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))"); OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
if (!$not) array_push($search_words, $k); if (!$not) array_push($search_words, $k);
} }
break; break;
@ -1439,7 +1439,7 @@
} else { } else {
array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))"); OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
if (!$not) array_push($search_words, $k); if (!$not) array_push($search_words, $k);
} }
break; break;
@ -1451,8 +1451,8 @@
array_push($query_keywords, "($not (unread = false))"); array_push($query_keywords, "($not (unread = false))");
} else { } else {
array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))"); OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
if (!$not) array_push($search_words, $k); if (!$not) array_push($search_words, $k);
} }
break; break;
@ -1472,8 +1472,8 @@
$k = mb_strtolower($k); $k = mb_strtolower($k);
array_push($search_query_leftover, $not ? "!$k" : $k); array_push($search_query_leftover, $not ? "!$k" : $k);
} else { } else {
array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))"); OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
} }
if (!$not) array_push($search_words, $k); if (!$not) array_push($search_words, $k);
@ -1486,7 +1486,7 @@
if (DB_TYPE == "pgsql") { if (DB_TYPE == "pgsql") {
array_push($query_keywords, array_push($query_keywords,
"(tsvector_combined @@ to_tsquery('$search_language', '$search_query_leftover'))"); "(tsvector_combined @@ to_tsquery($search_language, $search_query_leftover))");
} }
} }