Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
97c4c1d6
Unverified
提交
97c4c1d6
authored
5月 11, 2018
作者:
Evgenij Ryazanov
提交者:
GitHub
5月 11, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1127 from katzyn/misc
Update JdbcDatabaseMetaData.getSQLKeywords() and perform some minor optimizations
上级
542100a4
cf8f570d
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
25 行增加
和
20 行删除
+25
-20
Parser.java
h2/src/main/org/h2/command/Parser.java
+8
-6
JdbcDatabaseMetaData.java
h2/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
+9
-9
JdbcPreparedStatement.java
h2/src/main/org/h2/jdbc/JdbcPreparedStatement.java
+1
-2
JdbcSQLException.java
h2/src/main/org/h2/jdbc/JdbcSQLException.java
+2
-2
ParserUtil.java
h2/src/main/org/h2/util/ParserUtil.java
+4
-0
TestMetaData.java
h2/src/test/org/h2/test/jdbc/TestMetaData.java
+1
-1
没有找到文件。
h2/src/main/org/h2/command/Parser.java
浏览文件 @
97c4c1d6
...
...
@@ -3864,6 +3864,7 @@ public class Parser {
parseIndex
=
i
;
String
sub
=
sqlCommand
.
substring
(
start
,
i
);
checkLiterals
(
false
);
BigDecimal
bd
;
if
(!
containsE
&&
sub
.
indexOf
(
'.'
)
<
0
)
{
BigInteger
bi
=
new
BigInteger
(
sub
);
if
(
bi
.
compareTo
(
ValueLong
.
MAX_BI
)
<=
0
)
{
...
...
@@ -3875,13 +3876,14 @@ public class Parser {
currentTokenType
=
VALUE
;
return
;
}
}
BigDecimal
bd
;
bd
=
new
BigDecimal
(
bi
);
}
else
{
try
{
bd
=
new
BigDecimal
(
sub
);
}
catch
(
NumberFormatException
e
)
{
throw
DbException
.
get
(
ErrorCode
.
DATA_CONVERSION_ERROR_1
,
e
,
sub
);
}
}
currentValue
=
ValueDecimal
.
get
(
bd
);
currentTokenType
=
VALUE
;
}
...
...
h2/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
浏览文件 @
97c4c1d6
...
...
@@ -1535,19 +1535,19 @@ public class JdbcDatabaseMetaData extends TraceObject implements
}
/**
* Gets the comma-separated list of all SQL keywords that are not supported
*
as
table/column/index name, in addition to the SQL-2003 keywords. The list
* Gets the comma-separated list of all SQL keywords that are not supported
as
* table/column/index name, in addition to the SQL-2003 keywords. The list
* returned is:
* <pre>
*
LIMIT,MINUS,OFFSET,ROWNUM,SYSDATE,SYSTIME,SYSTIMESTAMP,TODAY
*
INTERSECTS,LIMIT,MINUS,OFFSET,ROWNUM,SYSDATE,SYSTIME,SYSTIMESTAMP,TODAY,TOP
* </pre>
* The complete list of keywords (including SQL-2003 keywords) is:
* <pre>
* ALL, CHECK, CONSTRAINT, CROSS, CURRENT_DATE, CURRENT_TIME,
*
CURRENT_TIMESTAMP, DISTINCT, EXCEPT, EXISTS, FALSE, FETCH, FOR, FOREIGN
,
*
FROM, FULL, GROUP, HAVING, INNER, INTERSECT, IS, JOIN, LIKE, LIMIT
,
*
MINUS, NATURAL, NOT, NULL, OFFSET, ON, ORDER, PRIMARY, ROWNUM, SELECT
,
* SYS
DATE, SYSTIME, SYSTIMESTAMP, TODAY
, TRUE, UNION, UNIQUE, WHERE, WITH
* ALL, CHECK, CONSTRAINT, CROSS, CURRENT_DATE, CURRENT_TIME,
CURRENT_TIMESTAMP,
*
DISTINCT, EXCEPT, EXISTS, FALSE, FETCH, FOR, FOREIGN, FROM, FULL, GROUP
,
*
HAVING, INNER, INTERSECT, INTERSECTS, IS, JOIN, LIKE, LIMIT, MINUS, NATURAL
,
*
NOT, NULL, OFFSET, ON, ORDER, PRIMARY, ROWNUM, SELECT, SYSDATE, SYSTIME
,
* SYS
TIMESTAMP, TODAY, TOP
, TRUE, UNION, UNIQUE, WHERE, WITH
* </pre>
*
* @return a list of additional the keywords
...
...
@@ -1555,7 +1555,7 @@ public class JdbcDatabaseMetaData extends TraceObject implements
@Override
public
String
getSQLKeywords
()
{
debugCodeCall
(
"getSQLKeywords"
);
return
"
LIMIT,MINUS,OFFSET,ROWNUM,SYSDATE,SYSTIME,SYSTIMESTAMP,TODAY
"
;
return
"
INTERSECTS,LIMIT,MINUS,OFFSET,ROWNUM,SYSDATE,SYSTIME,SYSTIMESTAMP,TODAY,TOP
"
;
}
/**
...
...
h2/src/main/org/h2/jdbc/JdbcPreparedStatement.java
浏览文件 @
97c4c1d6
...
...
@@ -1253,8 +1253,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements
try
{
debugCodeCall
(
"executeBatch"
);
if
(
batchParameters
==
null
)
{
// TODO batch: check what other database do if no parameters are
// set
// Empty batch is allowed, see JDK-4639504 and other issues
batchParameters
=
Utils
.
newSmallArrayList
();
}
batchIdentities
=
new
MergedResultSet
();
...
...
h2/src/main/org/h2/jdbc/JdbcSQLException.java
浏览文件 @
97c4c1d6
...
...
@@ -44,10 +44,10 @@ public class JdbcSQLException extends SQLException {
int
errorCode
,
Throwable
cause
,
String
stackTrace
)
{
super
(
message
,
state
,
errorCode
);
this
.
originalMessage
=
message
;
setSQL
(
sql
);
this
.
cause
=
cause
;
this
.
stackTrace
=
stackTrace
;
buildMessage
();
// setSQL() invokes buildBessage() by itself
setSQL
(
sql
);
initCause
(
cause
);
}
...
...
h2/src/main/org/h2/util/ParserUtil.java
浏览文件 @
97c4c1d6
...
...
@@ -89,6 +89,10 @@ public class ParserUtil {
* @return the token type
*/
public
static
int
getSaveTokenType
(
String
s
,
boolean
additionalKeywords
)
{
/*
* JdbcDatabaseMetaData.getSQLKeywords() and tests should be updated when new
* non-SQL:2003 keywords are introduced here.
*/
switch
(
s
.
charAt
(
0
))
{
case
'A'
:
return
getKeywordOrIdentifier
(
s
,
"ALL"
,
KEYWORD
);
...
...
h2/src/test/org/h2/test/jdbc/TestMetaData.java
浏览文件 @
97c4c1d6
...
...
@@ -464,7 +464,7 @@ public class TestMetaData extends TestBase {
assertEquals
(
"schema"
,
meta
.
getSchemaTerm
());
assertEquals
(
"\\"
,
meta
.
getSearchStringEscape
());
assertEquals
(
"
LIMIT,MINUS,OFFSET,ROWNUM,SYSDATE,SYSTIME,SYSTIMESTAMP,TODAY
"
,
assertEquals
(
"
INTERSECTS,LIMIT,MINUS,OFFSET,ROWNUM,SYSDATE,SYSTIME,SYSTIMESTAMP,TODAY,TOP
"
,
meta
.
getSQLKeywords
());
assertTrue
(
meta
.
getURL
().
startsWith
(
"jdbc:h2:"
));
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论