Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
cc1352c7
提交
cc1352c7
authored
7 年前
作者:
Evgenij Ryazanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use MySQL-compatible conversion between CHAR and BINARY in MySQL mode
上级
bbf4df6f
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
68 行增加
和
10 行删除
+68
-10
Mode.java
h2/src/main/org/h2/engine/Mode.java
+6
-0
JdbcResultSet.java
h2/src/main/org/h2/jdbc/JdbcResultSet.java
+1
-1
Value.java
h2/src/main/org/h2/value/Value.java
+29
-8
TestCompatibility.java
h2/src/test/org/h2/test/db/TestCompatibility.java
+32
-1
没有找到文件。
h2/src/main/org/h2/engine/Mode.java
浏览文件 @
cc1352c7
...
@@ -186,6 +186,11 @@ public class Mode {
...
@@ -186,6 +186,11 @@ public class Mode {
*/
*/
public
boolean
allowDB2TimestampFormat
;
public
boolean
allowDB2TimestampFormat
;
/**
* Convert (VAR)CHAR to VAR(BINARY) and vice versa with UTF-8 encoding instead of HEX.
*/
public
boolean
charToBinaryInUtf8
;
/**
/**
* An optional Set of hidden/disallowed column types.
* An optional Set of hidden/disallowed column types.
* Certain DBMSs don't support all column types provided by H2, such as
* Certain DBMSs don't support all column types provided by H2, such as
...
@@ -269,6 +274,7 @@ public class Mode {
...
@@ -269,6 +274,7 @@ public class Mode {
mode
.
supportedClientInfoPropertiesRegEx
=
mode
.
supportedClientInfoPropertiesRegEx
=
Pattern
.
compile
(
".*"
);
Pattern
.
compile
(
".*"
);
mode
.
prohibitEmptyInPredicate
=
true
;
mode
.
prohibitEmptyInPredicate
=
true
;
mode
.
charToBinaryInUtf8
=
true
;
add
(
mode
);
add
(
mode
);
mode
=
new
Mode
(
ModeEnum
.
Oracle
);
mode
=
new
Mode
(
ModeEnum
.
Oracle
);
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/jdbc/JdbcResultSet.java
浏览文件 @
cc1352c7
...
@@ -1065,7 +1065,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
...
@@ -1065,7 +1065,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
public
byte
[]
getBytes
(
int
columnIndex
)
throws
SQLException
{
public
byte
[]
getBytes
(
int
columnIndex
)
throws
SQLException
{
try
{
try
{
debugCodeCall
(
"getBytes"
,
columnIndex
);
debugCodeCall
(
"getBytes"
,
columnIndex
);
return
get
(
columnIndex
).
getBytes
();
return
get
(
columnIndex
).
convertTo
(
Value
.
BYTES
,
-
1
,
conn
.
getMode
()).
getBytes
();
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
throw
logAndConvert
(
e
);
throw
logAndConvert
(
e
);
}
}
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/value/Value.java
浏览文件 @
cc1352c7
...
@@ -957,6 +957,33 @@ public abstract class Value {
...
@@ -957,6 +957,33 @@ public abstract class Value {
}
}
break
;
break
;
}
}
case
STRING:
{
String
s
;
if
(
getType
()
==
BYTES
&&
mode
!=
null
&&
mode
.
charToBinaryInUtf8
)
{
s
=
new
String
(
getBytesNoCopy
());
}
else
{
s
=
getString
();
}
return
ValueString
.
get
(
s
);
}
case
STRING_IGNORECASE:
{
String
s
;
if
(
getType
()
==
BYTES
&&
mode
!=
null
&&
mode
.
charToBinaryInUtf8
)
{
s
=
new
String
(
getBytesNoCopy
());
}
else
{
s
=
getString
();
}
return
ValueStringIgnoreCase
.
get
(
s
);
}
case
STRING_FIXED:
{
String
s
;
if
(
getType
()
==
BYTES
&&
mode
!=
null
&&
mode
.
charToBinaryInUtf8
)
{
s
=
new
String
(
getBytesNoCopy
());
}
else
{
s
=
getString
();
}
return
ValueStringFixed
.
get
(
s
,
precision
,
mode
);
}
case
JAVA_OBJECT:
{
case
JAVA_OBJECT:
{
switch
(
getType
())
{
switch
(
getType
())
{
case
BYTES:
case
BYTES:
...
@@ -1081,17 +1108,11 @@ public abstract class Value {
...
@@ -1081,17 +1108,11 @@ public abstract class Value {
case
TIMESTAMP_TZ:
case
TIMESTAMP_TZ:
return
ValueTimestampTimeZone
.
parse
(
s
.
trim
());
return
ValueTimestampTimeZone
.
parse
(
s
.
trim
());
case
BYTES:
case
BYTES:
return
ValueBytes
.
getNoCopy
(
return
ValueBytes
.
getNoCopy
(
mode
!=
null
&&
mode
.
charToBinaryInUtf8
?
StringUtils
.
convertHexToBytes
(
s
.
trim
()));
s
.
getBytes
(
StandardCharsets
.
UTF_8
):
StringUtils
.
convertHexToBytes
(
s
.
trim
()));
case
JAVA_OBJECT:
case
JAVA_OBJECT:
return
ValueJavaObject
.
getNoCopy
(
null
,
return
ValueJavaObject
.
getNoCopy
(
null
,
StringUtils
.
convertHexToBytes
(
s
.
trim
()),
getDataHandler
());
StringUtils
.
convertHexToBytes
(
s
.
trim
()),
getDataHandler
());
case
STRING:
return
ValueString
.
get
(
s
);
case
STRING_IGNORECASE:
return
ValueStringIgnoreCase
.
get
(
s
);
case
STRING_FIXED:
return
ValueStringFixed
.
get
(
s
,
precision
,
mode
);
case
DOUBLE:
case
DOUBLE:
return
ValueDouble
.
get
(
Double
.
parseDouble
(
s
.
trim
()));
return
ValueDouble
.
get
(
Double
.
parseDouble
(
s
.
trim
()));
case
FLOAT:
case
FLOAT:
...
...
This diff is collapsed.
Click to expand it.
h2/src/test/org/h2/test/db/TestCompatibility.java
浏览文件 @
cc1352c7
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
*/
*/
package
org
.
h2
.
test
.
db
;
package
org
.
h2
.
test
.
db
;
import
java.nio.charset.StandardCharsets
;
import
java.sql.Connection
;
import
java.sql.Connection
;
import
java.sql.DatabaseMetaData
;
import
java.sql.DatabaseMetaData
;
import
java.sql.PreparedStatement
;
import
java.sql.PreparedStatement
;
...
@@ -304,6 +305,28 @@ public class TestCompatibility extends TestBase {
...
@@ -304,6 +305,28 @@ public class TestCompatibility extends TestBase {
// check the weird MySQL variant of DELETE
// check the weird MySQL variant of DELETE
stat
.
execute
(
"DELETE TEST FROM TEST WHERE 1=2"
);
stat
.
execute
(
"DELETE TEST FROM TEST WHERE 1=2"
);
// Check conversion between VARCHAR and VARBINARY
String
string
=
"ABCD\u1234"
;
byte
[]
bytes
=
string
.
getBytes
(
StandardCharsets
.
UTF_8
);
stat
.
execute
(
"CREATE TABLE TEST2(C VARCHAR, B VARBINARY)"
);
stat
.
execute
(
"INSERT INTO TEST2(C) VALUES ('"
+
string
+
"')"
);
assertEquals
(
1
,
stat
.
executeUpdate
(
"UPDATE TEST2 SET B = C"
));
ResultSet
rs
=
stat
.
executeQuery
(
"SELECT B FROM TEST2"
);
assertTrue
(
rs
.
next
());
assertEquals
(
bytes
,
rs
.
getBytes
(
1
));
assertEquals
(
1
,
stat
.
executeUpdate
(
"UPDATE TEST2 SET C = B"
));
testMySQLBytesCheck
(
stat
,
string
,
bytes
);
PreparedStatement
prep
=
conn
.
prepareStatement
(
"UPDATE TEST2 SET C = ?"
);
prep
.
setBytes
(
1
,
bytes
);
assertEquals
(
1
,
prep
.
executeUpdate
());
testMySQLBytesCheck
(
stat
,
string
,
bytes
);
stat
.
execute
(
"DELETE FROM TEST2"
);
prep
=
conn
.
prepareStatement
(
"INSERT INTO TEST2(C) VALUES (?)"
);
prep
.
setBytes
(
1
,
bytes
);
assertEquals
(
1
,
prep
.
executeUpdate
());
testMySQLBytesCheck
(
stat
,
string
,
bytes
);
stat
.
execute
(
"DROP TABLE TEST2"
);
if
(
config
.
memory
)
{
if
(
config
.
memory
)
{
return
;
return
;
}
}
...
@@ -324,7 +347,7 @@ public class TestCompatibility extends TestBase {
...
@@ -324,7 +347,7 @@ public class TestCompatibility extends TestBase {
stat
=
conn
.
createStatement
(
ResultSet
.
TYPE_SCROLL_INSENSITIVE
,
stat
=
conn
.
createStatement
(
ResultSet
.
TYPE_SCROLL_INSENSITIVE
,
ResultSet
.
CONCUR_UPDATABLE
);
ResultSet
.
CONCUR_UPDATABLE
);
assertResult
(
"test"
,
stat
,
"SHOW TABLES"
);
assertResult
(
"test"
,
stat
,
"SHOW TABLES"
);
ResultSet
rs
=
stat
.
executeQuery
(
"SELECT * FROM TEST"
);
rs
=
stat
.
executeQuery
(
"SELECT * FROM TEST"
);
rs
.
next
();
rs
.
next
();
rs
.
updateString
(
2
,
"Hallo"
);
rs
.
updateString
(
2
,
"Hallo"
);
rs
.
updateRow
();
rs
.
updateRow
();
...
@@ -391,6 +414,14 @@ public class TestCompatibility extends TestBase {
...
@@ -391,6 +414,14 @@ public class TestCompatibility extends TestBase {
conn
=
getConnection
(
"compatibility"
);
conn
=
getConnection
(
"compatibility"
);
}
}
private
void
testMySQLBytesCheck
(
Statement
stat
,
String
string
,
byte
[]
bytes
)
throws
SQLException
{
ResultSet
rs
;
rs
=
stat
.
executeQuery
(
"SELECT C FROM TEST2"
);
assertTrue
(
rs
.
next
());
assertEquals
(
string
,
rs
.
getString
(
1
));
assertEquals
(
bytes
,
rs
.
getBytes
(
1
));
}
private
void
testSybaseAndMSSQLServer
()
throws
SQLException
{
private
void
testSybaseAndMSSQLServer
()
throws
SQLException
{
Statement
stat
=
conn
.
createStatement
();
Statement
stat
=
conn
.
createStatement
();
stat
.
execute
(
"SET MODE MSSQLServer"
);
stat
.
execute
(
"SET MODE MSSQLServer"
);
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论