Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaafe276

Browse files
committed
Improve coverage of psql for backslash commands with \if and \elif
This adds tests to cover more code paths to ignore backslash commands infalse branches when using \if|\elif|\else, and improves the coverage of\elif.Author: Fabien CoelhoDiscussion:https://postgr.es/m/alpine.DEB.2.21.1908281618520.28828@lancre
1 parent9a86f03 commitaafe276

File tree

2 files changed

+111
-14
lines changed

2 files changed

+111
-14
lines changed

‎src/test/regress/expected/psql.out

Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4275,6 +4275,17 @@ all true
42754275
\echo 'all false'
42764276
all false
42774277
\endif
4278+
-- test true-false elif after initial true branch
4279+
\if true
4280+
\echo 'should print #2-5'
4281+
should print #2-5
4282+
\elif true
4283+
\echo 'should not print #2-6'
4284+
\elif false
4285+
\echo 'should not print #2-7'
4286+
\else
4287+
\echo 'should not print #2-8'
4288+
\endif
42784289
-- test simple true-then-else
42794290
\if true
42804291
\echo 'first thing true'
@@ -4348,22 +4359,60 @@ bar 'bar' "bar"
43484359
:try_to_quit
43494360
\echo `nosuchcommand` :foo :'foo' :"foo"
43504361
\pset fieldsep | `nosuchcommand` :foo :'foo' :"foo"
4351-
\a \C arg1 \c arg1 arg2 arg3 arg4 \cd arg1 \conninfo
4362+
\a
4363+
\C arg1
4364+
\c arg1 arg2 arg3 arg4
4365+
\cd arg1
4366+
\conninfo
43524367
\copy arg1 arg2 arg3 arg4 arg5 arg6
4353-
\copyright \dt arg1 \e arg1 arg2
4368+
\copyright
4369+
SELECT 1 as one, 2, 3 \crosstabview
4370+
\dt arg1
4371+
\e arg1 arg2
43544372
\ef whole_line
43554373
\ev whole_line
4356-
\echo arg1 arg2 arg3 arg4 arg5 \echo arg1 \encoding arg1 \errverbose
4357-
\g arg1 \gx arg1 \gexec \h \html \i arg1 \ir arg1 \l arg1 \lo arg1 arg2
4358-
\o arg1 \p \password arg1 \prompt arg1 arg2 \pset arg1 arg2 \q
4359-
\reset \s arg1 \set arg1 arg2 arg3 arg4 arg5 arg6 arg7 \setenv arg1 arg2
4374+
\echo arg1 arg2 arg3 arg4 arg5
4375+
\echo arg1
4376+
\encoding arg1
4377+
\errverbose
4378+
\f arg1
4379+
\g arg1
4380+
\gx arg1
4381+
\gexec
4382+
SELECT 1 AS one \gset
4383+
\h
4384+
\?
4385+
\html
4386+
\i arg1
4387+
\ir arg1
4388+
\l arg1
4389+
\lo arg1 arg2
4390+
invalid command \lo
4391+
\lo_list
4392+
\o arg1
4393+
\p
4394+
\password arg1
4395+
\prompt arg1 arg2
4396+
\pset arg1 arg2
4397+
\q
4398+
\reset
4399+
\s arg1
4400+
\set arg1 arg2 arg3 arg4 arg5 arg6 arg7
4401+
\setenv arg1 arg2
43604402
\sf whole_line
43614403
\sv whole_line
4362-
\t arg1 \T arg1 \timing arg1 \unset arg1 \w arg1 \watch arg1 \x arg1
4404+
\t arg1
4405+
\T arg1
4406+
\timing arg1
4407+
\unset arg1
4408+
\w arg1
4409+
\watch arg1
4410+
\x arg1
43634411
-- \else here is eaten as part of OT_FILEPIPE argument
43644412
\w |/no/such/file \else
43654413
-- \endif here is eaten as part of whole-line argument
43664414
\! whole_line \endif
4415+
\z
43674416
\else
43684417
\echo 'should print #8-1'
43694418
should print #8-1

‎src/test/regress/sql/psql.sql

Lines changed: 55 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -843,6 +843,17 @@ select \if false \\ (bogus \else \\ 42 \endif \\ forty_two;
843843
\echo'all false'
844844
\endif
845845

846+
-- test true-false elif after initial true branch
847+
\if true
848+
\echo'should print #2-5'
849+
\elif true
850+
\echo'should not print #2-6'
851+
\elif false
852+
\echo'should not print #2-7'
853+
\else
854+
\echo'should not print #2-8'
855+
\endif
856+
846857
-- test simple true-then-else
847858
\if true
848859
\echo'first thing true'
@@ -911,22 +922,59 @@ select \if false \\ (bogus \else \\ 42 \endif \\ forty_two;
911922
:try_to_quit
912923
\echo`nosuchcommand` :foo :'foo' :"foo"
913924
\pset fieldsep |`nosuchcommand` :foo :'foo' :"foo"
914-
\a \C arg1 \c arg1 arg2 arg3 arg4 \cd arg1 \conninfo
925+
\a
926+
\C arg1
927+
\c arg1 arg2 arg3 arg4
928+
\cd arg1
929+
\conninfo
915930
\copy arg1 arg2 arg3 arg4 arg5 arg6
916-
\copyright \dt arg1 \e arg1 arg2
931+
\copyright
932+
SELECT1as one,2,3 \crosstabview
933+
\dt arg1
934+
\e arg1 arg2
917935
\ef whole_line
918936
\ev whole_line
919-
\echo arg1 arg2 arg3 arg4 arg5 \echo arg1 \encoding arg1 \errverbose
920-
\g arg1 \gx arg1 \gexec \h \html \i arg1 \ir arg1 \l arg1 \lo arg1 arg2
921-
\o arg1 \p \password arg1 \prompt arg1 arg2 \pset arg1 arg2 \q
922-
\reset \s arg1 \set arg1 arg2 arg3 arg4 arg5 arg6 arg7 \setenv arg1 arg2
937+
\echo arg1 arg2 arg3 arg4 arg5
938+
\echo arg1
939+
\encoding arg1
940+
\errverbose
941+
\f arg1
942+
\g arg1
943+
\gx arg1
944+
\gexec
945+
SELECT1AS one \gset
946+
\h
947+
\?
948+
\html
949+
\i arg1
950+
\ir arg1
951+
\l arg1
952+
\lo arg1 arg2
953+
\lo_list
954+
\o arg1
955+
\p
956+
\password arg1
957+
\prompt arg1 arg2
958+
\pset arg1 arg2
959+
\q
960+
\reset
961+
\s arg1
962+
\set arg1 arg2 arg3 arg4 arg5 arg6 arg7
963+
\setenv arg1 arg2
923964
\sf whole_line
924965
\sv whole_line
925-
\t arg1 \T arg1 \timing arg1 \unset arg1 \w arg1 \watch arg1 \x arg1
966+
\t arg1
967+
\T arg1
968+
\timing arg1
969+
\unset arg1
970+
\w arg1
971+
\watch arg1
972+
\x arg1
926973
-- \else here is eaten as part of OT_FILEPIPE argument
927974
\w |/no/such/file \else
928975
-- \endif here is eaten as part of whole-line argument
929976
\! whole_line \endif
977+
\z
930978
\else
931979
\echo'should print #8-1'
932980
\endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp