X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Futils.ts;h=58a18c97a9788a2aab814f19925f7acbf8b9d820;hb=a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4;hp=393f8f03631f073e3e159db0cd86121ad9d1fdb5;hpb=d525fc399a14a8b16eaad6d4c0bc0a9c4093c3c9;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/utils.ts b/server/models/utils.ts index 393f8f036..58a18c97a 100644 --- a/server/models/utils.ts +++ b/server/models/utils.ts @@ -51,17 +51,6 @@ function createSimilarityAttribute (col: string, value: string) { ) } -function createSearchTrigramQuery (col: string, value: string) { - return { - [ Sequelize.Op.or ]: [ - // FIXME: use word_similarity instead of just similarity? - Sequelize.where(searchTrigramNormalizeCol(col), ' % ', searchTrigramNormalizeValue(value)), - - Sequelize.where(searchTrigramNormalizeCol(col), ' LIKE ', searchTrigramNormalizeValue(`%${value}%`)) - ] - } -} - // --------------------------------------------------------------------------- export { @@ -69,14 +58,13 @@ export { getSortOnModel, createSimilarityAttribute, throwIfNotValid, - buildTrigramSearchIndex, - createSearchTrigramQuery + buildTrigramSearchIndex } // --------------------------------------------------------------------------- function searchTrigramNormalizeValue (value: string) { - return Sequelize.fn('lower', Sequelize.fn('unaccent', value)) + return Sequelize.fn('lower', Sequelize.fn('immutable_unaccent', value)) } function searchTrigramNormalizeCol (col: string) {