Kouhei Sutou
null+****@clear*****
Mon Jul 3 12:03:20 JST 2017
Kouhei Sutou 2017-07-03 12:03:20 +0900 (Mon, 03 Jul 2017) New Revision: 0fe7bba0f06b470eccfcb25c45858704f5a498e8 https://github.com/pgroonga/pgroonga.github.io/commit/0fe7bba0f06b470eccfcb25c45858704f5a498e8 Message: Add &@~, &@~| and &@* Modified files: _po/ja/reference/functions/pgroonga-query-escape.po _po/ja/reference/functions/pgroonga-query-expand.po _po/ja/reference/functions/pgroonga-query-extract-keywords.po _po/ja/reference/index.po _po/ja/reference/operators/contain-jsonb.po _po/ja/reference/operators/match-in-v2.po _po/ja/reference/operators/match-v2.po _po/ja/reference/operators/match.po _po/ja/reference/operators/query-contain-v2.po _po/ja/reference/operators/query-in-v2.po _po/ja/reference/operators/query-jsonb-v2.po _po/ja/reference/operators/query-v2.po _po/ja/reference/operators/query.po ja/reference/functions/pgroonga-query-escape.md ja/reference/functions/pgroonga-query-expand.md ja/reference/functions/pgroonga-query-extract-keywords.md ja/reference/index.md ja/reference/operators/contain-jsonb.md ja/reference/operators/match-in-v2.md ja/reference/operators/match-v2.md ja/reference/operators/match.md ja/reference/operators/query-contain-v2.md ja/reference/operators/query-in-v2.md ja/reference/operators/query-jsonb-v2.md ja/reference/operators/query-v2.md ja/reference/operators/query.md reference/functions/pgroonga-query-escape.md reference/functions/pgroonga-query-expand.md reference/functions/pgroonga-query-extract-keywords.md reference/index.md reference/operators/contain-jsonb.md reference/operators/match-in-v2.md reference/operators/match-v2.md reference/operators/match.md reference/operators/query-contain-v2.md reference/operators/query-in-v2.md reference/operators/query-jsonb-v2.md reference/operators/query-v2.md reference/operators/query.md Modified: _po/ja/reference/functions/pgroonga-query-escape.po (+10 -5) =================================================================== --- _po/ja/reference/functions/pgroonga-query-escape.po 2017-07-03 11:25:59 +0900 (ae5f0ec) +++ _po/ja/reference/functions/pgroonga-query-escape.po 2017-07-03 12:03:20 +0900 (0fb395e) @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2016-12-05 15:47+0900\n" +"PO-Revision-Date: 2017-07-03 11:47+0900\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,12 +31,11 @@ msgstr "## 概要" msgid "" "`pgroonga.query_escape` function escapes special characters in [query syntax](" "http://groonga.org/docs/reference/grn_expr/query_syntax.html). Query syntax is" -" used by [`@@` operator](../operators/query.html), [`&?` operator](../operator" -"s/query-v2.html) and so on." +" used by [`&@~` operator][query-v2], [`&@~|` operator][query-in-v2] and so on." msgstr "" "`pgroonga.query_escape`関数は[クエリー構文](http://groonga.org/ja/docs/reference/grn_ex" -"pr/query_syntax.html)で特別な意味を持つ文字をエスケープします。[`@@`演算子](../operators/query.html)、[" -"`&?`演算子](../operators/query-v2.html)などがクエリー構文を使っています。" +"pr/query_syntax.html)で特別な意味を持つ文字をエスケープします。[`&@~`演算子][query-v2]、[`&@~|`演算子][que" +"ry-in-v2]などがクエリー構文を使っています。" msgid "" "`pgroonga.query_escape` function is useful to prevent Groonga command injectio" @@ -281,3 +280,9 @@ msgstr " * [`pgroonga.command_escape_value`関数](pgroonga-command-escape-valu msgid " * [`pgroonga.escape` function](pgroonga-escape.html)" msgstr " * [`pgroonga.escape`関数](pgroonga-escape.html)" + +msgid "[query-v2]:../operators/query-v2.html" +msgstr "" + +msgid "[query-in-v2]:../operators/query-in-v2.html" +msgstr "" Modified: _po/ja/reference/functions/pgroonga-query-expand.po (+8 -8) =================================================================== --- _po/ja/reference/functions/pgroonga-query-expand.po 2017-07-03 11:25:59 +0900 (2ffcb28) +++ _po/ja/reference/functions/pgroonga-query-expand.po 2017-07-03 12:03:20 +0900 (8e985e3) @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2017-07-03 11:24+0900\n" +"PO-Revision-Date: 2017-07-03 11:48+0900\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,11 +30,11 @@ msgstr "## 概要" msgid "" "`pgroonga.query_expand` function expands registered synonyms in query in [quer" -"y syntax][groonga-query-syntax]. Query syntax is used by [`&@*` operator][quer" -"y-v2], [`&@*|` operator][query-in-v2] and so on." +"y syntax][groonga-query-syntax]. Query syntax is used by [`&@~` operator][quer" +"y-v2], [`&@~|` operator][query-in-v2] and so on." msgstr "" "`pgroonga.query_expand`関数は[クエリー構文][groonga-query-syntax]を使ったクエリー内にある登録済みの同義語を展" -"開します。クエリー構文は[`&@*`演算子][query-v2]や[`&@*|`演算子][query-in-v2]で使われています。" +"開します。クエリー構文は[`&@~`演算子][query-v2]や[`&@~|`演算子][query-in-v2]で使われています。" msgid "" "`pgroonga.query_expand` function is useful to implement [query expansion][wiki" @@ -169,13 +169,13 @@ msgstr "" msgid "## See also" msgstr "## 参考" -msgid " * [`&@*` operator][query-v2]: Full text search by easy to use query language" +msgid " * [`&@~` operator][query-v2]: Full text search by easy to use query language" msgstr "" msgid "" -" * [`&?|` operator][query-in-v2]: Full text search by an array of queries in " -"easy to use query language" -msgstr " * [`&?|`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索" +" * [`&@~|` operator][query-in-v2]: Full text search by an array of queries in" +" easy to use query language" +msgstr " * [`&@~|`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索" msgid "" "[groonga-query-syntax]:http://groonga.org/docs/reference/grn_expr/query_syntax" Modified: _po/ja/reference/functions/pgroonga-query-extract-keywords.po (+11 -5) =================================================================== --- _po/ja/reference/functions/pgroonga-query-extract-keywords.po 2017-07-03 11:25:59 +0900 (9b3cdcc) +++ _po/ja/reference/functions/pgroonga-query-extract-keywords.po 2017-07-03 12:03:20 +0900 (de00a87) @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2016-12-05 15:47+0900\n" +"PO-Revision-Date: 2017-07-03 11:48+0900\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,12 +31,12 @@ msgstr "## 概要" msgid "" "`pgroonga.query_extract_keywords` function extract keywords from text that use" "s [query syntax](http://groonga.org/docs/reference/grn_expr/query_syntax.html)" -". Query syntax is used by [`@@` operator](../operators/query.html), [`&?` oper" -"ator](../operators/query-v2.html) and so on." +". Query syntax is used by [`&@~` operator][query-v2], [`&@~|` operator][query-" +"in-v2] and so on." msgstr "" "`pgroonga.query_extract_keywords`関数は[クエリー構文](http://groonga.org/ja/docs/refere" -"nce/grn_expr/query_syntax.html)を使っているテキストからキーワードを抽出します。クエリー構文は[`@@`演算子](../ope" -"rators/query.html)や[`&?`演算子](../operators/query-v2.html)などで使われています。" +"nce/grn_expr/query_syntax.html)を使っているテキストからキーワードを抽出します。クエリー構文は[`&@~`演算子][query" +"-v2]や[`&@~|`演算子][query-in-v2]などで使われています。" msgid "" "Extracting keywords from query helps you to use [`pgroonga.snippet_html` funct" @@ -146,3 +146,9 @@ msgid "" " * [`pgroonga.match_positions_byte` function](pgroonga-match-positions-byte.h" "tml)" msgstr " * [`pgroonga.match_positions_byte`関数](pgroonga-match-positions-byte.html)" + +msgid "[query-v2]:../operators/query-v2.html" +msgstr "" + +msgid "[query-in-v2]:../operators/query-in-v2.html" +msgstr "" Modified: _po/ja/reference/index.po (+33 -5) =================================================================== --- _po/ja/reference/index.po 2017-07-03 11:25:59 +0900 (4da68d1) +++ _po/ja/reference/index.po 2017-07-03 12:03:20 +0900 (c3f0f25) @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2017-07-03 11:25+0900\n" +"PO-Revision-Date: 2017-07-03 11:56+0900\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -99,14 +99,20 @@ msgstr " * [`%%` operator][match]：キーワード1つでの全文検索" msgid " * Deprecated since 1.2.0. Use [`&@` operator][match-v2] instead." msgstr " * 1.2.0から非推奨です。代わりに[`&@`演算子][match-v2]を使ってください。" +msgid " * [`&@~` operator][query-v2]: Full text search by easy to use query language" +msgstr " * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索" + msgid " * [`&?` operator][query-v2]: Full text search by easy to use query language" msgstr " * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索" +msgid " * Deprecated since 1.2.2. Use [`&@~` operator][query-v2] instead." +msgstr " * 1.2.2から非推奨です。代わりに[`&@~`演算子][query-v2]を使ってください。" + msgid " * [`@@` operator][query]: Full text search by easy to use query language" msgstr " * [`@@`演算子][query]：便利なクエリー言語を使った全文検索" -msgid " * Deprecated since 1.2.0. Use [`&?` operator][query-v2] instead." -msgstr " * 1.2.0から非推奨です。代わりに[`&?`演算子][query-v2]を使ってください。" +msgid " * Deprecated since 1.2.0. Use [`&@~` operator][query-v2] instead." +msgstr " * 1.2.0から非推奨です。代わりに[`&@~`演算子][query-v2]を使ってください。" msgid "#### `pgroonga.text_regexp_ops` operator class {#text-regexp-ops}" msgstr "#### `pgroonga.text_regexp_ops`演算子クラス {#text-regexp-ops}" @@ -199,10 +205,18 @@ msgid "" msgstr " * [`&@` operator][match-jsonb-v2]：`jsonb`内のすべてのテキストデータをキーワード1つで全文検索" msgid "" +" * [`&@~` operator][query-jsonb-v2]: Full text search against all text data i" +"n `jsonb` by easy to use query language" +msgstr " * [`&@~`演算子][query-jsonb-v2]：`jsonb`内のすべてのテキストデータを便利なクエリー言語を使った全文検索" + +msgid "" " * [`&?` operator][query-jsonb-v2]: Full text search against all text data in" " `jsonb` by easy to use query language" msgstr " * [`&?`演算子][query-jsonb-v2]：`jsonb`内のすべてのテキストデータを便利なクエリー言語を使った全文検索" +msgid " * Deprecated since 1.2.2. Use [`&@~` operator][query-jsonb-v2] instead." +msgstr " * 1.2.2から非推奨です。代わりに[`&@~`演算子][query-jsonb-v2]を使ってください。" + msgid "" " * [`` &` `` operator][script-jsonb-v2]: Advanced search by ECMAScript like q" "uery language" @@ -267,17 +281,25 @@ msgid " * Deprecated since 1.2.1. Use [`&@|` operator][match-in-v2] instead." msgstr " * 1.2.1から非推奨です。代わりに[`&@|`演算子][match-in-v2]を使ってください。" msgid "" +" * [`&@~|` operator][query-in-v2]: Full text search by an array of queries in" +" easy to use query language" +msgstr " * [`&@~|`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索" + +msgid "" " * [`&?|` operator][query-in-v2]: Full text search by an array of queries in " "easy to use query language" msgstr " * [`&?|`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索" +msgid " * Deprecated since 1.2.2. Use [`&@~|` operator][query-in-v2] instead." +msgstr " * 1.2.2から非推奨です。代わりに[`&@~|`演算子][query-in-v2]を使ってください。" + msgid "" " * [`&?>` operator][query-in-v2]: Full text search by an array of queries in " "easy to use query language" msgstr " * [`&?>`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索" -msgid " * Deprecated since 1.2.1. Use [`&?|` operator][query-in-v2] instead." -msgstr " * 1.2.1から非推奨です。代わりに[`&?|`演算子][query-in-v2]を使ってください。" +msgid " * Deprecated since 1.2.1. Use [`&@~|` operator][query-in-v2] instead." +msgstr " * 1.2.1から非推奨です。代わりに[`&@~|`演算子][query-in-v2]を使ってください。" msgid "" "#### `pgroonga.text_term_search_ops_v2` operator class {#text-term-search-ops-" @@ -333,6 +355,12 @@ msgstr "" "#### `pgroonga.text_array_full_text_search_ops_v2`演算子クラス {#text-array-full-tex" "t-search-ops-v2}" +msgid " * [`&@*` operator][similar-search-v2]: Similar search" +msgstr " * [`&@*`演算子][similar-search-v2]：類似文書検索" + +msgid " * Deprecated since 1.2.2. Use [`&@*` operator][similar-search-v2] instead." +msgstr " * 1.2.2から非推奨です。代わりに[`&@*`演算子][similar-search-v2]を使ってください。" + msgid "" "#### `pgroonga.text_array_term_search_ops_v2` operator class {#text-array-term" "-search-ops-v2}" Modified: _po/ja/reference/operators/contain-jsonb.po (+4 -4) =================================================================== --- _po/ja/reference/operators/contain-jsonb.po 2017-07-03 11:25:59 +0900 (085d9e2) +++ _po/ja/reference/operators/contain-jsonb.po 2017-07-03 12:03:20 +0900 (5479453) @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2017-06-09 00:34+0900\n" +"PO-Revision-Date: 2017-07-03 11:52+0900\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -206,9 +206,9 @@ msgid " * [`jsonb` support][jsonb]" msgstr " * [`jsonb`サポート][jsonb]" msgid "" -" * [`&?` operator][query-jsonb-v2]: Full text search against all text data in" -" `jsonb` by easy to use query language" -msgstr " * [`&?`演算子][query-jsonb-v2]：`jsonb`内のすべてのテキストデータを便利なクエリー言語を使った全文検索" +" * [`&@~` operator][query-jsonb-v2]: Full text search against all text data i" +"n `jsonb` by easy to use query language" +msgstr " * [`&@~`演算子][query-jsonb-v2]：`jsonb`内のすべてのテキストデータを便利なクエリー言語を使った全文検索" msgid "" " * [`` &` `` operator][script-jsonb-v2]: Advanced search by ECMAScript like q" Modified: _po/ja/reference/operators/match-in-v2.po (+6 -6) =================================================================== --- _po/ja/reference/operators/match-in-v2.po 2017-07-03 11:25:59 +0900 (1e1025e) +++ _po/ja/reference/operators/match-in-v2.po 2017-07-03 12:03:20 +0900 (9211db7) @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2017-06-10 13:39+0900\n" +"PO-Revision-Date: 2017-07-03 11:52+0900\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -145,9 +145,9 @@ msgstr "" "```\n" msgid "" -"`column &@| ARRAY['KEYWORD1', 'KEYWORD2']` equals to `column &? 'KEYWORD1 OR K" -"EYWORD2'`." -msgstr "column &@| ARRAY['キーワード1', 'キーワード2']`は`column &? 'キーワード1 OR キーワード2'`と同じです。" +"`column &@| ARRAY['KEYWORD1', 'KEYWORD2']` equals to `column &@~ 'KEYWORD1 OR " +"KEYWORD2'`." +msgstr "column &@| ARRAY['キーワード1', 'キーワード2']`は`column &@~ 'キーワード1 OR キーワード2'`と同じです。" msgid "## See also" msgstr "## 参考" @@ -155,8 +155,8 @@ msgstr "## 参考" msgid " * [`&@` operator][match-v2]: Full text search by a keyword" msgstr " * [`&@`演算子][match-v2]：キーワード1つでの全文検索" -msgid " * [`&?` operator][query-v2]: Full text search by easy to use query language" -msgstr " * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索" +msgid " * [`&@~` operator][query-v2]: Full text search by easy to use query language" +msgstr " * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索" msgid "" " * [`&?|` operator][query-in-v2]: Full text search by an array of queries in " Modified: _po/ja/reference/operators/match-v2.po (+5 -5) =================================================================== --- _po/ja/reference/operators/match-v2.po 2017-07-03 11:25:59 +0900 (5effeed) +++ _po/ja/reference/operators/match-v2.po 2017-07-03 12:03:20 +0900 (ae1906e) @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2017-06-07 22:59+0900\n" +"PO-Revision-Date: 2017-07-03 11:53+0900\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -141,8 +141,8 @@ msgstr "" msgid "" "If you want to perform full text search with multiple keywords or AND/OR searc" -"h, use [`&?` operator][query-v2]." -msgstr "複数のキーワードで全文検索したいときやAND/ORを使った検索をしたいときは[`&?`演算子][query-v2]を使います。" +"h, use [`&@~` operator][query-v2]." +msgstr "複数のキーワードで全文検索したいときやAND/ORを使った検索をしたいときは[`&@~`演算子][query-v2]を使います。" msgid "" "If you want to perform full text search with multiple keywords OR search, use " @@ -152,8 +152,8 @@ msgstr "複数のキーワードでOR全文検索をしたいときは[`&@|`演 msgid "## See also" msgstr "## 参考" -msgid " * [`&?` operator][query-v2]: Full text search by easy to use query language" -msgstr " * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索" +msgid " * [`&@~` operator][query-v2]: Full text search by easy to use query language" +msgstr " * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索" msgid " * [`&@|` operator][match-in-v2]: Full text search by an array of keywords" msgstr " * [`&@|`演算子][match-in-v2]：キーワードの配列での全文検索" Modified: _po/ja/reference/operators/match.po (+5 -5) =================================================================== --- _po/ja/reference/operators/match.po 2017-07-03 11:25:59 +0900 (67cb82e) +++ _po/ja/reference/operators/match.po 2017-07-03 12:03:20 +0900 (9da51de) @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2017-06-07 22:57+0900\n" +"PO-Revision-Date: 2017-07-03 11:53+0900\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -143,8 +143,8 @@ msgstr "" msgid "" "If you want to perform full text search with multiple keywords or AND/OR searc" -"h, use [`&?` operator][query-v2]." -msgstr "複数のキーワードで全文検索したいときやAND/ORを使った検索をしたいときは[`&?`演算子][query-v2]を使います。" +"h, use [`&@~` operator][query-v2]." +msgstr "複数のキーワードで全文検索したいときやAND/ORを使った検索をしたいときは[`&@~`演算子][query-v2]を使います。" msgid "" "If you want to perform full text search with multiple keywords OR search, use " @@ -154,8 +154,8 @@ msgstr "複数のキーワードでOR全文検索をしたいときは[`&@|`演 msgid "## See also" msgstr "## 参考" -msgid " * [`&?` operator][query-v2]: Full text search by easy to use query language" -msgstr " * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索" +msgid " * [`&@~` operator][query-v2]: Full text search by easy to use query language" +msgstr " * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索" msgid " * [`&@|` operator][match-in-v2]: Full text search by an array of keywords" msgstr " * [`&@|`演算子][match-in-v2]：キーワードの配列での全文検索" Modified: _po/ja/reference/operators/query-contain-v2.po (+3 -3) =================================================================== --- _po/ja/reference/operators/query-contain-v2.po 2017-07-03 11:25:59 +0900 (40de19a) +++ _po/ja/reference/operators/query-contain-v2.po 2017-07-03 12:03:20 +0900 (3efcc61) @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2017-06-10 13:48+0900\n" +"PO-Revision-Date: 2017-07-03 11:53+0900\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -10,13 +10,13 @@ msgstr "" msgid "" "---\n" -"title: \"&?> operator\"\n" +"title: \"&@~| operator\"\n" "upper_level: ../\n" "redirect: query-in-v2.html\n" "---" msgstr "" "---\n" -"title: \"&?>演算子\"\n" +"title: \"&@~>演算子\"\n" "upper_level: ../\n" "redirect: query-in-v2.html\n" "---" Modified: _po/ja/reference/operators/query-in-v2.po (+25 -22) =================================================================== --- _po/ja/reference/operators/query-in-v2.po 2017-07-03 11:25:59 +0900 (96e45ef) +++ _po/ja/reference/operators/query-in-v2.po 2017-07-03 12:03:20 +0900 (c665a1d) @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2017-06-10 13:49+0900\n" +"PO-Revision-Date: 2017-07-03 11:54+0900\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -10,31 +10,34 @@ msgstr "" msgid "" "---\n" -"title: \"&?| operator\"\n" +"title: \"&@~| operator\"\n" "upper_level: ../\n" "---" msgstr "" "---\n" -"title: \"&?|演算子\"\n" +"title: \"&@~|演算子\"\n" "upper_level: ../\n" "---" -msgid "# `&?|` operator" -msgstr "# `&?|`演算子" +msgid "# `&@~|` operator" +msgstr "# `&@~|`演算子" -msgid "Since 1.2.1." -msgstr "1.2.1で追加。" +msgid "Since 1.2.2." +msgstr "1.2.2で追加。" + +msgid "`&?|` operator is deprecated since 1.2.2. Use `&@~|` operator instead." +msgstr "1.2.2から`&?|`演算子は非推奨になりました。代わりに`&@~|`演算子を使ってください。" + +msgid "`&?>` operator is deprecated since 1.2.1. Use `&@~|` operator instead." +msgstr "1.2.1から`&?>`演算子は非推奨になりました。代わりに`&@~|`演算子を使ってください。" msgid "## Summary" msgstr "## 概要" -msgid "`&?>` operator is deprecated since 1.2.1. Use `&?|` operator instead." -msgstr "1.2.1から`&?>`演算子は非推奨になりました。代わりに`&?|`演算子を使ってください。" - msgid "" -"`&?|` operator performs full text search by an array of queries. If one or mor" -"e queries are matched, the record is matched." -msgstr "`&?|`演算子はクエリーの配列で全文検索をします。1つ以上のクエリーがマッチすればそのレコードはマッチしたことになります。" +"`&@~|` operator performs full text search by an array of queries. If one or mo" +"re queries are matched, the record is matched." +msgstr "`&@~|`演算子はクエリーの配列で全文検索をします。1つ以上のクエリーがマッチすればそのレコードはマッチしたことになります。" msgid "" "Query's syntax is similar to syntax that is used in Web search engine. For exa" @@ -46,7 +49,7 @@ msgstr "## 構文" msgid "" "```sql\n" -"column &?| queries\n" +"column &@~| queries\n" "```" msgstr "" @@ -127,13 +130,13 @@ msgstr "" "INSERT INTO memos VALUES (4, 'groongaコマンドがあります。');\n" "```" -msgid "You can perform full text search with queries by `&?|` operator:" -msgstr "`&?|`演算子を使うと複数のクエリーで全文検索できます。" +msgid "You can perform full text search with queries by `&@~|` operator:" +msgstr "`&@~|`演算子を使うと複数のクエリーで全文検索できます。" msgid "" "```sql\n" -"SELECT * FROM memos WHERE content &?| ARRAY['Groonga engine', 'PostgreSQL -PGr" -"oonga'];\n" +"SELECT * FROM memos WHERE content &@~| ARRAY['Groonga engine', 'PostgreSQL -PG" +"roonga'];\n" "-- id | content " " \n" "-- ----+----------------------------------------------------------------------" @@ -145,8 +148,8 @@ msgid "" "```" msgstr "" "```sql\n" -"SELECT * FROM memos WHERE content &?> ARRAY['Groonga 全文検索', 'PostgreSQL -PGroo" -"nga'];\n" +"SELECT * FROM memos WHERE content &@~> ARRAY['Groonga 全文検索', 'PostgreSQL -PGro" +"onga'];\n" "-- id | content \n" "-- ----+------------------------------------------------------------\n" "-- 1 | PostgreSQLはリレーショナル・データベース管理システムです。\n" @@ -163,8 +166,8 @@ msgstr "`PostgreSQL -PGroonga`クエリーは`id`が`1`のレコードにマッ msgid "## See also" msgstr "## 参考" -msgid " * [`&?` operator][query-v2]: Full text search by easy to use query language" -msgstr " * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索" +msgid " * [`&@~` operator][query-v2]: Full text search by easy to use query language" +msgstr " * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索" msgid " * [Groonga's query syntax][groonga-query-syntax]" msgstr " * [Groongaのクエリーの構文][groonga-query-syntax]" Modified: _po/ja/reference/operators/query-jsonb-v2.po (+17 -14) =================================================================== --- _po/ja/reference/operators/query-jsonb-v2.po 2017-07-03 11:25:59 +0900 (bc44a15) +++ _po/ja/reference/operators/query-jsonb-v2.po 2017-07-03 12:03:20 +0900 (2eda6b3) @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2017-04-12 08:57+0900\n" +"PO-Revision-Date: 2017-07-03 11:55+0900\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -10,28 +10,31 @@ msgstr "" msgid "" "---\n" -"title: \"&? operator for jsonb type\"\n" +"title: \"&@~ operator for jsonb type\"\n" "upper_level: ../\n" "---" msgstr "" "---\n" -"title: \"jsonb型用の&?演算子\"\n" +"title: \"jsonb型用の&@~演算子\"\n" "upper_level: ../\n" "---" -msgid "# `&?` operator for `jsonb` type" -msgstr "# `jsonb`型用の`&?`演算子" +msgid "# `&@~` operator for `jsonb` type" +msgstr "# `jsonb`型用の`&@~`演算子" msgid "Since 1.2.1." msgstr "1.2.1で追加。" +msgid "`&?` operator is deprecated since 1.2.2. Use `&@~` operator instead." +msgstr "" + msgid "## Summary" msgstr "## 概要" msgid "" -"`&?` operator performs full text search against all texts in `jsonb` with quer" -"y." -msgstr "`&?`は`jsonb`内のすべてのテキストに対してクエリーを使って全文検索を実行します。" +"`&@~` operator performs full text search against all texts in `jsonb` with que" +"ry." +msgstr "`&@~`は`jsonb`内のすべてのテキストに対してクエリーを使って全文検索を実行します。" msgid "" "Query's syntax is similar to syntax that is used in Web search engine. For exa" @@ -43,7 +46,7 @@ msgstr "## 構文" msgid "" "```sql\n" -"column &? query\n" +"column &@~ query\n" "```" msgstr "" @@ -119,11 +122,11 @@ msgid "" msgstr "" msgid "" -"You can perform full text search with multiple keywords by `&?` operator like " -"`KEYWORD1 KEYWORD2`. You can also do OR search by `KEYWORD1 OR KEYWORD2`:" +"You can perform full text search with multiple keywords by `&@~` operator like" +" `KEYWORD1 KEYWORD2`. You can also do OR search by `KEYWORD1 OR KEYWORD2`:" msgstr "" -"`@?`演算子を使うと`キーワード1 キーワード2`のように複数のキーワードを指定して全文検索できます。`キーワード1 OR キーワード2`のようにOR検索" -"することもできます。" +"`&@~`演算子を使うと`キーワード1 キーワード2`のように複数のキーワードを指定して全文検索できます。`キーワード1 OR キーワード2`のようにOR検" +"索することもできます。" msgid "" "(It uses [`jsonb_pretty()` function][postgresql-jsonb-pretty] provided since P" @@ -134,7 +137,7 @@ msgstr "" msgid "" "```sql\n" -"SELECT jsonb_pretty(record) FROM logs WHERE record &? 'server OR mail';\n" +"SELECT jsonb_pretty(record) FROM logs WHERE record &@~ 'server OR mail';\n" "-- jsonb_pretty \n" "-- ----------------------------------------------\n" "-- { +\n" Modified: _po/ja/reference/operators/query-v2.po (+17 -14) =================================================================== --- _po/ja/reference/operators/query-v2.po 2017-07-03 11:25:59 +0900 (b11de89) +++ _po/ja/reference/operators/query-v2.po 2017-07-03 12:03:20 +0900 (59875da) @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2017-06-07 23:08+0900\n" +"PO-Revision-Date: 2017-07-03 11:56+0900\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -10,26 +10,29 @@ msgstr "" msgid "" "---\n" -"title: \"&? operator for non jsonb types\"\n" +"title: \"&@~ operator for non jsonb types\"\n" "upper_level: ../\n" "---" msgstr "" "---\n" -"title: \"jsonb型以外の型用の&?演算子\"\n" +"title: \"jsonb型以外の型用の&@~演算子\"\n" "upper_level: ../\n" "---" -msgid "# `&?` operator for non `jsonb` types" -msgstr "# `jsonb`型以外の型用の`&?`演算子" +msgid "# `&@~` operator for non `jsonb` types" +msgstr "# `jsonb`型以外の型用の`&@~`演算子" msgid "Since 1.2.0." msgstr "1.2.0で追加。" +msgid "`&?` operator is deprecated since 1.2.2. Use `&@~` operator instead." +msgstr "`&?`演算子は1.2.2から非推奨です。代わりに`&@~`演算子を使ってください。" + msgid "## Summary" msgstr "## 概要" -msgid "`&?` operator performs full text search with query." -msgstr "`&?`演算子はクエリーを使って全文検索を実行します。" +msgid "`&@~` operator performs full text search with query." +msgstr "`&@~`演算子はクエリーを使って全文検索を実行します。" msgid "" "Query's syntax is similar to syntax that is used in Web search engine. For exa" @@ -41,7 +44,7 @@ msgstr "## 構文" msgid "" "```sql\n" -"column &? query\n" +"column &@~ query\n" "```" msgstr "" @@ -125,15 +128,15 @@ msgstr "" "```" msgid "" -"You can perform full text search with multiple keywords by `&?` operator like " -"`KEYWORD1 KEYWORD2`. You can also do OR search by `KEYWORD1 OR KEYWORD2`:" +"You can perform full text search with multiple keywords by `&@~` operator like" +" `KEYWORD1 KEYWORD2`. You can also do OR search by `KEYWORD1 OR KEYWORD2`:" msgstr "" -"`@?`演算子を使うと`キーワード1 キーワード2`のように複数のキーワードを指定して全文検索できます。`キーワード1 OR キーワード2`のようにOR検索" -"することもできます。" +"`&@~`演算子を使うと`キーワード1 キーワード2`のように複数のキーワードを指定して全文検索できます。`キーワード1 OR キーワード2`のようにOR検" +"索することもできます。" msgid "" "```sql\n" -"SELECT * FROM memos WHERE content &? 'PGroonga OR PostgreSQL';\n" +"SELECT * FROM memos WHERE content &@~ 'PGroonga OR PostgreSQL';\n" "-- id | content \n" "-- ----+----------------------------------------------------------------\n" "-- 3 | PGroonga is a PostgreSQL extension that uses Groonga as index.\n" @@ -142,7 +145,7 @@ msgid "" "```" msgstr "" "```sql\n" -"SELECT * FROM memos WHERE content &? 'PGroonga OR PostgreSQL';\n" +"SELECT * FROM memos WHERE content &@~ 'PGroonga OR PostgreSQL';\n" "-- id | content\n" "-- ----+----------------------------------------------------------------------" "-----\n" Modified: _po/ja/reference/operators/query.po (+6 -6) =================================================================== --- _po/ja/reference/operators/query.po 2017-07-03 11:25:59 +0900 (1a25b38) +++ _po/ja/reference/operators/query.po 2017-07-03 12:03:20 +0900 (cbf448b) @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2017-06-07 23:10+0900\n" +"PO-Revision-Date: 2017-07-03 11:56+0900\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,14 +22,14 @@ msgstr "" msgid "# `@@` operator for non `jsonb` types" msgstr "# `jsonb`型以外の型用の`@@`演算子" +msgid "" +"This operator is deprecated since 1.2.0. Use [`&@*` operator][query-v2] instea" +"d." +msgstr "この演算子は1.2.0から非推奨です。代わりに[`&@~`演算子][query-v2]を使ってください。" + msgid "## Summary" msgstr "## 概要" -msgid "" -"This operator is deprecated since 1.2.0. Use [`&?` operator][query-v2] instead" -"." -msgstr "この演算子は1.2.0から非推奨です。代わりに[`&?`演算子][query-v2]を使ってください。" - msgid "`@@` operator performs full text search with query." msgstr "`@@`演算子はクエリーを使って全文検索を実行します。" Modified: ja/reference/functions/pgroonga-query-escape.md (+5 -1) =================================================================== --- ja/reference/functions/pgroonga-query-escape.md 2017-07-03 11:25:59 +0900 (fa8e1d0) +++ ja/reference/functions/pgroonga-query-escape.md 2017-07-03 12:03:20 +0900 (76f5d3a) @@ -9,7 +9,7 @@ upper_level: ../ ## 概要 -`pgroonga.query_escape`関数は[クエリー構文](http://groonga.org/ja/docs/reference/grn_expr/query_syntax.html)で特別な意味を持つ文字をエスケープします。[`@@`演算子](../operators/query.html)、[`&?`演算子](../operators/query-v2.html)などがクエリー構文を使っています。 +`pgroonga.query_escape`関数は[クエリー構文](http://groonga.org/ja/docs/reference/grn_expr/query_syntax.html)で特別な意味を持つ文字をエスケープします。[`&@~`演算子][query-v2]、[`&@~|`演算子][query-in-v2]などがクエリー構文を使っています。 `pgroonga.query_escape`関数は[`pgroonga.command`関数](pgroonga-command.html)経由でGroongaコマンドインジェクションが発生することを防ぐときに有用です。Groongaコマンドインジェクションを防ぐことについては[`pgroonga.command_escape_value`関数](pgroonga-command-escape-value.html)と[`pgroonga.escape`関数](pgroonga-escape.html)も参照してください。 @@ -183,3 +183,7 @@ SELECT jsonb_pretty( * [`pgroonga.command_escape_value`関数](pgroonga-command-escape-value.html) * [`pgroonga.escape`関数](pgroonga-escape.html) + +[query-v2]:../operators/query-v2.html + +[query-in-v2]:../operators/query-in-v2.html Modified: ja/reference/functions/pgroonga-query-expand.md (+3 -3) =================================================================== --- ja/reference/functions/pgroonga-query-expand.md 2017-07-03 11:25:59 +0900 (e699a12) +++ ja/reference/functions/pgroonga-query-expand.md 2017-07-03 12:03:20 +0900 (8b39dba) @@ -9,7 +9,7 @@ upper_level: ../ ## 概要 -`pgroonga.query_expand`関数は[クエリー構文][groonga-query-syntax]を使ったクエリー内にある登録済みの同義語を展開します。クエリー構文は[`&@*`演算子][query-v2]や[`&@*|`演算子][query-in-v2]で使われています。 +`pgroonga.query_expand`関数は[クエリー構文][groonga-query-syntax]を使ったクエリー内にある登録済みの同義語を展開します。クエリー構文は[`&@~`演算子][query-v2]や[`&@~|`演算子][query-in-v2]で使われています。 `pgroonga.query_expand`関数は[クエリー展開][wikipedia-query-expansion]機能を実現するときに便利です。[Groongaのクエリー展開機能のドキュメント][groonga-query-expander]も参照してください。 @@ -87,9 +87,9 @@ SELECT pgroonga.query_expand('synonyms', 'term', 'synonyms', ## 参考 - * [`&@*` operator][query-v2]: Full text search by easy to use query language + * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索 - * [`&?|`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索 + * [`&@~|`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索 [groonga-query-syntax]:http://groonga.org/ja/docs/reference/grn_expr/query_syntax.html Modified: ja/reference/functions/pgroonga-query-extract-keywords.md (+5 -1) =================================================================== --- ja/reference/functions/pgroonga-query-extract-keywords.md 2017-07-03 11:25:59 +0900 (b5cbd03) +++ ja/reference/functions/pgroonga-query-extract-keywords.md 2017-07-03 12:03:20 +0900 (fcad8ff) @@ -9,7 +9,7 @@ upper_level: ../ ## 概要 -`pgroonga.query_extract_keywords`関数は[クエリー構文](http://groonga.org/ja/docs/reference/grn_expr/query_syntax.html)を使っているテキストからキーワードを抽出します。クエリー構文は[`@@`演算子](../operators/query.html)や[`&?`演算子](../operators/query-v2.html)などで使われています。 +`pgroonga.query_extract_keywords`関数は[クエリー構文](http://groonga.org/ja/docs/reference/grn_expr/query_syntax.html)を使っているテキストからキーワードを抽出します。クエリー構文は[`&@~`演算子][query-v2]や[`&@~|`演算子][query-in-v2]などで使われています。 クエリーからキーワードを抽出できると[`pgroonga.snippet_html`関数](pgroonga-snippet-html.html)や[`pgroonga.highlight_html`関数](pgroonga-highlight-html.html)などを使いやすくなります。これらにはキーワードを引数として渡さなければいけません。通常、渡すキーワードはクエリー内のキーワードになります。 @@ -76,3 +76,7 @@ SELECT pgroonga.query_extract_keywords('Groonga - MySQL PostgreSQL'); * [`pgroonga.highlight_html`関数](pgroonga-query-highlight-html.html) * [`pgroonga.match_positions_byte`関数](pgroonga-match-positions-byte.html) + +[query-v2]:../operators/query-v2.html + +[query-in-v2]:../operators/query-in-v2.html Modified: ja/reference/index.md (+58 -6) =================================================================== --- ja/reference/index.md 2017-07-03 11:25:59 +0900 (6d40685) +++ ja/reference/index.md 2017-07-03 12:03:20 +0900 (10c95fe) @@ -42,11 +42,15 @@ PGroongaは`pgroonga`スキーマに関数・演算子・演算子クラスな * 1.2.0から非推奨です。代わりに[`&@`演算子][match-v2]を使ってください。 + * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * 1.2.2から非推奨です。代わりに[`&@~`演算子][query-v2]を使ってください。 + * [`@@`演算子][query]：便利なクエリー言語を使った全文検索 - * 1.2.0から非推奨です。代わりに[`&?`演算子][query-v2]を使ってください。 + * 1.2.0から非推奨です。代わりに[`&@~`演算子][query-v2]を使ってください。 #### `pgroonga.text_regexp_ops`演算子クラス {#text-regexp-ops} @@ -68,11 +72,15 @@ PGroongaは`pgroonga`スキーマに関数・演算子・演算子クラスな * 1.2.0から非推奨です。代わりに[`&@`演算子][match-v2]を使ってください。 + * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * 1.2.2から非推奨です。代わりに[`&@~`演算子][query-v2]を使ってください。 + * [`@@`演算子][query]：便利なクエリー言語を使った全文検索 - * 1.2.0から非推奨です。代わりに[`&?`演算子][query-v2]を使ってください。 + * 1.2.0から非推奨です。代わりに[`&@~`演算子][query-v2]を使ってください。 ### `varchar`用 @@ -96,11 +104,15 @@ PGroongaは`pgroonga`スキーマに関数・演算子・演算子クラスな * 1.2.0から非推奨です。代わりに[`&@`演算子][match-v2]を使ってください。 + * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * 1.2.2から非推奨です。代わりに[`&@~`演算子][query-v2]を使ってください。 + * [`@@`演算子][query]：便利なクエリー言語を使った全文検索 - * 1.2.0から非推奨です。代わりに[`&?`演算子][query-v2]を使ってください。 + * 1.2.0から非推奨です。代わりに[`&@~`演算子][query-v2]を使ってください。 #### `pgroonga.varchar_regexp_ops`演算子クラス {#varchar-regexp-ops} @@ -140,8 +152,12 @@ PGroongaは`pgroonga`スキーマに関数・演算子・演算子クラスな * [`&@` operator][match-jsonb-v2]：`jsonb`内のすべてのテキストデータをキーワード1つで全文検索 + * [`&@~`演算子][query-jsonb-v2]：`jsonb`内のすべてのテキストデータを便利なクエリー言語を使った全文検索 + * [`&?`演算子][query-jsonb-v2]：`jsonb`内のすべてのテキストデータを便利なクエリー言語を使った全文検索 + * 1.2.2から非推奨です。代わりに[`&@~`演算子][query-jsonb-v2]を使ってください。 + * [`` &` ``演算子][script-jsonb-v2]：ECMAScriptのようなクエリー言語を使った高度な検索 * [`@@`演算子][script-jsonb]：ECMAScriptのようなクエリー言語を使った高度な検索 @@ -170,8 +186,12 @@ PGroonga 1.Y.Zは`pgroonga.XXX_v2`という演算子クラスを提供します * 新しく書くコードではこの演算子を使わないでください。後方互換製のために残っているだけの演算子です。 + * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * 1.2.2から非推奨です。代わりに[`&@~`演算子][query-v2]を使ってください。 + * [`@@`演算子][query]：便利なクエリー言語を使った全文検索 * 新しく書くコードではこの演算子を使わないでください。後方互換製のために残っているだけの演算子です。 @@ -186,11 +206,15 @@ PGroonga 1.Y.Zは`pgroonga.XXX_v2`という演算子クラスを提供します * 1.2.1から非推奨です。代わりに[`&@|`演算子][match-in-v2]を使ってください。 + * [`&@~|`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索 + * [`&?|`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索 + * 1.2.2から非推奨です。代わりに[`&@~|`演算子][query-in-v2]を使ってください。 + * [`&?>`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索 - * 1.2.1から非推奨です。代わりに[`&?|`演算子][query-in-v2]を使ってください。 + * 1.2.1から非推奨です。代わりに[`&@~|`演算子][query-in-v2]を使ってください。 #### `pgroonga.text_term_search_ops_v2`演算子クラス {#text-term-search-ops-v2} @@ -252,14 +276,22 @@ PGroonga 1.Y.Zは`pgroonga.XXX_v2`という演算子クラスを提供します * 新しく書くコードではこの演算子を使わないでください。後方互換製のために残っているだけの演算子です。 + * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * 1.2.2から非推奨です。代わりに[`&@~`演算子][query-v2]を使ってください。 + * [`@@`演算子][query]：便利なクエリー言語を使った全文検索 * 新しく書くコードではこの演算子を使わないでください。後方互換製のために残っているだけの演算子です。 + * [`&@*`演算子][similar-search-v2]：類似文書検索 + * [`&~?`演算子][similar-search-v2]：類似文書検索 + * 1.2.2から非推奨です。代わりに[`&@*`演算子][similar-search-v2]を使ってください。 + * [`` &` ``演算子][script-v2]：ECMAScriptのようなクエリー言語を使った高度な検索 * [`&@|`演算子][match-in-v2]：キーワードの配列での全文検索 @@ -268,11 +300,15 @@ PGroonga 1.Y.Zは`pgroonga.XXX_v2`という演算子クラスを提供します * 1.2.1から非推奨です。代わりに[`&@|`演算子][match-in-v2]を使ってください。 + * [`&@~|`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索 + * [`&?|`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索 + * 1.2.2から非推奨です。代わりに[`&@~|`演算子][query-in-v2]を使ってください。 + * [`&?>`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索 - * 1.2.1から非推奨です。代わりに[`&?|`演算子][query-in-v2]を使ってください。 + * 1.2.1から非推奨です。代わりに[`&@~|`演算子][query-in-v2]を使ってください。 #### `pgroonga.text_array_term_search_ops_v2`演算子クラス {#text-array-term-search-ops-v2} @@ -302,14 +338,22 @@ PGroonga 1.Y.Zは`pgroonga.XXX_v2`という演算子クラスを提供します * 新しく書くコードではこの演算子を使わないでください。後方互換製のために残っているだけの演算子です。 + * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * 1.2.2から非推奨です。代わりに[`&@~`演算子][query-v2]を使ってください。 + * [`@@`演算子][query]：便利なクエリー言語を使った全文検索 * 新しく書くコードではこの演算子を使わないでください。後方互換製のために残っているだけの演算子です。 + * [`&@*`演算子][similar-search-v2]：類似文書検索 + * [`&~?`演算子][similar-search-v2]：類似文書検索 + * 1.2.2から非推奨です。代わりに[`&@*`演算子][similar-search-v2]を使ってください。 + * [`` &` ``演算子][script-v2]：ECMAScriptのようなクエリー言語を使った高度な検索 * [`&@|`演算子][match-in-v2]：キーワードの配列での全文検索 @@ -318,11 +362,15 @@ PGroonga 1.Y.Zは`pgroonga.XXX_v2`という演算子クラスを提供します * 1.2.1から非推奨です。代わりに[`&@|`演算子][query-in-v2]を使ってください。 + * [`&@~|`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索 + * [`&?|`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索 + * 1.2.2から非推奨です。代わりに[`&@~|`演算子][query-in-v2]を使ってください。 + * [`&?>`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索 - * 1.2.1から非推奨です。代わりに[`&?|`演算子][query-in-v2]を使ってください。 + * 1.2.1から非推奨です。代わりに[`&@~|`演算子][query-in-v2]を使ってください。 #### `pgroonga.varchar_regexp_ops_v2`演算子クラス {#varchar-regexp-ops-v2} @@ -348,8 +396,12 @@ PGroonga 1.Y.Zは`pgroonga.XXX_v2`という演算子クラスを提供します * [`&@` operator][match-jsonb-v2]：`jsonb`内のすべてのテキストデータをキーワード1つで全文検索 + * [`&@~`演算子][query-jsonb-v2]：`jsonb`内のすべてのテキストデータを便利なクエリー言語を使った全文検索 + * [`&?`演算子][query-jsonb-v2]：`jsonb`内のすべてのテキストデータを便利なクエリー言語を使った全文検索 + * 1.2.2から非推奨です。代わりに[`&@~`演算子][query-jsonb-v2]を使ってください。 + * [`` &` ``演算子][script-jsonb-v2]：ECMAScriptのようなクエリー言語を使った高度な検索 * [`@@`演算子][script-jsonb]：ECMAScriptのようなクエリー言語を使った高度な検索 Modified: ja/reference/operators/contain-jsonb.md (+1 -1) =================================================================== --- ja/reference/operators/contain-jsonb.md 2017-07-03 11:25:59 +0900 (9234b97) +++ ja/reference/operators/contain-jsonb.md 2017-07-03 12:03:20 +0900 (b2e8f4f) @@ -126,7 +126,7 @@ SELECT jsonb_pretty(record) FROM logs WHERE record @> '{"tags": ["mail", "web"]} * [`jsonb`サポート][jsonb] - * [`&?`演算子][query-jsonb-v2]：`jsonb`内のすべてのテキストデータを便利なクエリー言語を使った全文検索 + * [`&@~`演算子][query-jsonb-v2]：`jsonb`内のすべてのテキストデータを便利なクエリー言語を使った全文検索 * [`` &` ``演算子][script-jsonb-v2]：ECMAScriptのようなクエリー言語を使った高度な検索 Modified: ja/reference/operators/match-in-v2.md (+3 -3) =================================================================== --- ja/reference/operators/match-in-v2.md 2017-07-03 11:25:59 +0900 (c7076ee) +++ ja/reference/operators/match-in-v2.md 2017-07-03 12:03:20 +0900 (06793eb) @@ -68,15 +68,15 @@ SELECT * FROM memos WHERE content &@> ARRAY['全文検索', 'データベース' ``` -column &@| ARRAY['キーワード1', 'キーワード2']`は`column &? 'キーワード1 OR キーワード2'`と同じです。 +column &@| ARRAY['キーワード1', 'キーワード2']`は`column &@~ 'キーワード1 OR キーワード2'`と同じです。 ## 参考 * [`&@`演算子][match-v2]：キーワード1つでの全文検索 - * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索 - * [`&?|`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索 + * [`&@~|`演算子][query-in-v2]：便利なクエリー言語を使ったクエリーの配列での全文検索 [match-v2]:match-v2.html [query-v2]:query-v2.html Modified: ja/reference/operators/match-v2.md (+2 -2) =================================================================== --- ja/reference/operators/match-v2.md 2017-07-03 11:25:59 +0900 (afa805c) +++ ja/reference/operators/match-v2.md 2017-07-03 12:03:20 +0900 (36a1772) @@ -67,13 +67,13 @@ SELECT * FROM memos WHERE content &@ '全文検索'; -- (1 row) ``` -複数のキーワードで全文検索したいときやAND/ORを使った検索をしたいときは[`&?`演算子][query-v2]を使います。 +複数のキーワードで全文検索したいときやAND/ORを使った検索をしたいときは[`&@~`演算子][query-v2]を使います。 複数のキーワードでOR全文検索をしたいときは[`&@|`演算子][match-in-v2]を使います。 ## 参考 - * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索 * [`&@|`演算子][match-in-v2]：キーワードの配列での全文検索 Modified: ja/reference/operators/match.md (+2 -2) =================================================================== --- ja/reference/operators/match.md 2017-07-03 11:25:59 +0900 (74de12c) +++ ja/reference/operators/match.md 2017-07-03 12:03:20 +0900 (5cf4a41) @@ -67,13 +67,13 @@ SELECT * FROM memos WHERE content %% '全文検索'; -- (1 row) ``` -複数のキーワードで全文検索したいときやAND/ORを使った検索をしたいときは[`&?`演算子][query-v2]を使います。 +複数のキーワードで全文検索したいときやAND/ORを使った検索をしたいときは[`&@~`演算子][query-v2]を使います。 複数のキーワードでOR全文検索をしたいときは[`&@|`演算子][match-in-v2]を使います。 ## 参考 - * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索 * [`&@|`演算子][match-in-v2]：キーワードの配列での全文検索 Modified: ja/reference/operators/query-contain-v2.md (+1 -1) =================================================================== --- ja/reference/operators/query-contain-v2.md 2017-07-03 11:25:59 +0900 (029e6cc) +++ ja/reference/operators/query-contain-v2.md 2017-07-03 12:03:20 +0900 (4b16453) @@ -1,5 +1,5 @@ --- -title: "&?>演算子" +title: "&@~>演算子" upper_level: ../ redirect: query-in-v2.html --- Modified: ja/reference/operators/query-in-v2.md (+12 -10) =================================================================== --- ja/reference/operators/query-in-v2.md 2017-07-03 11:25:59 +0900 (d8067cd) +++ ja/reference/operators/query-in-v2.md 2017-07-03 12:03:20 +0900 (723467e) @@ -1,24 +1,26 @@ --- -title: "&?|演算子" +title: "&@~|演算子" upper_level: ../ --- -# `&?|`演算子 +# `&@~|`演算子 -1.2.1で追加。 +1.2.2で追加。 -## 概要 +1.2.2から`&?|`演算子は非推奨になりました。代わりに`&@~|`演算子を使ってください。 + +1.2.1から`&?>`演算子は非推奨になりました。代わりに`&@~|`演算子を使ってください。 -1.2.1から`&?>`演算子は非推奨になりました。代わりに`&?|`演算子を使ってください。 +## 概要 -`&?|`演算子はクエリーの配列で全文検索をします。1つ以上のクエリーがマッチすればそのレコードはマッチしたことになります。 +`&@~|`演算子はクエリーの配列で全文検索をします。1つ以上のクエリーがマッチすればそのレコードはマッチしたことになります。 クエリーの構文はWeb検索エンジンで使われている構文と似ています。たとえば、クエリーで`キーワード1 OR キーワード2`と書くとOR検索できます。 ## 構文 ```sql -column &?| queries +column &@~| queries ``` `column`は検索対象のカラムです。型は`text`型、`text[]`型、`varchar`型のどれかです。 @@ -60,10 +62,10 @@ INSERT INTO memos VALUES (3, 'PGroongaはインデックスとしてGroongaを INSERT INTO memos VALUES (4, 'groongaコマンドがあります。'); ``` -`&?|`演算子を使うと複数のクエリーで全文検索できます。 +`&@~|`演算子を使うと複数のクエリーで全文検索できます。 ```sql -SELECT * FROM memos WHERE content &?> ARRAY['Groonga 全文検索', 'PostgreSQL -PGroonga']; +SELECT * FROM memos WHERE content &@~> ARRAY['Groonga 全文検索', 'PostgreSQL -PGroonga']; -- id | content -- ----+------------------------------------------------------------ -- 1 | PostgreSQLはリレーショナル・データベース管理システムです。 @@ -77,7 +79,7 @@ SELECT * FROM memos WHERE content &?> ARRAY['Groonga 全文検索', 'PostgreSQL ## 参考 - * [`&?`演算子][query-v2]：便利なクエリー言語を使った全文検索 + * [`&@~`演算子][query-v2]：便利なクエリー言語を使った全文検索 * [Groongaのクエリーの構文][groonga-query-syntax] Modified: ja/reference/operators/query-jsonb-v2.md (+8 -6) =================================================================== --- ja/reference/operators/query-jsonb-v2.md 2017-07-03 11:25:59 +0900 (c8bd508) +++ ja/reference/operators/query-jsonb-v2.md 2017-07-03 12:03:20 +0900 (bd5d79f) @@ -1,22 +1,24 @@ --- -title: "jsonb型用の&?演算子" +title: "jsonb型用の&@~演算子" upper_level: ../ --- -# `jsonb`型用の`&?`演算子 +# `jsonb`型用の`&@~`演算子 1.2.1で追加。 +`&?`演算子は1.2.2から非推奨です。代わりに`&@~`演算子を使ってください。 + ## 概要 -`&?`は`jsonb`内のすべてのテキストに対してクエリーを使って全文検索を実行します。 +`&@~`は`jsonb`内のすべてのテキストに対してクエリーを使って全文検索を実行します。 クエリーの構文はWeb検索エンジンで使われている構文と似ています。たとえば、クエリーで`キーワード1 OR キーワード2`と書くとOR検索できます。 ## 構文 ```sql -column &? query +column &@~ query ``` `column`は検索対象のカラムです。型は`jsonb`型です。 @@ -74,12 +76,12 @@ INSERT INTO logs }'); ``` -`@?`演算子を使うと`キーワード1 キーワード2`のように複数のキーワードを指定して全文検索できます。`キーワード1 OR キーワード2`のようにOR検索することもできます。 +`&@~`演算子を使うと`キーワード1 キーワード2`のように複数のキーワードを指定して全文検索できます。`キーワード1 OR キーワード2`のようにOR検索することもできます。 （読みやすくするためにPostgreSQL 9.5以降で使える[`jsonb_pretty()`関数][postgresql-jsonb-pretty]を使っています。） ```sql -SELECT jsonb_pretty(record) FROM logs WHERE record &? 'server OR mail'; +SELECT jsonb_pretty(record) FROM logs WHERE record &@~ 'server OR mail'; -- jsonb_pretty -- ---------------------------------------------- -- { + Modified: ja/reference/operators/query-v2.md (+8 -6) =================================================================== --- ja/reference/operators/query-v2.md 2017-07-03 11:25:59 +0900 (fa41937) +++ ja/reference/operators/query-v2.md 2017-07-03 12:03:20 +0900 (4c278c9) @@ -1,22 +1,24 @@ --- -title: "jsonb型以外の型用の&?演算子" +title: "jsonb型以外の型用の&@~演算子" upper_level: ../ --- -# `jsonb`型以外の型用の`&?`演算子 +# `jsonb`型以外の型用の`&@~`演算子 1.2.0で追加。 +`&?`演算子は1.2.2から非推奨です。代わりに`&@~`演算子を使ってください。 + ## 概要 -`&?`演算子はクエリーを使って全文検索を実行します。 +`&@~`演算子はクエリーを使って全文検索を実行します。 クエリーの構文はWeb検索エンジンで使われている構文と似ています。たとえば、クエリーで`キーワード1 OR キーワード2`と書くとOR検索できます。 ## 構文 ```sql -column &? query +column &@~ query ``` `column`は検索対象のカラムです。型は`text`型、`text[]`型、`varchar`型のどれかです。 @@ -61,10 +63,10 @@ INSERT INTO memos VALUES (3, 'PGroongaはインデックスとしてGroongaを INSERT INTO memos VALUES (4, 'groongaコマンドがあります。'); ``` -`@?`演算子を使うと`キーワード1 キーワード2`のように複数のキーワードを指定して全文検索できます。`キーワード1 OR キーワード2`のようにOR検索することもできます。 +`&@~`演算子を使うと`キーワード1 キーワード2`のように複数のキーワードを指定して全文検索できます。`キーワード1 OR キーワード2`のようにOR検索することもできます。 ```sql -SELECT * FROM memos WHERE content &? 'PGroonga OR PostgreSQL'; +SELECT * FROM memos WHERE content &@~ 'PGroonga OR PostgreSQL'; -- id | content -- ----+--------------------------------------------------------------------------- -- 3 | PGroongaはインデックスとしてGroongaを使うためのPostgreSQLの拡張機能です。 Modified: ja/reference/operators/query.md (+2 -2) =================================================================== --- ja/reference/operators/query.md 2017-07-03 11:25:59 +0900 (42e1995) +++ ja/reference/operators/query.md 2017-07-03 12:03:20 +0900 (89f82c1) @@ -5,9 +5,9 @@ upper_level: ../ # `jsonb`型以外の型用の`@@`演算子 -## 概要 +この演算子は1.2.0から非推奨です。代わりに[`&@~`演算子][query-v2]を使ってください。 -この演算子は1.2.0から非推奨です。代わりに[`&?`演算子][query-v2]を使ってください。 +## 概要 `@@`演算子はクエリーを使って全文検索を実行します。 Modified: reference/functions/pgroonga-query-escape.md (+5 -1) =================================================================== --- reference/functions/pgroonga-query-escape.md 2017-07-03 11:25:59 +0900 (6bee976) +++ reference/functions/pgroonga-query-escape.md 2017-07-03 12:03:20 +0900 (0dbd368) @@ -9,7 +9,7 @@ Since 1.1.9. ## Summary -`pgroonga.query_escape` function escapes special characters in [query syntax](http://groonga.org/docs/reference/grn_expr/query_syntax.html). Query syntax is used by [`@@` operator](../operators/query.html), [`&?` operator](../operators/query-v2.html) and so on. +`pgroonga.query_escape` function escapes special characters in [query syntax](http://groonga.org/docs/reference/grn_expr/query_syntax.html). Query syntax is used by [`&@~` operator][query-v2], [`&@~|` operator][query-in-v2] and so on. `pgroonga.query_escape` function is useful to prevent Groonga command injection via [`pgroonga.command` function](pgroonga-command.html). See also [`pgroonga.command_escape_value` function](pgroonga-command-escape-value.html) and [`pgroonga.escape` function](pgroonga-escape.html) for preventing Groonga command injection. @@ -183,3 +183,7 @@ SELECT jsonb_pretty( * [`pgroonga.command_escape_value` function](pgroonga-command-escape-value.html) * [`pgroonga.escape` function](pgroonga-escape.html) + +[query-v2]:../operators/query-v2.html + +[query-in-v2]:../operators/query-in-v2.html Modified: reference/functions/pgroonga-query-expand.md (+3 -3) =================================================================== --- reference/functions/pgroonga-query-expand.md 2017-07-03 11:25:59 +0900 (b1d2ef7) +++ reference/functions/pgroonga-query-expand.md 2017-07-03 12:03:20 +0900 (c8a7131) @@ -9,7 +9,7 @@ Since 1.2.2. ## Summary -`pgroonga.query_expand` function expands registered synonyms in query in [query syntax][groonga-query-syntax]. Query syntax is used by [`&@*` operator][query-v2], [`&@*|` operator][query-in-v2] and so on. +`pgroonga.query_expand` function expands registered synonyms in query in [query syntax][groonga-query-syntax]. Query syntax is used by [`&@~` operator][query-v2], [`&@~|` operator][query-in-v2] and so on. `pgroonga.query_expand` function is useful to implement [query expansion][wikipedia-query-expansion]. See also [document for Groonga's query expansion feature][groonga-query-expander]. @@ -87,9 +87,9 @@ SELECT pgroonga.query_expand('synonyms', 'term', 'synonyms', ## See also - * [`&@*` operator][query-v2]: Full text search by easy to use query language + * [`&@~` operator][query-v2]: Full text search by easy to use query language - * [`&?|` operator][query-in-v2]: Full text search by an array of queries in easy to use query language + * [`&@~|` operator][query-in-v2]: Full text search by an array of queries in easy to use query language [groonga-query-syntax]:http://groonga.org/docs/reference/grn_expr/query_syntax.html Modified: reference/functions/pgroonga-query-extract-keywords.md (+5 -1) =================================================================== --- reference/functions/pgroonga-query-extract-keywords.md 2017-07-03 11:25:59 +0900 (8b50cad) +++ reference/functions/pgroonga-query-extract-keywords.md 2017-07-03 12:03:20 +0900 (f7c6ee2) @@ -9,7 +9,7 @@ Since 1.0.7. ## Summary -`pgroonga.query_extract_keywords` function extract keywords from text that uses [query syntax](http://groonga.org/docs/reference/grn_expr/query_syntax.html). Query syntax is used by [`@@` operator](../operators/query.html), [`&?` operator](../operators/query-v2.html) and so on. +`pgroonga.query_extract_keywords` function extract keywords from text that uses [query syntax](http://groonga.org/docs/reference/grn_expr/query_syntax.html). Query syntax is used by [`&@~` operator][query-v2], [`&@~|` operator][query-in-v2] and so on. Extracting keywords from query helps you to use [`pgroonga.snippet_html` function](pgroonga-snippet-html.html), [`pgroonga.highlight_html` function](pgroonga-highlight-html.html) and so on. They require keywords as an argument. Normally, the keywords must be keywords in query. @@ -76,3 +76,7 @@ SELECT pgroonga.query_extract_keywords('Groonga - MySQL PostgreSQL'); * [`pgroonga.highlight_html` function](pgroonga-query-highlight-html.html) * [`pgroonga.match_positions_byte` function](pgroonga-match-positions-byte.html) + +[query-v2]:../operators/query-v2.html + +[query-in-v2]:../operators/query-in-v2.html Modified: reference/index.md (+58 -6) =================================================================== --- reference/index.md 2017-07-03 11:25:59 +0900 (f7f82c5) +++ reference/index.md 2017-07-03 12:03:20 +0900 (5f77371) @@ -42,11 +42,15 @@ PGroonga defines functions, operators, operator classes and so on into `pgroonga * Deprecated since 1.2.0. Use [`&@` operator][match-v2] instead. + * [`&@~` operator][query-v2]: Full text search by easy to use query language + * [`&?` operator][query-v2]: Full text search by easy to use query language + * Deprecated since 1.2.2. Use [`&@~` operator][query-v2] instead. + * [`@@` operator][query]: Full text search by easy to use query language - * Deprecated since 1.2.0. Use [`&?` operator][query-v2] instead. + * Deprecated since 1.2.0. Use [`&@~` operator][query-v2] instead. #### `pgroonga.text_regexp_ops` operator class {#text-regexp-ops} @@ -68,11 +72,15 @@ PGroonga defines functions, operators, operator classes and so on into `pgroonga * Deprecated since 1.2.0. Use [`&@` operator][match-v2] instead. + * [`&@~` operator][query-v2]: Full text search by easy to use query language + * [`&?` operator][query-v2]: Full text search by easy to use query language + * Deprecated since 1.2.2. Use [`&@~` operator][query-v2] instead. + * [`@@` operator][query]: Full text search by easy to use query language - * Deprecated since 1.2.0. Use [`&?` operator][query-v2] instead. + * Deprecated since 1.2.0. Use [`&@~` operator][query-v2] instead. ### For `varchar` @@ -96,11 +104,15 @@ PGroonga defines functions, operators, operator classes and so on into `pgroonga * Deprecated since 1.2.0. Use [`&@` operator][match-v2] instead. + * [`&@~` operator][query-v2]: Full text search by easy to use query language + * [`&?` operator][query-v2]: Full text search by easy to use query language + * Deprecated since 1.2.2. Use [`&@~` operator][query-v2] instead. + * [`@@` operator][query]: Full text search by easy to use query language - * Deprecated since 1.2.0. Use [`&?` operator][query-v2] instead. + * Deprecated since 1.2.0. Use [`&@~` operator][query-v2] instead. #### `pgroonga.varchar_regexp_ops` operator class {#varchar-regexp-ops} @@ -140,8 +152,12 @@ Supported types: `boolean`, `smallint`, `integer`, `bigint`, `real`, `double pre * [`&@` operator][match-jsonb-v2]: Full text search against all text data in `jsonb` by a keyword + * [`&@~` operator][query-jsonb-v2]: Full text search against all text data in `jsonb` by easy to use query language + * [`&?` operator][query-jsonb-v2]: Full text search against all text data in `jsonb` by easy to use query language + * Deprecated since 1.2.2. Use [`&@~` operator][query-jsonb-v2] instead. + * [`` &` `` operator][script-jsonb-v2]: Advanced search by ECMAScript like query language * [`@@` operator][script-jsonb]: Advanced search by ECMAScript like query language @@ -170,8 +186,12 @@ If you use them, you need to use [incompatible case steps][upgrade-incompatible] * Don't use this operator for newly written code. It's just for backward compatibility. + * [`&@~` operator][query-v2]: Full text search by easy to use query language + * [`&?` operator][query-v2]: Full text search by easy to use query language + * Deprecated since 1.2.2. Use [`&@~` operator][query-v2] instead. + * [`@@` operator][query]: Full text search by easy to use query language * Don't use this operator for newly written code. It's just for backward compatibility. @@ -186,11 +206,15 @@ If you use them, you need to use [incompatible case steps][upgrade-incompatible] * Deprecated since 1.2.1. Use [`&@|` operator][match-in-v2] instead. + * [`&@~|` operator][query-in-v2]: Full text search by an array of queries in easy to use query language + * [`&?|` operator][query-in-v2]: Full text search by an array of queries in easy to use query language + * Deprecated since 1.2.2. Use [`&@~|` operator][query-in-v2] instead. + * [`&?>` operator][query-in-v2]: Full text search by an array of queries in easy to use query language - * Deprecated since 1.2.1. Use [`&?|` operator][query-in-v2] instead. + * Deprecated since 1.2.1. Use [`&@~|` operator][query-in-v2] instead. #### `pgroonga.text_term_search_ops_v2` operator class {#text-term-search-ops-v2} @@ -252,14 +276,22 @@ If you use them, you need to use [incompatible case steps][upgrade-incompatible] * Don't use this operator for newly written code. It's just for backward compatibility. + * [`&@~` operator][query-v2]: Full text search by easy to use query language + * [`&?` operator][query-v2]: Full text search by easy to use query language + * Deprecated since 1.2.2. Use [`&@~` operator][query-v2] instead. + * [`@@` operator][query]: Full text search by easy to use query language * Don't use this operator for newly written code. It's just for backward compatibility. + * [`&@*` operator][similar-search-v2]: Similar search + * [`&~?` operator][similar-search-v2]: Similar search + * Deprecated since 1.2.2. Use [`&@*` operator][similar-search-v2] instead. + * [`` &` `` operator][script-v2]: Advanced search by ECMAScript like query language * [`&@|` operator][match-in-v2]: Full text search by an array of keywords @@ -268,11 +300,15 @@ If you use them, you need to use [incompatible case steps][upgrade-incompatible] * Deprecated since 1.2.1. Use [`&@|` operator][match-in-v2] instead. + * [`&@~|` operator][query-in-v2]: Full text search by an array of queries in easy to use query language + * [`&?|` operator][query-in-v2]: Full text search by an array of queries in easy to use query language + * Deprecated since 1.2.2. Use [`&@~|` operator][query-in-v2] instead. + * [`&?>` operator][query-in-v2]: Full text search by an array of queries in easy to use query language - * Deprecated since 1.2.1. Use [`&?|` operator][query-in-v2] instead. + * Deprecated since 1.2.1. Use [`&@~|` operator][query-in-v2] instead. #### `pgroonga.text_array_term_search_ops_v2` operator class {#text-array-term-search-ops-v2} @@ -302,14 +338,22 @@ If you use them, you need to use [incompatible case steps][upgrade-incompatible] * Don't use this operator for newly written code. It's just for backward compatibility. + * [`&@~` operator][query-v2]: Full text search by easy to use query language + * [`&?` operator][query-v2]: Full text search by easy to use query language + * Deprecated since 1.2.2. Use [`&@~` operator][query-v2] instead. + * [`@@` operator][query]: Full text search by easy to use query language * Don't use this operator for newly written code. It's just for backward compatibility. + * [`&@*` operator][similar-search-v2]: Similar search + * [`&~?` operator][similar-search-v2]: Similar search + * Deprecated since 1.2.2. Use [`&@*` operator][similar-search-v2] instead. + * [`` &` `` operator][script-v2]: Advanced search by ECMAScript like query language * [`&@|` operator][match-in-v2]: Full text search by an array of keywords @@ -318,11 +362,15 @@ If you use them, you need to use [incompatible case steps][upgrade-incompatible] * Deprecated since 1.2.1. Use [`&@|` operator][query-in-v2] instead. + * [`&@~|` operator][query-in-v2]: Full text search by an array of queries in easy to use query language + * [`&?|` operator][query-in-v2]: Full text search by an array of queries in easy to use query language + * Deprecated since 1.2.2. Use [`&@~|` operator][query-in-v2] instead. + * [`&?>` operator][query-in-v2]: Full text search by an array of queries in easy to use query language - * Deprecated since 1.2.1. Use [`&?|` operator][query-in-v2] instead. + * Deprecated since 1.2.1. Use [`&@~|` operator][query-in-v2] instead. #### `pgroonga.varchar_regexp_ops_v2` operator class {#varchar-regexp-ops-v2} @@ -348,8 +396,12 @@ If you use them, you need to use [incompatible case steps][upgrade-incompatible] * [`&@` operator][match-jsonb-v2]: Full text search against all text data in `jsonb` by a keyword + * [`&@~` operator][query-jsonb-v2]: Full text search against all text data in `jsonb` by easy to use query language + * [`&?` operator][query-jsonb-v2]: Full text search against all text data in `jsonb` by easy to use query language + * Deprecated since 1.2.2. Use [`&@~` operator][query-jsonb-v2] instead. + * [`` &` `` operator][script-jsonb-v2]: Advanced search by ECMAScript like query language * [`@@` operator][script-jsonb]: Advanced search by ECMAScript like query language Modified: reference/operators/contain-jsonb.md (+1 -1) =================================================================== --- reference/operators/contain-jsonb.md 2017-07-03 11:25:59 +0900 (c1dd374) +++ reference/operators/contain-jsonb.md 2017-07-03 12:03:20 +0900 (fb372ef) @@ -125,7 +125,7 @@ SELECT jsonb_pretty(record) FROM logs WHERE record @> '{"tags": ["mail", "web"]} * [`jsonb` support][jsonb] - * [`&?` operator][query-jsonb-v2]: Full text search against all text data in `jsonb` by easy to use query language + * [`&@~` operator][query-jsonb-v2]: Full text search against all text data in `jsonb` by easy to use query language * [`` &` `` operator][script-jsonb-v2]: Advanced search by ECMAScript like query language Modified: reference/operators/match-in-v2.md (+3 -3) =================================================================== --- reference/operators/match-in-v2.md 2017-07-03 11:25:59 +0900 (7f1bcaa) +++ reference/operators/match-in-v2.md 2017-07-03 12:03:20 +0900 (f0cc965) @@ -67,15 +67,15 @@ SELECT * FROM memos WHERE content &@| ARRAY['engine', 'database']; -- (2 rows) ``` -`column &@| ARRAY['KEYWORD1', 'KEYWORD2']` equals to `column &? 'KEYWORD1 OR KEYWORD2'`. +`column &@| ARRAY['KEYWORD1', 'KEYWORD2']` equals to `column &@~ 'KEYWORD1 OR KEYWORD2'`. ## See also * [`&@` operator][match-v2]: Full text search by a keyword - * [`&?` operator][query-v2]: Full text search by easy to use query language + * [`&@~` operator][query-v2]: Full text search by easy to use query language - * [`&?|` operator][query-in-v2]: Full text search by an array of queries in easy to use query language + * [`&@~|` operator][query-in-v2]: Full text search by an array of queries in easy to use query language [match-v2]:match-v2.html [query-v2]:query-v2.html Modified: reference/operators/match-v2.md (+2 -2) =================================================================== --- reference/operators/match-v2.md 2017-07-03 11:25:59 +0900 (9959050) +++ reference/operators/match-v2.md 2017-07-03 12:03:20 +0900 (fe0eb77) @@ -67,13 +67,13 @@ SELECT * FROM memos WHERE content &@ 'engine'; -- (1 row) ``` -If you want to perform full text search with multiple keywords or AND/OR search, use [`&?` operator][query-v2]. +If you want to perform full text search with multiple keywords or AND/OR search, use [`&@~` operator][query-v2]. If you want to perform full text search with multiple keywords OR search, use [`&@|` operator][match-in-v2]. ## See also - * [`&?` operator][query-v2]: Full text search by easy to use query language + * [`&@~` operator][query-v2]: Full text search by easy to use query language * [`&@|` operator][match-in-v2]: Full text search by an array of keywords Modified: reference/operators/match.md (+2 -2) =================================================================== --- reference/operators/match.md 2017-07-03 11:25:59 +0900 (c7c9fe9) +++ reference/operators/match.md 2017-07-03 12:03:20 +0900 (5a73abd) @@ -67,13 +67,13 @@ SELECT * FROM memos WHERE content %% 'engine'; -- (1 row) ``` -If you want to perform full text search with multiple keywords or AND/OR search, use [`&?` operator][query-v2]. +If you want to perform full text search with multiple keywords or AND/OR search, use [`&@~` operator][query-v2]. If you want to perform full text search with multiple keywords OR search, use [`&@|` operator][match-in-v2]. ## See also - * [`&?` operator][query-v2]: Full text search by easy to use query language + * [`&@~` operator][query-v2]: Full text search by easy to use query language * [`&@|` operator][match-in-v2]: Full text search by an array of keywords Modified: reference/operators/query-contain-v2.md (+1 -1) =================================================================== --- reference/operators/query-contain-v2.md 2017-07-03 11:25:59 +0900 (f81215c) +++ reference/operators/query-contain-v2.md 2017-07-03 12:03:20 +0900 (3de3e38) @@ -1,5 +1,5 @@ --- -title: "&?> operator" +title: "&@~| operator" upper_level: ../ redirect: query-in-v2.html --- Modified: reference/operators/query-in-v2.md (+12 -10) =================================================================== --- reference/operators/query-in-v2.md 2017-07-03 11:25:59 +0900 (fcf13b8) +++ reference/operators/query-in-v2.md 2017-07-03 12:03:20 +0900 (510e12c) @@ -1,24 +1,26 @@ --- -title: "&?| operator" +title: "&@~| operator" upper_level: ../ --- -# `&?|` operator +# `&@~|` operator -Since 1.2.1. +Since 1.2.2. -## Summary +`&?|` operator is deprecated since 1.2.2. Use `&@~|` operator instead. + +`&?>` operator is deprecated since 1.2.1. Use `&@~|` operator instead. -`&?>` operator is deprecated since 1.2.1. Use `&?|` operator instead. +## Summary -`&?|` operator performs full text search by an array of queries. If one or more queries are matched, the record is matched. +`&@~|` operator performs full text search by an array of queries. If one or more queries are matched, the record is matched. Query's syntax is similar to syntax that is used in Web search engine. For example, you can use OR search by `KEYWORD1 OR KEYWORD2` in query. ## Syntax ```sql -column &?| queries +column &@~| queries ``` `column` is a column to be searched. It's `text` type, `text[]` type or `varchar` type. @@ -60,10 +62,10 @@ INSERT INTO memos VALUES (3, 'PGroonga is a PostgreSQL extension that uses Groon INSERT INTO memos VALUES (4, 'There is groonga command.'); ``` -You can perform full text search with queries by `&?|` operator: +You can perform full text search with queries by `&@~|` operator: ```sql -SELECT * FROM memos WHERE content &?| ARRAY['Groonga engine', 'PostgreSQL -PGroonga']; +SELECT * FROM memos WHERE content &@~| ARRAY['Groonga engine', 'PostgreSQL -PGroonga']; -- id | content -- ----+------------------------------------------------------------------------ -- 1 | PostgreSQL is a relational database management system. @@ -77,7 +79,7 @@ SELECT * FROM memos WHERE content &?| ARRAY['Groonga engine', 'PostgreSQL -PGroo ## See also - * [`&?` operator][query-v2]: Full text search by easy to use query language + * [`&@~` operator][query-v2]: Full text search by easy to use query language * [Groonga's query syntax][groonga-query-syntax] Modified: reference/operators/query-jsonb-v2.md (+8 -6) =================================================================== --- reference/operators/query-jsonb-v2.md 2017-07-03 11:25:59 +0900 (bd6e5d2) +++ reference/operators/query-jsonb-v2.md 2017-07-03 12:03:20 +0900 (60bc2ea) @@ -1,22 +1,24 @@ --- -title: "&? operator for jsonb type" +title: "&@~ operator for jsonb type" upper_level: ../ --- -# `&?` operator for `jsonb` type +# `&@~` operator for `jsonb` type Since 1.2.1. +`&?` operator is deprecated since 1.2.2. Use `&@~` operator instead. + ## Summary -`&?` operator performs full text search against all texts in `jsonb` with query. +`&@~` operator performs full text search against all texts in `jsonb` with query. Query's syntax is similar to syntax that is used in Web search engine. For example, you can use OR search by `KEYWORD1 OR KEYWORD2` in query. ## Syntax ```sql -column &? query +column &@~ query ``` `column` is a column to be searched. It's `jsonb` type. @@ -74,12 +76,12 @@ INSERT INTO logs }'); ``` -You can perform full text search with multiple keywords by `&?` operator like `KEYWORD1 KEYWORD2`. You can also do OR search by `KEYWORD1 OR KEYWORD2`: +You can perform full text search with multiple keywords by `&@~` operator like `KEYWORD1 KEYWORD2`. You can also do OR search by `KEYWORD1 OR KEYWORD2`: (It uses [`jsonb_pretty()` function][postgresql-jsonb-pretty] provided since PostgreSQL 9.5 for readability.) ```sql -SELECT jsonb_pretty(record) FROM logs WHERE record &? 'server OR mail'; +SELECT jsonb_pretty(record) FROM logs WHERE record &@~ 'server OR mail'; -- jsonb_pretty -- ---------------------------------------------- -- { + Modified: reference/operators/query-v2.md (+8 -6) =================================================================== --- reference/operators/query-v2.md 2017-07-03 11:25:59 +0900 (94c47a2) +++ reference/operators/query-v2.md 2017-07-03 12:03:20 +0900 (bf384be) @@ -1,22 +1,24 @@ --- -title: "&? operator for non jsonb types" +title: "&@~ operator for non jsonb types" upper_level: ../ --- -# `&?` operator for non `jsonb` types +# `&@~` operator for non `jsonb` types Since 1.2.0. +`&?` operator is deprecated since 1.2.2. Use `&@~` operator instead. + ## Summary -`&?` operator performs full text search with query. +`&@~` operator performs full text search with query. Query's syntax is similar to syntax that is used in Web search engine. For example, you can use OR search by `KEYWORD1 OR KEYWORD2` in query. ## Syntax ```sql -column &? query +column &@~ query ``` `column` is a column to be searched. It's `text` type, `text[]` type or `varchar` type. @@ -61,10 +63,10 @@ INSERT INTO memos VALUES (3, 'PGroonga is a PostgreSQL extension that uses Groon INSERT INTO memos VALUES (4, 'There is groonga command.'); ``` -You can perform full text search with multiple keywords by `&?` operator like `KEYWORD1 KEYWORD2`. You can also do OR search by `KEYWORD1 OR KEYWORD2`: +You can perform full text search with multiple keywords by `&@~` operator like `KEYWORD1 KEYWORD2`. You can also do OR search by `KEYWORD1 OR KEYWORD2`: ```sql -SELECT * FROM memos WHERE content &? 'PGroonga OR PostgreSQL'; +SELECT * FROM memos WHERE content &@~ 'PGroonga OR PostgreSQL'; -- id | content -- ----+---------------------------------------------------------------- -- 3 | PGroonga is a PostgreSQL extension that uses Groonga as index. Modified: reference/operators/query.md (+2 -2) =================================================================== --- reference/operators/query.md 2017-07-03 11:25:59 +0900 (55f8843) +++ reference/operators/query.md 2017-07-03 12:03:20 +0900 (97cda6b) @@ -5,9 +5,9 @@ upper_level: ../ # `@@` operator for non `jsonb` types -## Summary +This operator is deprecated since 1.2.0. Use [`&@*` operator][query-v2] instead. -This operator is deprecated since 1.2.0. Use [`&?` operator][query-v2] instead. +## Summary `@@` operator performs full text search with query.
