Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
c8e0c321
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,发现更多精彩内容 >>
提交
c8e0c321
编写于
5月 19, 2011
作者:
P
Peter Eisentraut
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename pg_dump --no-security-label to --no-security-labels
Other similar options also use the plural form.
上级
fcd45759
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
23 addition
and
23 deletion
+23
-23
doc/src/sgml/ref/pg_dump.sgml
doc/src/sgml/ref/pg_dump.sgml
+1
-1
doc/src/sgml/ref/pg_dumpall.sgml
doc/src/sgml/ref/pg_dumpall.sgml
+1
-1
doc/src/sgml/ref/pg_restore.sgml
doc/src/sgml/ref/pg_restore.sgml
+1
-1
src/bin/pg_dump/pg_backup.h
src/bin/pg_dump/pg_backup.h
+1
-1
src/bin/pg_dump/pg_backup_archiver.c
src/bin/pg_dump/pg_backup_archiver.c
+1
-1
src/bin/pg_dump/pg_dump.c
src/bin/pg_dump/pg_dump.c
+9
-9
src/bin/pg_dump/pg_dumpall.c
src/bin/pg_dump/pg_dumpall.c
+5
-5
src/bin/pg_dump/pg_restore.c
src/bin/pg_dump/pg_restore.c
+4
-4
未找到文件。
doc/src/sgml/ref/pg_dump.sgml
浏览文件 @
c8e0c321
...
...
@@ -702,7 +702,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term><option>--no-security-label</option></term>
<term><option>--no-security-label
s
</option></term>
<listitem>
<para>
Do not dump security labels.
...
...
doc/src/sgml/ref/pg_dumpall.sgml
浏览文件 @
c8e0c321
...
...
@@ -193,7 +193,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term><option>--no-security-label</option></term>
<term><option>--no-security-label
s
</option></term>
<listitem>
<para>
Do not dump security labels.
...
...
doc/src/sgml/ref/pg_restore.sgml
浏览文件 @
c8e0c321
...
...
@@ -340,7 +340,7 @@
</varlistentry>
<varlistentry>
<term><option>--no-security-label</option></term>
<term><option>--no-security-label
s
</option></term>
<listitem>
<para>
Do not output commands to restore security labels,
...
...
src/bin/pg_dump/pg_backup.h
浏览文件 @
c8e0c321
...
...
@@ -104,7 +104,7 @@ typedef struct _restoreOptions
* restore */
int
use_setsessauth
;
/* Use SET SESSION AUTHORIZATION commands
* instead of OWNER TO */
int
skip_seclabel
;
/* Skip security label entries */
int
no_security_labels
;
/* Skip security label entries */
char
*
superuser
;
/* Username to use as superuser */
char
*
use_role
;
/* Issue SET ROLE to this */
int
dataOnly
;
...
...
src/bin/pg_dump/pg_backup_archiver.c
浏览文件 @
c8e0c321
...
...
@@ -2352,7 +2352,7 @@ _tocEntryRequired(TocEntry *te, RestoreOptions *ropt, bool include_acls)
return
0
;
/* If it's security labels, maybe ignore it */
if
(
ropt
->
skip_seclabel
&&
strcmp
(
te
->
desc
,
"SECURITY LABEL"
)
==
0
)
if
(
ropt
->
no_security_labels
&&
strcmp
(
te
->
desc
,
"SECURITY LABEL"
)
==
0
)
return
0
;
/* Ignore DATABASE entry unless we should create it */
...
...
src/bin/pg_dump/pg_dump.c
浏览文件 @
c8e0c321
...
...
@@ -135,7 +135,7 @@ static int binary_upgrade = 0;
static
int
disable_dollar_quoting
=
0
;
static
int
dump_inserts
=
0
;
static
int
column_inserts
=
0
;
static
int
no_security_label
=
0
;
static
int
no_security_label
s
=
0
;
static
int
no_unlogged_table_data
=
0
;
static
int
serializable_deferrable
=
0
;
...
...
@@ -329,7 +329,7 @@ main(int argc, char **argv)
{
"role"
,
required_argument
,
NULL
,
3
},
{
"serializable-deferrable"
,
no_argument
,
&
serializable_deferrable
,
1
},
{
"use-set-session-authorization"
,
no_argument
,
&
use_setsessauth
,
1
},
{
"no-security-label
"
,
no_argument
,
&
no_security_label
,
1
},
{
"no-security-label
s"
,
no_argument
,
&
no_security_labels
,
1
},
{
"no-unlogged-table-data"
,
no_argument
,
&
no_unlogged_table_data
,
1
},
{
NULL
,
0
,
NULL
,
0
}
...
...
@@ -651,8 +651,8 @@ main(int argc, char **argv)
/*
* Disables security label support if server version < v9.1.x
*/
if
(
!
no_security_label
&&
g_fout
->
remoteVersion
<
90100
)
no_security_label
=
1
;
if
(
!
no_security_label
s
&&
g_fout
->
remoteVersion
<
90100
)
no_security_label
s
=
1
;
/*
* Start transaction-snapshot mode transaction to dump consistent data.
...
...
@@ -862,7 +862,7 @@ help(const char *progname)
printf
(
_
(
" --quote-all-identifiers quote all identifiers, even if not keywords
\n
"
));
printf
(
_
(
" --serializable-deferrable wait until the dump can run without anomalies
\n
"
));
printf
(
_
(
" --role=ROLENAME do SET ROLE before dump
\n
"
));
printf
(
_
(
" --no-security-label
do not dump security label assignments
\n
"
));
printf
(
_
(
" --no-security-label
s
do not dump security label assignments
\n
"
));
printf
(
_
(
" --no-unlogged-table-data do not dump unlogged table data
\n
"
));
printf
(
_
(
" --use-set-session-authorization
\n
"
" use SET SESSION AUTHORIZATION commands instead of
\n
"
...
...
@@ -11535,8 +11535,8 @@ dumpSecLabel(Archive *fout, const char *target,
int
i
;
PQExpBuffer
query
;
/* do nothing, if --no-security-label is supplied */
if
(
no_security_label
)
/* do nothing, if --no-security-label
s
is supplied */
if
(
no_security_label
s
)
return
;
/* Comments are schema not data ... except blob comments are data */
...
...
@@ -11598,8 +11598,8 @@ dumpTableSecLabel(Archive *fout, TableInfo *tbinfo, const char *reltypename)
PQExpBuffer
query
;
PQExpBuffer
target
;
/* do nothing, if --no-security-label is supplied */
if
(
no_security_label
)
/* do nothing, if --no-security-label
s
is supplied */
if
(
no_security_label
s
)
return
;
/* SecLabel are SCHEMA not data */
...
...
src/bin/pg_dump/pg_dumpall.c
浏览文件 @
c8e0c321
...
...
@@ -69,7 +69,7 @@ static int disable_triggers = 0;
static
int
inserts
=
0
;
static
int
no_tablespaces
=
0
;
static
int
use_setsessauth
=
0
;
static
int
no_security_label
=
0
;
static
int
no_security_label
s
=
0
;
static
int
no_unlogged_table_data
=
0
;
static
int
server_version
;
...
...
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
{
"quote-all-identifiers"
,
no_argument
,
&
quote_all_identifiers
,
1
},
{
"role"
,
required_argument
,
NULL
,
3
},
{
"use-set-session-authorization"
,
no_argument
,
&
use_setsessauth
,
1
},
{
"no-security-label
"
,
no_argument
,
&
no_security_label
,
1
},
{
"no-security-label
s"
,
no_argument
,
&
no_security_labels
,
1
},
{
"no-unlogged-table-data"
,
no_argument
,
&
no_unlogged_table_data
,
1
},
{
NULL
,
0
,
NULL
,
0
}
...
...
@@ -353,8 +353,8 @@ main(int argc, char *argv[])
appendPQExpBuffer
(
pgdumpopts
,
" --quote-all-identifiers"
);
if
(
use_setsessauth
)
appendPQExpBuffer
(
pgdumpopts
,
" --use-set-session-authorization"
);
if
(
no_security_label
)
appendPQExpBuffer
(
pgdumpopts
,
" --no-security-label"
);
if
(
no_security_label
s
)
appendPQExpBuffer
(
pgdumpopts
,
" --no-security-label
s
"
);
if
(
no_unlogged_table_data
)
appendPQExpBuffer
(
pgdumpopts
,
" --no-unlogged-table-data"
);
...
...
@@ -553,7 +553,7 @@ help(void)
printf
(
_
(
" --no-tablespaces do not dump tablespace assignments
\n
"
));
printf
(
_
(
" --quote-all-identifiers quote all identifiers, even if not keywords
\n
"
));
printf
(
_
(
" --role=ROLENAME do SET ROLE before dump
\n
"
));
printf
(
_
(
" --no-security-label
do not dump security label assignments
\n
"
));
printf
(
_
(
" --no-security-label
s
do not dump security label assignments
\n
"
));
printf
(
_
(
" --no-unlogged-table-data do not dump unlogged table data
\n
"
));
printf
(
_
(
" --use-set-session-authorization
\n
"
" use SET SESSION AUTHORIZATION commands instead of
\n
"
...
...
src/bin/pg_dump/pg_restore.c
浏览文件 @
c8e0c321
...
...
@@ -76,7 +76,7 @@ main(int argc, char **argv)
static
int
no_data_for_failed_tables
=
0
;
static
int
outputNoTablespaces
=
0
;
static
int
use_setsessauth
=
0
;
static
int
skip_seclabel
=
0
;
static
int
no_security_labels
=
0
;
struct
option
cmdopts
[]
=
{
{
"clean"
,
0
,
NULL
,
'c'
},
...
...
@@ -117,7 +117,7 @@ main(int argc, char **argv)
{
"no-tablespaces"
,
no_argument
,
&
outputNoTablespaces
,
1
},
{
"role"
,
required_argument
,
NULL
,
2
},
{
"use-set-session-authorization"
,
no_argument
,
&
use_setsessauth
,
1
},
{
"no-security-label
"
,
no_argument
,
&
skip_seclabel
,
1
},
{
"no-security-label
s"
,
no_argument
,
&
no_security_labels
,
1
},
{
NULL
,
0
,
NULL
,
0
}
};
...
...
@@ -318,7 +318,7 @@ main(int argc, char **argv)
opts
->
noDataForFailedTables
=
no_data_for_failed_tables
;
opts
->
noTablespace
=
outputNoTablespaces
;
opts
->
use_setsessauth
=
use_setsessauth
;
opts
->
skip_seclabel
=
skip_seclabel
;
opts
->
no_security_labels
=
no_security_labels
;
if
(
opts
->
formatName
)
{
...
...
@@ -429,7 +429,7 @@ usage(const char *progname)
" do not restore data of tables that could not be
\n
"
" created
\n
"
));
printf
(
_
(
" --no-tablespaces do not restore tablespace assignments
\n
"
));
printf
(
_
(
" --no-security-label
do not restore security labels
\n
"
));
printf
(
_
(
" --no-security-label
s
do not restore security labels
\n
"
));
printf
(
_
(
" --role=ROLENAME do SET ROLE before restore
\n
"
));
printf
(
_
(
" --use-set-session-authorization
\n
"
" use SET SESSION AUTHORIZATION commands instead of
\n
"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录