Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
be6bbcef
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,发现更多精彩内容 >>
提交
be6bbcef
编写于
4月 22, 2004
作者:
B
Bruce Momjian
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add global psql config file, psql.rc.sample.
上级
49068419
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
55 addition
and
30 deletion
+55
-30
doc/src/sgml/ref/psql-ref.sgml
doc/src/sgml/ref/psql-ref.sgml
+12
-7
src/bin/psql/Makefile
src/bin/psql/Makefile
+3
-2
src/bin/psql/psql.rc.sample
src/bin/psql/psql.rc.sample
+7
-0
src/bin/psql/startup.c
src/bin/psql/startup.c
+33
-21
未找到文件。
doc/src/sgml/ref/psql-ref.sgml
浏览文件 @
be6bbcef
<!--
$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.11
2 2004/04/21 00:34:18
momjian Exp $
$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.11
3 2004/04/22 01:53:17
momjian Exp $
PostgreSQL documentation
-->
...
...
@@ -440,7 +440,8 @@ PostgreSQL documentation
<term><option>--no-psqlrc</></term>
<listitem>
<para>
Do not read the start-up file <filename>~/.psqlrc</filename>.
Do not read the start-up file <filename>/psql.rc</filename> or
<filename>~/.psqlrc</filename>.
</para>
</listitem>
</varlistentry>
...
...
@@ -1859,8 +1860,9 @@ bar
<para>
The autocommit-on mode is <productname>PostgreSQL</>'s traditional
behavior, but autocommit-off is closer to the SQL spec. If you
prefer autocommit-off, you may wish to set it in
your <filename>.psqlrc</filename> file.
prefer autocommit-off, you may wish to set it in the system-wide
<filename>psql.rc</filename> or your
<filename>.psqlrc</filename> file.
</para>
</note>
</listitem>
...
...
@@ -2488,9 +2490,12 @@ $endif
<listitem>
<para>
Before starting up, <application>psql</application> attempts to
read and execute commands from the file
<filename>$HOME/.psqlrc</filename>. It could be used to set up
the client or the server to taste (using the <command>\set
read and execute commands from the the system-wide
<filename>psql.rc</filename> file and the
<filename>$HOME/.psqlrc</filename> file in the user's home
directory. See <filename><replaceable>PREFIX</>/share/psql.rc.sample</>
for information on setting up the system-wide file. It could be used
to set up the client or the server to taste (using the <command>\set
</command> and <command>SET</command> commands).
</para>
</listitem>
...
...
src/bin/psql/Makefile
浏览文件 @
be6bbcef
...
...
@@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.4
0 2004/03/09 19:47:05 petere
Exp $
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.4
1 2004/04/22 01:53:37 momjian
Exp $
#
#-------------------------------------------------------------------------
...
...
@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global
REFDOCDIR
=
$(top_srcdir)
/doc/src/sgml/ref
override CPPFLAGS
:
= -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
override CPPFLAGS
:
= -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
-DSYSCONFDIR='"$(sysconfdir)"'
OBJS
=
command.o common.o help.o input.o stringutils.o mainloop.o copy.o
\
startup.o prompt.o variables.o large_obj.o print.o describe.o
\
...
...
@@ -50,6 +50,7 @@ distprep: $(srcdir)/sql_help.h $(srcdir)/psqlscan.c
install
:
all installdirs
$(INSTALL_PROGRAM)
psql
$(X)
$(DESTDIR)$(bindir)
/psql
$(X)
$(INSTALL_DATA)
$(srcdir)
/psql.rc.sample
$(DESTDIR)$(datadir)
/psql.rc.sample
installdirs
:
$(mkinstalldirs)
$(DESTDIR)$(bindir)
...
...
src/bin/psql/psql.rc.sample
0 → 100644
浏览文件 @
be6bbcef
--
-- psql configuration file
--
-- This file is read before the .psqlrc file in the user's home directory.
--
-- Copy this to your sysconf directory (typically /usr/local/pgsql/etc) and
-- rename it psql.rc.
src/bin/psql/startup.c
浏览文件 @
be6bbcef
...
...
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.8
8 2004/04/19 17:42:58
momjian Exp $
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.8
9 2004/04/22 01:53:37
momjian Exp $
*/
#include "postgres_fe.h"
...
...
@@ -44,7 +44,8 @@ int optreset;
*/
PsqlSettings
pset
;
#define PSQLRC ".psqlrc"
#define PSQLRC ".psqlrc"
#define SYSPSQLRC "psql.rc"
/*
* Structures to pass information between the option parsing routine
...
...
@@ -74,6 +75,7 @@ struct adhoc_opts
static
void
parse_psql_options
(
int
argc
,
char
*
argv
[],
struct
adhoc_opts
*
options
);
static
void
process_psqlrc
(
void
);
static
void
process_psqlrc_file
(
char
*
filename
);
static
void
showVersion
(
void
);
#ifdef USE_SSL
...
...
@@ -562,6 +564,9 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
}
#ifndef SYSCONFDIR
#error "You must compile this file with SYSCONFDIR defined."
#endif
/*
...
...
@@ -570,32 +575,39 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
static
void
process_psqlrc
(
void
)
{
char
*
psqlrc
;
char
*
globalFile
=
SYSCONFDIR
"/"
SYSPSQLRC
;
char
*
home
;
char
*
psqlrc
;
process_psqlrc_file
(
globalFile
);
if
((
home
=
getenv
(
"HOME"
))
!=
NULL
)
{
psqlrc
=
pg_malloc
(
strlen
(
home
)
+
1
+
strlen
(
PSQLRC
)
+
1
);
sprintf
(
psqlrc
,
"%s/%s"
,
home
,
PSQLRC
);
process_psqlrc_file
(
psqlrc
);
}
}
static
void
process_psqlrc_file
(
char
*
filename
)
{
char
*
psqlrc
;
#if defined(WIN32) && (!defined(__MINGW32__))
#define R_OK 4
#endif
/* Look for one in the home dir */
home
=
getenv
(
"HOME"
);
if
(
home
)
{
psqlrc
=
pg_malloc
(
strlen
(
home
)
+
1
+
strlen
(
PSQLRC
)
+
1
+
strlen
(
PG_VERSION
)
+
1
);
sprintf
(
psqlrc
,
"%s/%s-%s"
,
home
,
PSQLRC
,
PG_VERSION
);
psqlrc
=
pg_malloc
(
strlen
(
filename
)
+
1
+
strlen
(
PG_VERSION
)
+
1
);
sprintf
(
psqlrc
,
"%s-%s"
,
filename
,
PG_VERSION
);
if
(
access
(
psqlrc
,
R_OK
)
==
0
)
process_file
(
psqlrc
);
else
{
sprintf
(
psqlrc
,
"%s/%s"
,
home
,
PSQLRC
);
if
(
access
(
psqlrc
,
R_OK
)
==
0
)
process_file
(
psqlrc
);
}
free
(
psqlrc
);
}
if
(
access
(
psqlrc
,
R_OK
)
==
0
)
process_file
(
psqlrc
);
else
if
(
access
(
filename
,
R_OK
)
==
0
)
process_file
(
filename
);
free
(
psqlrc
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录