From 8fff124aa703b14c76a3be1b9c494b1be1a67a81 Mon Sep 17 00:00:00 2001
From: Kurdakov Alexander <kusancho12@gmail.com>
Date: Fri, 8 Dec 2023 17:10:07 +0300
Subject: [PATCH] feat: sql language by default on clients
---
src/cli/connect.lua | 3 +++
test/int/test_cli_connect.py | 6 ++++++
2 files changed, 9 insertions(+)
diff --git a/src/cli/connect.lua b/src/cli/connect.lua
index 1384592692..da67211d3f 100644
--- a/src/cli/connect.lua
+++ b/src/cli/connect.lua
@@ -15,6 +15,9 @@ console.on_start(function(self)
self:print(string.format("uri: %s", urilib.format(urilib.parse(raw_uri), false)))
os.exit(1)
end
+
+ self:eval("\\set language sql")
+
-- We should only set this after we try to connect, because
-- `console.connect` will call this before throwing eval errors
console.on_client_disconnect(function(_)
diff --git a/test/int/test_cli_connect.py b/test/int/test_cli_connect.py
index 88f5a7c058..93eed2dfa5 100644
--- a/test/int/test_cli_connect.py
+++ b/test/int/test_cli_connect.py
@@ -32,6 +32,7 @@ def test_connect_testuser(i1: Instance):
cli.expect_exact(f"connected to {i1.host}:{i1.port}")
cli.expect_exact(f"{i1.host}:{i1.port}>")
+ cli.sendline("\\set language lua")
cli.sendline("box.session.user()")
cli.expect_exact("---\r\n")
cli.expect_exact("- testuser\r\n")
@@ -58,6 +59,7 @@ def test_connect_user_host_port(i1: Instance):
cli.expect_exact(f"connected to {i1.host}:{i1.port}")
cli.expect_exact(f"{i1.host}:{i1.port}>")
+ cli.sendline("\\set language lua")
cli.sendline("box.session.user()")
cli.expect_exact("---\r\n")
cli.expect_exact("- testuser\r\n")
@@ -81,6 +83,7 @@ def test_connect_guest(i1: Instance):
cli.expect_exact(f"connected to {i1.host}:{i1.port}")
cli.expect_exact(f"{i1.host}:{i1.port}>")
+ cli.sendline("\\set language lua")
cli.sendline("box.session.user()")
cli.expect_exact("---\r\n")
cli.expect_exact("- guest\r\n")
@@ -159,6 +162,7 @@ def test_connect_auth_type_ok(i1: Instance):
cli.expect_exact(f"connected to {i1.host}:{i1.port}")
cli.expect_exact(f"{i1.host}:{i1.port}>")
+ cli.sendline("\\set language lua")
cli.sendline("box.session.user()")
cli.expect_exact("---\r\n")
cli.expect_exact("- testuser\r\n")
@@ -286,6 +290,7 @@ def test_connect_unix_ok(cluster: Cluster):
cli.expect_exact("connected to unix/:./console.sock")
cli.expect_exact("unix/:./console.sock>")
+ cli.sendline("\\set language lua")
cli.sendline("box.session.user()")
cli.expect_exact("---\r\n")
cli.expect_exact("- admin\r\n")
@@ -362,6 +367,7 @@ def test_connect_with_password_from_file(i1: Instance, binary_path: str):
cli.expect_exact(f"connected to {i1.host}:{i1.port}")
cli.expect_exact(f"{i1.host}:{i1.port}>")
+ cli.sendline("\\set language lua")
cli.sendline("box.session.user()")
cli.expect_exact("---\r\n")
cli.expect_exact("- testuser\r\n")
--
GitLab