Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
9672d38f
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9672d38f
编写于
2月 13, 2000
作者:
P
Peter Eisentraut
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Adjusted psql echoing options (-a and -e)
上级
a2226ad2
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
57 addition
and
37 deletion
+57
-37
doc/src/sgml/ref/psql-ref.sgml
doc/src/sgml/ref/psql-ref.sgml
+23
-10
src/bin/psql/common.c
src/bin/psql/common.c
+2
-2
src/bin/psql/help.c
src/bin/psql/help.c
+2
-2
src/bin/psql/mainloop.c
src/bin/psql/mainloop.c
+2
-2
src/bin/psql/startup.c
src/bin/psql/startup.c
+13
-11
src/bin/psql/variables.c
src/bin/psql/variables.c
+9
-1
src/bin/psql/variables.h
src/bin/psql/variables.h
+2
-5
src/test/regress/regress.sh
src/test/regress/regress.sh
+2
-2
src/test/regress/run_check.sh
src/test/regress/run_check.sh
+2
-2
未找到文件。
doc/src/sgml/ref/psql-ref.sgml
浏览文件 @
9672d38f
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.2
4 2000/02/10 20:08:55
petere Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.2
5 2000/02/13 21:45:13
petere Exp $
Postgres documentation
-->
...
...
@@ -609,7 +609,7 @@ Tue Oct 26 21:40:57 CEST 1999
<note>
<para>
If you want to see the lines on the screen as they are read you must set
the variable <envar>ECHO</envar> to <literal>
fu
ll</literal>.
the variable <envar>ECHO</envar> to <literal>
a
ll</literal>.
</para>
</note>
</listitem>
...
...
@@ -1189,6 +1189,18 @@ Access permissions for database "test"
<para>
<variablelist>
<varlistentry>
<term>-a, --echo-all</term>
<listitem>
<para>
Print all the lines to the screen as they are read. This is more useful for
script processing rather than interactive mode.
This is equivalent to setting the variable <envar>ECHO</envar> to <literal>all</literal>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-A, --no-align</term>
<listitem>
...
...
@@ -1234,11 +1246,12 @@ Access permissions for database "test"
<varlistentry>
<term>-e, --echo</term>
<term>-e, --echo
-queries
</term>
<listitem>
<para>
In non-interactive mode, all lines are printed to the screen as they are read.
This is equivalent to setting the variable <envar>ECHO</envar> to <literal>full</literal>.
Show all queries that are sent to the backend.
This is equivalent to setting the variable <envar>ECHO</envar>
to <literal>queries</literal>.
</para>
</listitem>
</varlistentry>
...
...
@@ -1621,12 +1634,12 @@ bar
<term><envar>ECHO</envar></term>
<listitem>
<para>
If set to <quote><literal>
fu
ll</literal></quote>, all lines entered or from a script
If set to <quote><literal>
a
ll</literal></quote>, all lines entered or from a script
are written to the standard output before they
are parsed or executed. To specify this on program startup,
in conjunction with the
<option>-f</option> option perhaps, use the switch <option>-e</option>.
If set to <quote><literal>brief</literal></quote>, <application>psql</application>
merely prints all queries as they are sent to the backend
.
are parsed or executed. To specify this on program startup,
use the switch
<option>-a</option>. If set to <quote><literal>queries</literal></quote>,
<application>psql</application> merely prints all queries as they are sent to the
backend. The option for this is <option>-e</option>
.
</para>
</listitem>
</varlistentry>
...
...
src/bin/psql/common.c
浏览文件 @
9672d38f
...
...
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.1
2 2000/02/07 23:10:06
petere Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.1
3 2000/02/13 21:45:14
petere Exp $
*/
#include <c.h>
#include "common.h"
...
...
@@ -382,7 +382,7 @@ SendQuery(const char *query)
else
{
const
char
*
var
=
GetVariable
(
pset
.
vars
,
"ECHO"
);
if
(
var
&&
str
cmp
(
var
,
"brief"
)
==
0
)
if
(
var
&&
str
ncmp
(
var
,
"queries"
,
strlen
(
var
)
)
==
0
)
puts
(
query
);
}
...
...
src/bin/psql/help.c
浏览文件 @
9672d38f
...
...
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.1
7 2000/02/10 20:08:56
petere Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.1
8 2000/02/13 21:45:14
petere Exp $
*/
#include <c.h>
#include "help.h"
...
...
@@ -72,7 +72,7 @@ usage(void)
puts
(
"Usage:"
);
puts
(
" psql [options] [dbname [username]]
\n
"
);
puts
(
"Options:"
);
/* puts( " -a Echo all input from script");*/
puts
(
" -a Echo all input from script"
);
puts
(
" -A Unaligned table output mode (-P format=unaligned)"
);
puts
(
" -c <query> Run only single query (or slash command) and exit"
);
...
...
src/bin/psql/mainloop.c
浏览文件 @
9672d38f
...
...
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.1
8 2000/02/10 20:08:56
petere Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.1
9 2000/02/13 21:45:14
petere Exp $
*/
#include <c.h>
#include "mainloop.h"
...
...
@@ -217,7 +217,7 @@ MainLoop(FILE *source)
/* echo back if flag is set */
var
=
GetVariable
(
pset
.
vars
,
"ECHO"
);
if
(
var
&&
strcmp
(
var
,
"
fu
ll"
)
==
0
)
if
(
var
&&
strcmp
(
var
,
"
a
ll"
)
==
0
)
puts
(
line
);
fflush
(
stdout
);
...
...
src/bin/psql/startup.c
浏览文件 @
9672d38f
...
...
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.2
2 2000/02/07 23:10:06
petere Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.2
3 2000/02/13 21:45:14
petere Exp $
*/
#include <c.h>
...
...
@@ -280,17 +280,17 @@ parse_options(int argc, char *argv[], struct adhoc_opts * options)
#ifdef HAVE_GETOPT_LONG
static
struct
option
long_options
[]
=
{
{
"echo-all"
,
no_argument
,
NULL
,
'a'
},
{
"no-align"
,
no_argument
,
NULL
,
'A'
},
{
"command"
,
required_argument
,
NULL
,
'c'
},
{
"dbname"
,
required_argument
,
NULL
,
'd'
},
{
"echo"
,
no_argument
,
NULL
,
'e'
},
{
"echo
-queries
"
,
no_argument
,
NULL
,
'e'
},
{
"echo-hidden"
,
no_argument
,
NULL
,
'E'
},
{
"file"
,
required_argument
,
NULL
,
'f'
},
{
"field-separator"
,
required_argument
,
NULL
,
'F'
},
{
"host"
,
required_argument
,
NULL
,
'h'
},
{
"html"
,
no_argument
,
NULL
,
'H'
},
{
"list"
,
no_argument
,
NULL
,
'l'
},
{
"no-readline"
,
no_argument
,
NULL
,
'n'
},
{
"output"
,
required_argument
,
NULL
,
'o'
},
{
"port"
,
required_argument
,
NULL
,
'p'
},
{
"pset"
,
required_argument
,
NULL
,
'P'
},
...
...
@@ -320,18 +320,20 @@ parse_options(int argc, char *argv[], struct adhoc_opts * options)
memset
(
options
,
0
,
sizeof
*
options
);
#ifdef HAVE_GETOPT_LONG
while
((
c
=
getopt_long
(
argc
,
argv
,
"Ac:d:eEf:F:lh:Hno:p:P:qRsStT:uU:v:VWx?"
,
long_options
,
&
optindex
))
!=
-
1
)
while
((
c
=
getopt_long
(
argc
,
argv
,
"
a
Ac:d:eEf:F:lh:Hno:p:P:qRsStT:uU:v:VWx?"
,
long_options
,
&
optindex
))
!=
-
1
)
#else
/* not HAVE_GETOPT_LONG */
/*
* Be sure to leave the '-' in here, so we can catch accidental long
* options.
*/
while
((
c
=
getopt
(
argc
,
argv
,
"Ac:d:eEf:F:lh:Hno:p:P:qRsStT:uU:v:VWx?-"
))
!=
-
1
)
while
((
c
=
getopt
(
argc
,
argv
,
"
a
Ac:d:eEf:F:lh:Hno:p:P:qRsStT:uU:v:VWx?-"
))
!=
-
1
)
#endif
/* not HAVE_GETOPT_LONG */
{
switch
(
c
)
{
case
'a'
:
SetVariable
(
pset
.
vars
,
"ECHO"
,
"all"
);
break
;
case
'A'
:
pset
.
popt
.
topt
.
format
=
PRINT_UNALIGNED
;
break
;
...
...
@@ -346,10 +348,10 @@ parse_options(int argc, char *argv[], struct adhoc_opts * options)
options
->
dbname
=
optarg
;
break
;
case
'e'
:
SetVariable
(
pset
.
vars
,
"ECHO"
,
"
full
"
);
SetVariable
(
pset
.
vars
,
"ECHO"
,
"
queries
"
);
break
;
case
'E'
:
SetVariable
(
pset
.
vars
,
"ECHO_HIDDEN"
,
"
"
);
SetVariable
Bool
(
pset
.
vars
,
"ECHO_HIDDEN
"
);
break
;
case
'f'
:
options
->
action
=
ACT_FILE
;
...
...
@@ -402,16 +404,16 @@ parse_options(int argc, char *argv[], struct adhoc_opts * options)
break
;
}
case
'q'
:
SetVariable
(
pset
.
vars
,
"QUIET"
,
"
"
);
SetVariable
Bool
(
pset
.
vars
,
"QUIET
"
);
break
;
case
'R'
:
pset
.
popt
.
topt
.
recordSep
=
xstrdup
(
optarg
);
break
;
case
's'
:
SetVariable
(
pset
.
vars
,
"SINGLESTEP"
,
"
"
);
SetVariable
Bool
(
pset
.
vars
,
"SINGLESTEP
"
);
break
;
case
'S'
:
SetVariable
(
pset
.
vars
,
"SINGLELINE"
,
"
"
);
SetVariable
Bool
(
pset
.
vars
,
"SINGLELINE
"
);
break
;
case
't'
:
pset
.
popt
.
topt
.
tuples_only
=
true
;
...
...
src/bin/psql/variables.c
浏览文件 @
9672d38f
...
...
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/variables.c,v 1.
5 2000/01/29 16:58:49
petere Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/variables.c,v 1.
6 2000/02/13 21:45:14
petere Exp $
*/
#include <c.h>
#include "variables.h"
...
...
@@ -111,6 +111,14 @@ SetVariable(VariableSpace space, const char *name, const char *value)
bool
SetVariableBool
(
VariableSpace
space
,
const
char
*
name
)
{
return
SetVariable
(
space
,
name
,
""
);
}
bool
DeleteVariable
(
VariableSpace
space
,
const
char
*
name
)
{
...
...
src/bin/psql/variables.h
浏览文件 @
9672d38f
...
...
@@ -3,17 +3,13 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/variables.h,v 1.
5 2000/01/29 16:58:49
petere Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/variables.h,v 1.
6 2000/02/13 21:45:14
petere Exp $
*/
/*
* This implements a sort of variable repository. One could also think of it
* as cheap version of an associative array. In each one of these
* datastructures you can store name/value pairs.
*
* All functions (should) follow the Shit-In-Shit-Out (SISO) principle, i.e.,
* you can pass them NULL pointers and the like and they will return something
* appropriate.
*/
#ifndef VARIABLES_H
...
...
@@ -37,6 +33,7 @@ VariableSpace CreateVariableSpace(void);
const
char
*
GetVariable
(
VariableSpace
space
,
const
char
*
name
);
bool
GetVariableBool
(
VariableSpace
space
,
const
char
*
name
);
bool
SetVariable
(
VariableSpace
space
,
const
char
*
name
,
const
char
*
value
);
bool
SetVariableBool
(
VariableSpace
space
,
const
char
*
name
);
bool
DeleteVariable
(
VariableSpace
space
,
const
char
*
name
);
void
DestroyVariableSpace
(
VariableSpace
space
);
...
...
src/test/regress/regress.sh
浏览文件 @
9672d38f
#!/bin/sh
# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.
39 2000/01/09 20:54:36 tgl
Exp $
# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.
40 2000/02/13 21:45:15 petere
Exp $
#
if
[
$#
-eq
0
]
then
...
...
@@ -30,7 +30,7 @@ fi
PGTZ
=
"PST8PDT"
;
export
PGTZ
PGDATESTYLE
=
"Postgres,US"
;
export
PGDATESTYLE
FRONTEND
=
"psql
$HOSTLOC
-
n -e
-q"
FRONTEND
=
"psql
$HOSTLOC
-
a
-q"
# ----------
# Scan resultmap file to find which platform-specific expected files to use.
...
...
src/test/regress/run_check.sh
浏览文件 @
9672d38f
#!/bin/sh
#
# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.
7 2000/01/16 20:05:00
petere Exp $
# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.
8 2000/02/13 21:45:15
petere Exp $
# ----------
# Check call syntax
...
...
@@ -86,7 +86,7 @@ PGDATESTYLE="Postgres,US"; export PGDATESTYLE
# ----------
# The SQL shell to use during this test
# ----------
FRONTEND
=
"
$BINDIR
/psql
$HOSTLOC
-
n -e
-q"
FRONTEND
=
"
$BINDIR
/psql
$HOSTLOC
-
a
-q"
# ----------
# Scan resultmap file to find which platform-specific expected files to use.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录