git.iko.soy/denis
on master help sign in
Merge pull request #135 from ilyakooo0/develop
20617baiko
denis/src/Data/Query.hs+10−2
compare with master
unifiedsplit
@@ -542,13 +542,21 @@ getGroupChatForUserQ = selectStar $
542getFacultySearchResultQ :: Query Schema (TuplePG (Only Text)) (RowPG Faculty)
542getFacultySearchResultQ :: Query Schema (TuplePG (Only Text)) (RowPG Faculty)
543getFacultySearchResultQ = selectStar (from (table #faculties) &
543getFacultySearchResultQ = selectStar (from (table #faculties) &
544 where_ (vector @@ query) &
544 where_ (vector @@ query) &
545+ orderBy [
546+ tsRankCd vector1 query & Desc,
547+ tsRankCd vector2 query & Desc,
545− orderBy [tsRankCd vector query & Desc])
548+ tsRankCd vector query & Desc
549+ ])
546 where
550 where
547 vector = tsVector "russian" (textArrayToText [
551 vector = tsVector "russian" (textArrayToText [
548 #facultyName,
552 #facultyName,
549 #facultyPath,
553 #facultyPath,
550 #facultyCampusName,
554 #facultyCampusName,
551 (arrayToText #facultyTags)])
555 (arrayToText #facultyTags)])
556+ vector1 = tsVector "russian" #facultyName
557+ vector2 = tsVector "russian" (textArrayToText [
558+ #facultyName,
559+ #facultyPath])
552 query = tsQuery "russian" (param @1)
560 query = tsQuery "russian" (param @1)
553
561
554searchUsersQ :: Query Schema (TuplePG (Only Text)) (RowPG UserRow)
562searchUsersQ :: Query Schema (TuplePG (Only Text)) (RowPG UserRow)
@@ -610,7 +618,7 @@ tsRankCd
610 -> Expression schema from grouping params ('NotNull 'PGtext)
618 -> Expression schema from grouping params ('NotNull 'PGtext)
611 -> Expression schema from grouping params ('NotNull 'PGfloat4)
619 -> Expression schema from grouping params ('NotNull 'PGfloat4)
612tsRankCd vector query = UnsafeExpression $
620tsRankCd vector query = UnsafeExpression $
613− "ts_rank_cd" <> parenthesized (commaSeparated . map renderExpression $ [vector, query])
621+ "ts_rank_cd" <> parenthesized (commaSeparated ["ARRAY[1,1,1,1]", renderExpression vector, renderExpression query, "2|4|8|16|32"])
614
622
615tsVector
623tsVector
616 :: ByteString -- ^ Language
624 :: ByteString -- ^ Language