Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
带水的鱼儿
spring-framework
提交
d33545bd
S
spring-framework
项目概览
带水的鱼儿
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d33545bd
编写于
5月 17, 2021
作者:
S
Sam Brannen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Avoid duplicate comment processing in ScriptUtils in spring-r2dbc
See gh-26947
上级
e8e157eb
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
20 deletion
+8
-20
spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/init/ScriptUtils.java
...rg/springframework/r2dbc/connection/init/ScriptUtils.java
+8
-20
未找到文件。
spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/init/ScriptUtils.java
浏览文件 @
d33545bd
...
@@ -242,7 +242,7 @@ public abstract class ScriptUtils {
...
@@ -242,7 +242,7 @@ public abstract class ScriptUtils {
InputStreamReader
in
=
(
resource
.
getCharset
()
!=
null
?
InputStreamReader
in
=
(
resource
.
getCharset
()
!=
null
?
new
InputStreamReader
(
is
,
resource
.
getCharset
())
:
new
InputStreamReader
(
is
));
new
InputStreamReader
(
is
,
resource
.
getCharset
())
:
new
InputStreamReader
(
is
));
LineNumberReader
lnr
=
new
LineNumberReader
(
in
);
LineNumberReader
lnr
=
new
LineNumberReader
(
in
);
String
script
=
readScript
(
lnr
,
commentPrefixes
,
separator
,
blockCommentEndDelimite
r
);
String
script
=
readScript
(
lnr
,
separato
r
);
sink
.
next
(
script
);
sink
.
next
(
script
);
sink
.
complete
();
sink
.
complete
();
}
}
...
@@ -256,34 +256,22 @@ public abstract class ScriptUtils {
...
@@ -256,34 +256,22 @@ public abstract class ScriptUtils {
}
}
/**
/**
* Read a script from the provided {@code LineNumberReader}, using the supplied
* Read a script from the provided {@code LineNumberReader} and build a
* comment prefixes and statement separator, and build a {@code String} containing
* {@code String} containing the lines.
* the lines.
* <p>Lines <em>beginning</em> with one of the comment prefixes are excluded
* from the results; however, line comments anywhere else — for example,
* within a statement — will be included in the results.
* @param lineNumberReader the {@code LineNumberReader} containing the script
* @param lineNumberReader the {@code LineNumberReader} containing the script
* to be processed
* to be processed
* @param commentPrefixes the prefixes that identify comments in the SQL script
* (typically "--")
* @param separator the statement separator in the SQL script (typically ";")
* @param separator the statement separator in the SQL script (typically ";")
* @param blockCommentEndDelimiter the <em>end</em> block comment delimiter
* @return a {@code String} containing the script lines
* @return a {@code String} containing the script lines
* @throws IOException in case of I/O errors
* @throws IOException in case of I/O errors
*/
*/
private
static
String
readScript
(
LineNumberReader
lineNumberReader
,
@Nullable
String
[]
commentPrefixes
,
private
static
String
readScript
(
LineNumberReader
lineNumberReader
,
@Nullable
String
separator
)
throws
IOException
{
@Nullable
String
separator
,
@Nullable
String
blockCommentEndDelimiter
)
throws
IOException
{
String
currentLine
=
lineNumberReader
.
readLine
();
StringBuilder
scriptBuilder
=
new
StringBuilder
();
StringBuilder
scriptBuilder
=
new
StringBuilder
();
String
currentLine
=
lineNumberReader
.
readLine
();
while
(
currentLine
!=
null
)
{
while
(
currentLine
!=
null
)
{
if
((
blockCommentEndDelimiter
!=
null
&&
currentLine
.
contains
(
blockCommentEndDelimiter
))
||
if
(
scriptBuilder
.
length
()
>
0
)
{
(
commentPrefixes
!=
null
&&
!
startsWithAny
(
currentLine
,
commentPrefixes
,
0
)))
{
scriptBuilder
.
append
(
'\n'
);
if
(
scriptBuilder
.
length
()
>
0
)
{
scriptBuilder
.
append
(
'\n'
);
}
scriptBuilder
.
append
(
currentLine
);
}
}
scriptBuilder
.
append
(
currentLine
);
currentLine
=
lineNumberReader
.
readLine
();
currentLine
=
lineNumberReader
.
readLine
();
}
}
appendSeparatorToScriptIfNecessary
(
scriptBuilder
,
separator
);
appendSeparatorToScriptIfNecessary
(
scriptBuilder
,
separator
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录