Skip to content

Commit c0de204

Browse files
authored
feat: add DEFAULT_SQL_DIALECT for start-cli (apache#14519)
1 parent e704935 commit c0de204

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

iotdb-client/cli/src/assembly/resources/sbin/start-cli.bat

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919

2020
@echo off
2121

22+
@REM DEFAULT_SQL_DIALECT is used to set the default SQL dialect for the CLI.
23+
@REM empty value means using "tree".
24+
@REM Optional values: "table" or "tree"
25+
set DEFAULT_SQL_DIALECT=tree
26+
2227
@REM You can put your env variable here
2328
@REM set JAVA_HOME=%JAVA_HOME%
2429

@@ -73,13 +78,18 @@ set PARAMETERS=%*
7378

7479
@REM if "%PARAMETERS%" == "" set PARAMETERS=-h 127.0.0.1 -p 6667 -u root -pw root
7580

81+
@REF if DEFAULT_SQL_DIALECT is empty, set it to "tree"
82+
if "%DEFAULT_SQL_DIALECT%" == "" set DEFAULT_SQL_DIALECT=tree
83+
7684
@REM set default parameters
7785
set pw_parameter=-pw root
7886
set u_parameter=-u root
7987
set p_parameter=-p 6667
8088
set h_parameter=-h 127.0.0.1
89+
set sql_dialect__parameter=-sql_dialect %DEFAULT_SQL_DIALECT%
8190

8291
@REM Added parameters when default parameters are missing
92+
echo %PARAMETERS% | findstr /c:"-sql_dialect ">nul && (set PARAMETERS=%PARAMETERS%) || (set PARAMETERS=%sql_dialect__parameter% %PARAMETERS%)
8393
echo %PARAMETERS% | findstr /c:"-pw ">nul && (set PARAMETERS=%PARAMETERS%) || (set PARAMETERS=%pw_parameter% %PARAMETERS%)
8494
echo %PARAMETERS% | findstr /c:"-u ">nul && (set PARAMETERS=%PARAMETERS%) || (set PARAMETERS=%u_parameter% %PARAMETERS%)
8595
echo %PARAMETERS% | findstr /c:"-p ">nul && (set PARAMETERS=%PARAMETERS%) || (set PARAMETERS=%p_parameter% %PARAMETERS%)

iotdb-client/cli/src/assembly/resources/sbin/start-cli.sh

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
# under the License.
1919
#
2020

21+
# DEFAULT_SQL_DIALECT is used to set the default SQL dialect for the CLI.
22+
# empty value means using "tree".
23+
# Optional values: "table" or "tree"
24+
DEFAULT_SQL_DIALECT=
25+
2126
# You can put your env variable here
2227
# export JAVA_HOME=$JAVA_HOME
2328

@@ -49,11 +54,17 @@ PARAMETERS=""
4954
# PARAMETERS="-h 127.0.0.1 -p 6667 -u root -pw root"
5055
# fi
5156

57+
# if DEFAULT_SQL_DIALECT is empty, set it to "tree"
58+
if [ -z "$DEFAULT_SQL_DIALECT" ]; then
59+
DEFAULT_SQL_DIALECT="tree"
60+
fi
61+
5262
# Added parameters when default parameters are missing
5363
user_param="-u root"
5464
passwd_param="-pw root"
5565
host_param="-h 127.0.0.1"
5666
port_param="-p 6667"
67+
sql_dialect_param="-sql_dialect $DEFAULT_SQL_DIALECT"
5768

5869
while true; do
5970
case "$1" in
@@ -77,6 +88,10 @@ while true; do
7788
checkEnvVariables $2
7889
shift 2
7990
;;
91+
-sql_dialect)
92+
sql_dialect_param="-sql_dialect $2"
93+
shift 2
94+
;;
8095
--help)
8196
echo "Usage: $0 [-h <ip>] [-p <port>] [-u <username>] [-pw <password>] [-D <name=value>] [-c] [-e sql]"
8297
exit 0
@@ -93,7 +108,7 @@ while true; do
93108
esac
94109
done
95110

96-
PARAMETERS="$host_param $port_param $user_param $passwd_param $PARAMETERS"
111+
PARAMETERS="$host_param $port_param $user_param $passwd_param $sql_dialect_param $PARAMETERS"
97112

98113
if [ -z "${IOTDB_INCLUDE}" ]; then
99114
#do nothing

0 commit comments

Comments
 (0)