Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
5e3bcac1
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,发现更多精彩内容 >>
提交
5e3bcac1
编写于
3月 06, 2006
作者:
B
Bruce Momjian
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix psql history handling so 'execute' backslash commands (\g)
remain as part of the multi-line query.
上级
2f01703f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
24 addition
and
23 deletion
+24
-23
src/bin/psql/mainloop.c
src/bin/psql/mainloop.c
+24
-23
未找到文件。
src/bin/psql/mainloop.c
浏览文件 @
5e3bcac1
...
...
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2006, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.7
2 2006/03/06 04:45:21
momjian Exp $
* $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.7
3 2006/03/06 15:09:04
momjian Exp $
*/
#include "postgres_fe.h"
#include "mainloop.h"
...
...
@@ -236,23 +236,6 @@ MainLoop(FILE *source)
scan_result
=
psql_scan
(
scan_state
,
query_buf
,
&
prompt_tmp
);
prompt_status
=
prompt_tmp
;
/*
* If we append to history a backslash command that is inside
* a multi-line query, then when we recall the history, the
* backslash command will make the query invalid, so we write
* backslash commands immediately rather than keeping them
* as part of the current multi-line query.
*/
if
(
first_query_scan
&&
pset
.
cur_cmd_interactive
)
{
if
(
scan_result
==
PSCAN_BACKSLASH
&&
query_buf
->
len
!=
0
)
pg_write_history
(
line
);
else
pg_append_history
(
line
,
history_buf
);
}
first_query_scan
=
false
;
/*
* Send command if semicolon found, or if end of line and we're in
* single-line mode.
...
...
@@ -309,17 +292,35 @@ MainLoop(FILE *source)
/* flush any paren nesting info after forced send */
psql_scan_reset
(
scan_state
);
}
}
if
(
slashCmdStatus
==
PSQL_CMD_TERMINATE
)
break
;
/*
* If we append to history a backslash command that is inside
* a multi-line query, then when we recall the history, the
* backslash command will make the query invalid, so we write
* backslash commands immediately rather than keeping them
* as part of the current multi-line query. We do the test
* down here so we can check for \g and other 'execute'
* backslash commands, which should be appended.
*/
if
(
first_query_scan
&&
pset
.
cur_cmd_interactive
)
{
/* Sending a command (PSQL_CMD_SEND) zeros the length */
if
(
scan_result
==
PSCAN_BACKSLASH
&&
query_buf
->
len
!=
0
)
pg_write_history
(
line
);
else
pg_append_history
(
line
,
history_buf
);
}
/* fall out of loop if lexer reached EOL */
if
(
scan_result
==
PSCAN_INCOMPLETE
||
first_query_scan
=
false
;
/* fall out of loop on \q or if lexer reached EOL */
if
(
slashCmdStatus
==
PSQL_CMD_TERMINATE
||
scan_result
==
PSCAN_INCOMPLETE
||
scan_result
==
PSCAN_EOL
)
break
;
}
if
(
pset
.
cur_cmd_interactive
&&
prompt_status
!=
PROMPT_CONTINUE
)
{
/*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录