diff --git a/docs/.vuepress/sidebar/en.js b/docs/.vuepress/sidebar/en.js index e59ce6d32f..7c60858788 100644 --- a/docs/.vuepress/sidebar/en.js +++ b/docs/.vuepress/sidebar/en.js @@ -345,10 +345,6 @@ module.exports = [ "concat_ws", "ends_with", "find_in_set", - "get_json_double", - "get_json_int", - "get_json_string", - "group_concat", "hex", "instr", "lcase", @@ -396,6 +392,7 @@ module.exports = [ directoryPath: "aggregate-functions/", children: [ "approx_count_distinct", + "group_concat", "avg", "bitmap_union", "count", @@ -455,6 +452,18 @@ module.exports = [ "bitnot" ], }, + { + title: "json function", + directoryPath: "json-functions/", + children: [ + "get_json_double", + "get_json_int", + "get_json_string", + "json_array", + "json_object", + "json_quote", + ], + }, { title: "Encryption and Digest Functions", directoryPath: "encrypt-digest-functions/", diff --git a/docs/.vuepress/sidebar/zh-CN.js b/docs/.vuepress/sidebar/zh-CN.js index d7a4bf1be3..9ca42dba91 100644 --- a/docs/.vuepress/sidebar/zh-CN.js +++ b/docs/.vuepress/sidebar/zh-CN.js @@ -349,10 +349,6 @@ module.exports = [ "concat_ws", "ends_with", "find_in_set", - "get_json_double", - "get_json_int", - "get_json_string", - "group_concat", "hex", "instr", "lcase", @@ -400,6 +396,7 @@ module.exports = [ directoryPath: "aggregate-functions/", children: [ "approx_count_distinct", + "group_concat", "avg", "bitmap_union", "count", @@ -459,6 +456,18 @@ module.exports = [ "bitnot" ], }, + { + title: "json 函数", + directoryPath: "json-functions/", + children: [ + "get_json_double", + "get_json_int", + "get_json_string", + "json_array", + "json_object", + "json_quote", + ], + }, { title: "Hash函数", directoryPath: "hash-functions/", diff --git a/docs/en/sql-reference/sql-functions/string-functions/group_concat.md b/docs/en/sql-reference/sql-functions/aggregate-functions/group_concat.md similarity index 86% rename from docs/en/sql-reference/sql-functions/string-functions/group_concat.md rename to docs/en/sql-reference/sql-functions/aggregate-functions/group_concat.md index 0a2cefa64a..bdff73360b 100644 --- a/docs/en/sql-reference/sql-functions/string-functions/group_concat.md +++ b/docs/en/sql-reference/sql-functions/aggregate-functions/group_concat.md @@ -1,6 +1,6 @@ --- { - "title": "group_concat", + "title": "GROUP_CONCAT", "language": "en" } --- @@ -28,7 +28,7 @@ under the License. ## description ### Syntax -`VARCHAR group_concat(VARCHAR str[, VARCHAR sep])` +`VARCHAR GROUP_CONCAT(VARCHAR str[, VARCHAR sep])` This function is an aggregation function similar to sum (), and group_concat links multiple rows of results in the result set to a string. The second parameter, sep, is a connection symbol between strings, which can be omitted. This function usually needs to be used with group by statements. @@ -45,16 +45,16 @@ mysql> select value from test; | c | +-------+ -mysql> select group_concat(value) from test; +mysql> select GROUP_CONCAT(value) from test; +-----------------------+ -| group_concat(`value`) | +| GROUP_CONCAT(`value`) | +-----------------------+ | a, b, c | +-----------------------+ -mysql> select group_concat(value, " ") from test; +mysql> select GROUP_CONCAT(value, " ") from test; +----------------------------+ -| group_concat(`value`, ' ') | +| GROUP_CONCAT(`value`, ' ') | +----------------------------+ | a b c | +----------------------------+ diff --git a/docs/en/sql-reference/sql-functions/string-functions/get_json_double.md b/docs/en/sql-reference/sql-functions/json-functions/get_json_double.md similarity index 100% rename from docs/en/sql-reference/sql-functions/string-functions/get_json_double.md rename to docs/en/sql-reference/sql-functions/json-functions/get_json_double.md diff --git a/docs/en/sql-reference/sql-functions/string-functions/get_json_int.md b/docs/en/sql-reference/sql-functions/json-functions/get_json_int.md similarity index 100% rename from docs/en/sql-reference/sql-functions/string-functions/get_json_int.md rename to docs/en/sql-reference/sql-functions/json-functions/get_json_int.md diff --git a/docs/en/sql-reference/sql-functions/string-functions/get_json_string.md b/docs/en/sql-reference/sql-functions/json-functions/get_json_string.md similarity index 100% rename from docs/en/sql-reference/sql-functions/string-functions/get_json_string.md rename to docs/en/sql-reference/sql-functions/json-functions/get_json_string.md diff --git a/docs/en/sql-reference/sql-functions/string-functions/json_array.md b/docs/en/sql-reference/sql-functions/json-functions/json_array.md similarity index 100% rename from docs/en/sql-reference/sql-functions/string-functions/json_array.md rename to docs/en/sql-reference/sql-functions/json-functions/json_array.md diff --git a/docs/en/sql-reference/sql-functions/string-functions/json_object.md b/docs/en/sql-reference/sql-functions/json-functions/json_object.md similarity index 100% rename from docs/en/sql-reference/sql-functions/string-functions/json_object.md rename to docs/en/sql-reference/sql-functions/json-functions/json_object.md diff --git a/docs/en/sql-reference/sql-functions/string-functions/json_quote.md b/docs/en/sql-reference/sql-functions/json-functions/json_quote.md similarity index 100% rename from docs/en/sql-reference/sql-functions/string-functions/json_quote.md rename to docs/en/sql-reference/sql-functions/json-functions/json_quote.md diff --git a/docs/zh-CN/sql-reference/sql-functions/string-functions/group_concat.md b/docs/zh-CN/sql-reference/sql-functions/aggregate-functions/group_concat.md similarity index 86% rename from docs/zh-CN/sql-reference/sql-functions/string-functions/group_concat.md rename to docs/zh-CN/sql-reference/sql-functions/aggregate-functions/group_concat.md index 1ba5fe6b45..bc435758a9 100644 --- a/docs/zh-CN/sql-reference/sql-functions/string-functions/group_concat.md +++ b/docs/zh-CN/sql-reference/sql-functions/aggregate-functions/group_concat.md @@ -1,6 +1,6 @@ --- { - "title": "group_concat", + "title": "GROUP_CONCAT", "language": "zh-CN" } --- @@ -28,7 +28,7 @@ under the License. ## description ### Syntax -`VARCHAR group_concat(VARCHAR str[, VARCHAR sep])` +`VARCHAR GROUP_CONCAT(VARCHAR str[, VARCHAR sep])` 该函数是类似于 sum() 的聚合函数,group_concat 将结果集中的多行结果连接成一个字符串。第二个参数 sep 为字符串之间的连接符号,该参数可以省略。该函数通常需要和 group by 语句一起使用。 @@ -45,16 +45,16 @@ mysql> select value from test; | c | +-------+ -mysql> select group_concat(value) from test; +mysql> select GROUP_CONCAT(value) from test; +-----------------------+ -| group_concat(`value`) | +| GROUP_CONCAT(`value`) | +-----------------------+ | a, b, c | +-----------------------+ -mysql> select group_concat(value, " ") from test; +mysql> select GROUP_CONCAT(value, " ") from test; +----------------------------+ -| group_concat(`value`, ' ') | +| GROUP_CONCAT(`value`, ' ') | +----------------------------+ | a b c | +----------------------------+ diff --git a/docs/zh-CN/sql-reference/sql-functions/string-functions/get_json_double.md b/docs/zh-CN/sql-reference/sql-functions/json-functions/get_json_double.md similarity index 100% rename from docs/zh-CN/sql-reference/sql-functions/string-functions/get_json_double.md rename to docs/zh-CN/sql-reference/sql-functions/json-functions/get_json_double.md diff --git a/docs/zh-CN/sql-reference/sql-functions/string-functions/get_json_int.md b/docs/zh-CN/sql-reference/sql-functions/json-functions/get_json_int.md similarity index 100% rename from docs/zh-CN/sql-reference/sql-functions/string-functions/get_json_int.md rename to docs/zh-CN/sql-reference/sql-functions/json-functions/get_json_int.md diff --git a/docs/zh-CN/sql-reference/sql-functions/string-functions/get_json_string.md b/docs/zh-CN/sql-reference/sql-functions/json-functions/get_json_string.md similarity index 100% rename from docs/zh-CN/sql-reference/sql-functions/string-functions/get_json_string.md rename to docs/zh-CN/sql-reference/sql-functions/json-functions/get_json_string.md diff --git a/docs/zh-CN/sql-reference/sql-functions/string-functions/json_array.md b/docs/zh-CN/sql-reference/sql-functions/json-functions/json_array.md similarity index 100% rename from docs/zh-CN/sql-reference/sql-functions/string-functions/json_array.md rename to docs/zh-CN/sql-reference/sql-functions/json-functions/json_array.md diff --git a/docs/zh-CN/sql-reference/sql-functions/string-functions/json_object.md b/docs/zh-CN/sql-reference/sql-functions/json-functions/json_object.md similarity index 100% rename from docs/zh-CN/sql-reference/sql-functions/string-functions/json_object.md rename to docs/zh-CN/sql-reference/sql-functions/json-functions/json_object.md diff --git a/docs/zh-CN/sql-reference/sql-functions/string-functions/json_quote.md b/docs/zh-CN/sql-reference/sql-functions/json-functions/json_quote.md similarity index 100% rename from docs/zh-CN/sql-reference/sql-functions/string-functions/json_quote.md rename to docs/zh-CN/sql-reference/sql-functions/json-functions/json_quote.md