Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
8832f0f3
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,发现更多精彩内容 >>
提交
8832f0f3
编写于
12月 29, 2006
作者:
P
Peter Eisentraut
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
De-escape XML names when reverse-compiling XML expressions.
上级
9aefd566
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
76 addition
and
11 deletion
+76
-11
src/backend/utils/adt/ruleutils.c
src/backend/utils/adt/ruleutils.c
+3
-9
src/backend/utils/adt/xml.c
src/backend/utils/adt/xml.c
+71
-1
src/include/utils/xml.h
src/include/utils/xml.h
+2
-1
未找到文件。
src/backend/utils/adt/ruleutils.c
浏览文件 @
8832f0f3
...
...
@@ -2,7 +2,7 @@
* ruleutils.c - Functions to convert stored expressions/querytrees
* back to source text
*
* $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.23
8 2006/12/24 00:29:19 tgl
Exp $
* $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.23
9 2006/12/29 10:50:22 petere
Exp $
**********************************************************************/
#include "postgres.h"
...
...
@@ -3810,11 +3810,8 @@ get_rule_expr(Node *node, deparse_context *context,
}
if
(
xexpr
->
name
)
{
/*
* XXX need to de-escape the name
*/
appendStringInfo
(
buf
,
"NAME %s"
,
quote_identifier
(
xexpr
->
name
));
quote_identifier
(
map_xml_name_to_sql_identifier
(
xexpr
->
name
)
));
needcomma
=
true
;
}
if
(
xexpr
->
named_args
)
...
...
@@ -3834,11 +3831,8 @@ get_rule_expr(Node *node, deparse_context *context,
if
(
needcomma
)
appendStringInfoString
(
buf
,
", "
);
get_rule_expr
((
Node
*
)
e
,
context
,
true
);
/*
* XXX need to de-escape the name
*/
appendStringInfo
(
buf
,
" AS %s"
,
quote_identifier
(
argname
));
quote_identifier
(
map_xml_name_to_sql_identifier
(
argname
)
));
needcomma
=
true
;
}
if
(
xexpr
->
op
!=
IS_XMLFOREST
)
...
...
src/backend/utils/adt/xml.c
浏览文件 @
8832f0f3
...
...
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.
7 2006/12/28 14:28:36
petere Exp $
* $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.
8 2006/12/29 10:50:22
petere Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -882,6 +882,42 @@ sqlchar_to_unicode(char *s)
}
static
char
*
unicode_to_sqlchar
(
pg_wchar
c
)
{
char
utf8string
[
4
]
=
{
'\0'
,
'\0'
,
'\0'
,
'\0'
};
if
(
c
<=
0x7F
)
{
utf8string
[
0
]
=
c
;
}
else
if
(
c
<=
0x7FF
)
{
utf8string
[
0
]
=
0xC0
|
((
c
>>
6
)
&
0x1F
);
utf8string
[
1
]
=
0x80
|
(
c
&
0x3F
);
}
else
if
(
c
<=
0xFFFF
)
{
utf8string
[
0
]
=
0xE0
|
((
c
>>
12
)
&
0x0F
);
utf8string
[
1
]
=
0x80
|
((
c
>>
6
)
&
0x3F
);
utf8string
[
2
]
=
0x80
|
(
c
&
0x3F
);
}
else
{
utf8string
[
0
]
=
0xF0
|
((
c
>>
18
)
&
0x07
);
utf8string
[
1
]
=
0x80
|
((
c
>>
12
)
&
0x3F
);
utf8string
[
2
]
=
0x80
|
((
c
>>
6
)
&
0x3F
);
utf8string
[
3
]
=
0x80
|
(
c
&
0x3F
);
}
return
(
char
*
)
pg_do_encoding_conversion
((
unsigned
char
*
)
utf8string
,
pg_mblen
(
utf8string
),
PG_UTF8
,
GetDatabaseEncoding
());
}
static
bool
is_valid_xml_namefirst
(
pg_wchar
c
)
{
...
...
@@ -949,3 +985,37 @@ map_sql_identifier_to_xml_name(char *ident, bool fully_escaped)
return
NULL
;
#endif
/* not USE_LIBXML */
}
/*
* The inverse; see SQL/XML:2003 section 9.17.
*/
char
*
map_xml_name_to_sql_identifier
(
char
*
name
)
{
StringInfoData
buf
;
char
*
p
;
initStringInfo
(
&
buf
);
for
(
p
=
name
;
*
p
;
p
+=
pg_mblen
(
p
))
{
if
(
*
p
==
'_'
&&
*
(
p
+
1
)
==
'x'
&&
isxdigit
((
unsigned
char
)
*
(
p
+
2
))
&&
isxdigit
((
unsigned
char
)
*
(
p
+
3
))
&&
isxdigit
((
unsigned
char
)
*
(
p
+
4
))
&&
isxdigit
((
unsigned
char
)
*
(
p
+
5
))
&&
*
(
p
+
6
)
==
'_'
)
{
unsigned
int
u
;
sscanf
(
p
+
2
,
"%X"
,
&
u
);
appendStringInfoString
(
&
buf
,
unicode_to_sqlchar
(
u
));
p
+=
6
;
}
else
appendBinaryStringInfo
(
&
buf
,
p
,
pg_mblen
(
p
));
}
return
buf
.
data
;
}
src/include/utils/xml.h
浏览文件 @
8832f0f3
...
...
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/include/utils/xml.h,v 1.
4 2006/12/28 14:28:36
petere Exp $
* $PostgreSQL: pgsql/src/include/utils/xml.h,v 1.
5 2006/12/29 10:50:22
petere Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -37,5 +37,6 @@ extern xmltype *xmlpi(char *target, text *arg);
extern
xmltype
*
xmlroot
(
xmltype
*
data
,
text
*
version
,
int
standalone
);
extern
char
*
map_sql_identifier_to_xml_name
(
char
*
ident
,
bool
fully_escaped
);
extern
char
*
map_xml_name_to_sql_identifier
(
char
*
name
);
#endif
/* XML_H */
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录