diff --git a/docs/reference/api.md b/docs/reference/api.md index 2d76b00ff16666283e42cbc1926472bb1e57be61..5eaa1e30371a36118cf7c2d5c87cc24122020fa0 100644 --- a/docs/reference/api.md +++ b/docs/reference/api.md @@ -22,7 +22,7 @@ Picodata](../tutorial/connecting.md) при иÑпользовании ввод Пример: ``` -picodata> pico.help("help"); +(admin) lua> pico.help("help"); -- Печатает данную Ñправку -- и ÑпиÑок доÑтупных разделов (topics) ``` @@ -64,7 +64,7 @@ Versioning][semver]). Пример: ```console -picodata> pico.LUA_API_VERSION; +(admin) lua> pico.LUA_API_VERSION; --- - 1.0.0 ... @@ -81,7 +81,7 @@ Versioning][calver]) Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¾Ð¼ `YY.0M.MICRO`. Пример: ```console -picodata> pico.PICODATA_VERSION; +(admin) lua> pico.PICODATA_VERSION; --- - 23.06.0 ... @@ -245,7 +245,7 @@ function help(topic) Пример: ``` -picodata> pico.help("help"); +(admin) lua> pico.help("help"); -- Печатает данную Ñправку -- и ÑпиÑок доÑтупных разделов (topics) ``` @@ -281,7 +281,7 @@ function instance_info(instance) Пример: ```lua - picodata> pico.instance_info(); +(admin) lua> pico.instance_info(); --- - target_state: variant: Online @@ -398,7 +398,7 @@ function raft_read_index(timeout) Пример: ```console -picodata> pico.raft_read_index(1); +(admin) lua> pico.raft_read_index(1); --- - 42 ... @@ -427,7 +427,7 @@ picodata> pico.raft_read_index(1); Пример: ```console -picodata> pico.raft_status(); +(admin) lua> pico.raft_status(); --- - term: 2 leader_id: 1 @@ -623,7 +623,7 @@ function whoami() Пример: ```console -picodata> pico.whoami(); +(admin) lua> pico.whoami(); - raft_id: 1 cluster_name: demo instance_name: i1 diff --git a/docs/reference/cli.md b/docs/reference/cli.md index 33fc93ab86329c0519f311c4fbd17880bf2353dc..cb822a875af26b5f79fec09acf3abaf65d854d53 100644 --- a/docs/reference/cli.md +++ b/docs/reference/cli.md @@ -433,7 +433,7 @@ picodata admin <PATH> $ picodata admin ./admin.socket Connected to admin console by socket path "admin.socket" type '\help' for interactive help -picodata> +(admin) sql> ``` <!-- ********************************************************************** --> @@ -489,7 +489,7 @@ $ picodata connect alice@127.0.0.1:3301; Enter password for alice: Connected to interactive console by address "127.0.0.1:3301" under "alice" user type '\help' for interactive help -picodata> +sql> ``` ### -a, --auth-type {: #connect_auth_type } @@ -529,7 +529,7 @@ picodata> [pico.cas()](api.md#pico.cas), например, так: ```lua -picodata> pico.cas({ +(admin) lua> pico.cas({ kind = 'replace', table = '_pico_property', tuple = {'max_login_attempts', 6}, diff --git a/docs/reference/sql/cast.md b/docs/reference/sql/cast.md index 473a46e0607392954b43fb2b9ffa62f7c425be99..75d228089ad56039b44d9bdaf567fec7b1cd4803 100644 --- a/docs/reference/sql/cast.md +++ b/docs/reference/sql/cast.md @@ -47,7 +47,7 @@ SELECT "score" FROM "scoring"; Преобразуем тип значений из колонки `score` в INT Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ функции `CAST`: ```sql -picodata> SELECT CAST("score" AS INT) FROM "scoring"; +sql> SELECT CAST("score" AS INT) FROM "scoring"; +-------+ | COL_1 | +=======+ @@ -64,7 +64,7 @@ picodata> SELECT CAST("score" AS INT) FROM "scoring"; двойное двоеточие: ```sql -picodata> SELECT "score"::INT FROM "scoring"; +sql> SELECT "score"::INT FROM "scoring"; +-------+ | COL_1 | +=======+ diff --git a/docs/reference/sql/current_date.md b/docs/reference/sql/current_date.md index f0377c783749836ae18d168f0025622078d6c9ef..341bccd19b0120f2dcd9ba601aea1e3378479e0e 100644 --- a/docs/reference/sql/current_date.md +++ b/docs/reference/sql/current_date.md @@ -12,7 +12,7 @@ ## Примеры {: #examples } ```sql -picodata> VALUES (CURRENT_DATE); +sql> VALUES (CURRENT_DATE); +------------------------+ | COL_1 | +========================+ diff --git a/docs/reference/sql/join.md b/docs/reference/sql/join.md index 1ae9bf33b6794fbe7076481f3cd2deeba1978245..1ccb4462f8f7676eb0651daa7870b413958f70f7 100644 --- a/docs/reference/sql/join.md +++ b/docs/reference/sql/join.md @@ -209,7 +209,7 @@ ON items.name = orders.item; Ñвоим колонкам "id": ```sql -picodata> EXPLAIN SELECT items.name, items.stock, orders.amount +sql> EXPLAIN SELECT items.name, items.stock, orders.amount FROM items INNER JOIN orders ON items.id = orders.id; @@ -236,7 +236,7 @@ vtable_max_rows = 5000 "orders" — по какой-то другой колонке: ```sql -picodata> EXPLAIN SELECT items.name, items.stock, orders.amount +sql> EXPLAIN SELECT items.name, items.stock, orders.amount FROM items INNER JOIN orders ON items.id = orders.id; @@ -265,7 +265,7 @@ vtable_max_rows = 5000 том, что обе таблицы раÑпределены только по `id`: ```sql -picodata> EXPLAIN SELECT items.name, items.stock, orders.amount +sql> EXPLAIN SELECT items.name, items.stock, orders.amount FROM items INNER JOIN orders ON items.name = orders.item; @@ -286,7 +286,7 @@ vtable_max_rows = 5000 Также, при иÑпользовании математичеÑких выражений или литералов, перемещение вÑегда будет полным: ```sql -picodata> EXPLAIN SELECT items.name, items.stock, orders.amount +sql> EXPLAIN SELECT items.name, items.stock, orders.amount FROM items INNER JOIN orders ON items.id > 2; @@ -305,7 +305,7 @@ vtable_max_rows = 5000 ``` ```sql -picodata> EXPLAIN SELECT items.name, items.stock, orders.amount +sql> EXPLAIN SELECT items.name, items.stock, orders.amount FROM items INNER JOIN orders ON TRUE; diff --git a/docs/reference/sql/substr.md b/docs/reference/sql/substr.md index 8cde121e28f443f5bc442b025bd7ad8bdee6736b..13e70adc0bec94dbbb90fba62ebb1e7972f8db42 100644 --- a/docs/reference/sql/substr.md +++ b/docs/reference/sql/substr.md @@ -29,7 +29,7 @@ ## Примеры {: #examples } ```title="Ð—Ð°Ð¿Ñ€Ð¾Ñ VALUES Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸ÐµÐ¹ SUBSTR и параметром <i>from</i>" -picodata> VALUES ( SUBSTR('picodata', 3) ); +sql> VALUES ( SUBSTR('picodata', 3) ); +----------+ | COLUMN_1 | +==========+ @@ -40,7 +40,7 @@ picodata> VALUES ( SUBSTR('picodata', 3) ); ``` ```title="Ð—Ð°Ð¿Ñ€Ð¾Ñ VALUES Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸ÐµÐ¹ SUBSTR и параметрами <i>from</i> и <i>count</i>" -picodata> VALUES ( SUBSTR('picodata', 3, 4) ); +sql> VALUES ( SUBSTR('picodata', 3, 4) ); +----------+ | COLUMN_1 | +==========+ diff --git a/docs/reference/sql/to_char.md b/docs/reference/sql/to_char.md index 84ce8499b12931307c7ba5cbd59575d962ef4b64..ea3bc438bf6fca520e9a9e4a1fe76b13cd4859ec 100644 --- a/docs/reference/sql/to_char.md +++ b/docs/reference/sql/to_char.md @@ -30,7 +30,7 @@ таблицам](../legend.md). ```sql title="Преобразование объектов DATETIME в Ñтроковые литералы заданного формата" -picodata> SELECT to_char(since, 'In stock since: %d %b %Y') FROM orders; +sql> SELECT to_char(since, 'In stock since: %d %b %Y') FROM orders; +-------------------------------+ | COL_1 | +===============================+ diff --git a/docs/reference/sql/to_date.md b/docs/reference/sql/to_date.md index 74ab96833757b61960ec3b2379003754ff2c44ff..9bd31555157e570ec776fbe199e83a43b7a8b100 100644 --- a/docs/reference/sql/to_date.md +++ b/docs/reference/sql/to_date.md @@ -32,7 +32,7 @@ ## Примеры {: #examples } ```sql title="Преобразование Ñтроковых литералов в объекты DATETIME" -picodata> VALUES +sql> VALUES (to_date('2024-02-13 12:43:24', '%F')), (to_date('29.01.2024 15:41:22', '%d.%m.%Y')), (to_date('2023/11/11 13:01:56', '%Y/%m/%d')), diff --git a/docs/reference/sql/trim.md b/docs/reference/sql/trim.md index c168c8db2558ab045d260917cce32f2e2ad3fc12..15a3ada967584c0f95fffd175a0b2411da0ebe49 100644 --- a/docs/reference/sql/trim.md +++ b/docs/reference/sql/trim.md @@ -34,7 +34,7 @@ ## Примеры {: #examples } ```sql title="Ð—Ð°Ð¿Ñ€Ð¾Ñ SELECT" -picodata> SELECT item FROM warehouse; +sql> SELECT item FROM warehouse; +----------+ | ITEM | +==========+ @@ -51,7 +51,7 @@ picodata> SELECT item FROM warehouse; ``` ```sql title="Ð—Ð°Ð¿Ñ€Ð¾Ñ SELECT Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸ÐµÐ¹ TRIM" -picodata> SELECT TRIM(TRAILING 's' FROM item) FROM warehouse; +sql> SELECT TRIM(TRAILING 's' FROM item) FROM warehouse; +---------+ | COL_1 | +=========+ diff --git a/docs/tutorial/connecting.md b/docs/tutorial/connecting.md index ead5df2d0451c11be6a2583c252d4fdccda4728d..03a0be57d1123fb1580f4ba7fe82fb8710737934 100644 --- a/docs/tutorial/connecting.md +++ b/docs/tutorial/connecting.md @@ -42,7 +42,7 @@ picodata admin ./admin.socket $ picodata admin ./admin.socket Connected to admin console by socket path "./admin.socket" type '\help' for interactive help -picodata> +(admin) sql> ``` КонÑоль админиÑтратора интерпретирует вводимые команды на Ñзыке SQL. diff --git a/docs/tutorial/create_plugin.md b/docs/tutorial/create_plugin.md index cb9a1868bbf8787d2901f539971b15a925ae9159..191951f89607b1d822e4500c2dce3ebf1d8587f0 100644 --- a/docs/tutorial/create_plugin.md +++ b/docs/tutorial/create_plugin.md @@ -212,11 +212,11 @@ picodata run -l 127.0.0.1:3301 --advertise 127.0.0.1:3301 --peer 127.0.0.1:3301 $ picodata admin i1/admin.socket Connected to admin console by socket path "i1/admin.socket" type '\help' for interactive help -picodata> CREATE PLUGIN weather_cache 0.1.0; +(admin) sql> CREATE PLUGIN weather_cache 0.1.0; 1 -picodata> ALTER PLUGIN weather_cache 0.1.0 ADD SERVICE weather_service TO TIER default; +(admin) sql> ALTER PLUGIN weather_cache 0.1.0 ADD SERVICE weather_service TO TIER default; 1 -picodata> ALTER PLUGIN weather_cache 0.1.0 ENABLE; +(admin) sql> ALTER PLUGIN weather_cache 0.1.0 ENABLE; 1 ``` @@ -230,9 +230,9 @@ I started with config: () Попробуем выключить и удалить плагин: ```sql -picodata> ALTER PLUGIN weather_cache 0.1.0 DISABLE; +(admin) sql> ALTER PLUGIN weather_cache 0.1.0 DISABLE; 1 -picodata> DROP PLUGIN weather_cache 0.1.0; +(admin) sql> DROP PLUGIN weather_cache 0.1.0; 1 ``` @@ -305,20 +305,20 @@ cp 0001_weather.sql build/weather_cache/0.1.0 $ picodata admin i1/admin.socket Connected to admin console by socket path "i1/admin.socket" type '\help' for interactive help -picodata> CREATE PLUGIN weather_cache 0.1.0; +(admin) sql> CREATE PLUGIN weather_cache 0.1.0; 1 -picodata> ALTER PLUGIN weather_cache 0.1.0 ADD SERVICE weather_service TO TIER default; +(admin) sql> ALTER PLUGIN weather_cache 0.1.0 ADD SERVICE weather_service TO TIER default; 1 -picodata> ALTER PLUGIN weather_cache MIGRATE TO 0.1.0; +(admin) sql> ALTER PLUGIN weather_cache MIGRATE TO 0.1.0; 1 -picodata> ALTER PLUGIN weather_cache 0.1.0 ENABLE; +(admin) sql> ALTER PLUGIN weather_cache 0.1.0 ENABLE; 1 ``` УбедимÑÑ, что была Ñоздана таблица `weather`: ```sql -picodata> SELECT * FROM weather; +(admin) sql> SELECT * FROM weather; +----+----------+-----------+-------------+ | id | latitude | longitude | temperature | @@ -331,16 +331,16 @@ picodata> SELECT * FROM weather; миграциÑми таблицы: ```sql -picodata> ALTER PLUGIN weather_cache 0.1.0 DISABLE; +(admin) sql> ALTER PLUGIN weather_cache 0.1.0 DISABLE; 1 -picodata> DROP PLUGIN weather_cache 0.1.0 WITH DATA; +(admin) sql> DROP PLUGIN weather_cache 0.1.0 WITH DATA; 1 ``` УбедимÑÑ Ð² уÑпешноÑти `DOWN`-миграции: ```sql -picodata> SELECT * FROM weather; +(admin) sql> SELECT * FROM weather; sbroad: table with name "weather" not found ``` diff --git a/docs/tutorial/node_add.md b/docs/tutorial/node_add.md index 3047b48418c73e05c82266817afa8b15d34fc46b..0bceb54be2649b2d8e8caf474a3c4b29554c6672 100644 --- a/docs/tutorial/node_add.md +++ b/docs/tutorial/node_add.md @@ -146,7 +146,7 @@ run`](../reference/cli.md#run). таблице [`_pico_instance`] в ÑоÑтоÑнии `Online`: ```sql -picodata> SELECT "name","current_state" FROM _pico_instance; +(admin) sql> SELECT "name","current_state" FROM _pico_instance; +-------------+---------------+ | name | current_state | +=============================+ diff --git a/docs/tutorial/node_expel.md b/docs/tutorial/node_expel.md index e0c0fb0cc82172a65b124fc4dec9f2d8795b65b9..6348173033c0b2ab4968bc6710db8d2534fb2911 100644 --- a/docs/tutorial/node_expel.md +++ b/docs/tutorial/node_expel.md @@ -52,7 +52,7 @@ picodata expel <INSTANCE_UUID> Узнать идентификатор можно из ÑиÑтемной таблицы [`_pico_instance`]: ```sql -picodata> SELECT "name","uuid" FROM _pico_instance; +(admin) sql> SELECT "name","uuid" FROM _pico_instance; +------+----------------------------------------+ | name | uuid | +===============================================+ diff --git a/docs/tutorial/plugins.md b/docs/tutorial/plugins.md index 4d7a33d4922080585c44b9144ef1207781bc3382..40aab5e5c2890f157d2f8f3b1f1fddcea42892fe 100644 --- a/docs/tutorial/plugins.md +++ b/docs/tutorial/plugins.md @@ -135,7 +135,7 @@ CREATE PLUGIN weather_cache 0.1.0; Ð’ таблице [`_pico_plugin`] Ñо ÑпиÑком добавленных плагинов: ```sql -picodata> SELECT * FROM _pico_plugin; +(admin) sql> SELECT * FROM _pico_plugin; +-------------+---------+-------------+---------+-------------+------------+ | name | enabled | services | version | description | migration_ | | | | | | | list | @@ -153,7 +153,7 @@ picodata> SELECT * FROM _pico_plugin; Ð’ таблице [`_pico_plugin_config`] Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÐµÐ¹ ÑервиÑов плагина: ```sql -picodata> SELECT * FROM _pico_plugin_config; +(admin) sql> SELECT * FROM _pico_plugin_config; +-----------------+---------+-------------------+------------------+-------+ | plugin | version | entity | key | value | +==========================================================================+ @@ -167,7 +167,7 @@ picodata> SELECT * FROM _pico_plugin_config; привÑзки к [тиру][tier]): ```sql -picodata> SELECT * FROM _pico_service; +(admin) sql> SELECT * FROM _pico_service; +-----------------+-------------------+---------+-------+------------------+ | plugin_name | name | version | tiers | description | +==========================================================================+ @@ -195,7 +195,7 @@ ALTER PLUGIN weather_cache MIGRATE TO 0.1.0; УÑÐ¿ÐµÑˆÐ½Ð°Ñ Ð¼Ð¸Ð³Ñ€Ð°Ñ†Ð¸Ñ Ð¾Ð·Ð½Ð°Ñ‡Ð°ÐµÑ‚, что в БД поÑвилаÑÑŒ Ð½Ð¾Ð²Ð°Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð° `weather`: ```sql -picodata> SELECT * FROM weather; +(admin) sql> SELECT * FROM weather; +----+----------+-----------+-------------+ | id | latitude | longitude | temperature | +=========================================+ @@ -223,7 +223,7 @@ ALTER PLUGIN weather_cache 0.1.0 ADD SERVICE weather_service TO TIER default; поÑвитÑÑ Ð¿Ñ€Ð¸Ð²Ñзка ÑервиÑа к указанному тиру: ```sql -picodata> SELECT * FROM _pico_service; +(admin) sql> SELECT * FROM _pico_service; +----------------+----------------+---------+-------------+----------------+ | plugin_name | name | version | tiers | description | +==========================================================================+ @@ -253,7 +253,7 @@ ALTER PLUGIN weather_cache 0.1.0 ENABLE; [`_pico_plugin`] уÑтановитÑÑ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ `true`: ```sql -picodata> SELECT * FROM _pico_plugin; +(admin) sql> SELECT * FROM _pico_plugin; +-------------+---------+-------------+---------+-------------+------------+ | name | enabled | services | version | description | migration_ | | | | | | | list |