Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
4c335580
提交
4c335580
authored
7月 07, 2012
作者:
Thomas Mueller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Stop supporting version 1.2 in the trunk.
上级
9b421f05
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
7 行增加
和
15 行删除
+7
-15
RunScriptCommand.java
h2/src/main/org/h2/command/dml/RunScriptCommand.java
+1
-2
ScriptCommand.java
h2/src/main/org/h2/command/dml/ScriptCommand.java
+1
-1
SysProperties.java
h2/src/main/org/h2/constant/SysProperties.java
+1
-2
Csv.java
h2/src/main/org/h2/tools/Csv.java
+2
-6
TestCsv.java
h2/src/test/org/h2/test/db/TestCsv.java
+1
-2
TestTransaction.java
h2/src/test/org/h2/test/db/TestTransaction.java
+1
-2
没有找到文件。
h2/src/main/org/h2/command/dml/RunScriptCommand.java
浏览文件 @
4c335580
...
@@ -11,7 +11,6 @@ import java.io.InputStreamReader;
...
@@ -11,7 +11,6 @@ import java.io.InputStreamReader;
import
java.io.Reader
;
import
java.io.Reader
;
import
org.h2.command.CommandInterface
;
import
org.h2.command.CommandInterface
;
import
org.h2.command.Prepared
;
import
org.h2.command.Prepared
;
import
org.h2.constant.SysProperties
;
import
org.h2.engine.Constants
;
import
org.h2.engine.Constants
;
import
org.h2.engine.Session
;
import
org.h2.engine.Session
;
import
org.h2.message.DbException
;
import
org.h2.message.DbException
;
...
@@ -24,7 +23,7 @@ import org.h2.util.ScriptReader;
...
@@ -24,7 +23,7 @@ import org.h2.util.ScriptReader;
*/
*/
public
class
RunScriptCommand
extends
ScriptBase
{
public
class
RunScriptCommand
extends
ScriptBase
{
private
String
charset
=
Constants
.
VERSION_MINOR
<
3
?
SysProperties
.
FILE_ENCODING
:
Constants
.
UTF8
;
private
String
charset
=
Constants
.
UTF8
;
public
RunScriptCommand
(
Session
session
)
{
public
RunScriptCommand
(
Session
session
)
{
super
(
session
);
super
(
session
);
...
...
h2/src/main/org/h2/command/dml/ScriptCommand.java
浏览文件 @
4c335580
...
@@ -66,7 +66,7 @@ import org.h2.value.ValueString;
...
@@ -66,7 +66,7 @@ import org.h2.value.ValueString;
*/
*/
public
class
ScriptCommand
extends
ScriptBase
{
public
class
ScriptCommand
extends
ScriptBase
{
private
String
charset
=
Constants
.
VERSION_MINOR
<
3
?
SysProperties
.
FILE_ENCODING
:
Constants
.
UTF8
;
private
String
charset
=
Constants
.
UTF8
;
private
Set
<
String
>
schemaNames
;
private
Set
<
String
>
schemaNames
;
private
Collection
<
Table
>
tables
;
private
Collection
<
Table
>
tables
;
private
boolean
passwords
;
private
boolean
passwords
;
...
...
h2/src/main/org/h2/constant/SysProperties.java
浏览文件 @
4c335580
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
*/
*/
package
org
.
h2
.
constant
;
package
org
.
h2
.
constant
;
import
org.h2.engine.Constants
;
import
org.h2.message.TraceSystem
;
import
org.h2.message.TraceSystem
;
import
org.h2.util.MathUtils
;
import
org.h2.util.MathUtils
;
import
org.h2.util.Utils
;
import
org.h2.util.Utils
;
...
@@ -187,7 +186,7 @@ public class SysProperties {
...
@@ -187,7 +186,7 @@ public class SysProperties {
* System property <code>h2.lobInDatabase</code> (default: true).<br />
* System property <code>h2.lobInDatabase</code> (default: true).<br />
* Store LOB files in the database.
* Store LOB files in the database.
*/
*/
public
static
final
boolean
LOB_IN_DATABASE
=
Utils
.
getProperty
(
"h2.lobInDatabase"
,
Constants
.
VERSION_MINOR
>=
3
);
public
static
final
boolean
LOB_IN_DATABASE
=
Utils
.
getProperty
(
"h2.lobInDatabase"
,
true
);
/**
/**
* System property <code>h2.lobClientMaxSizeMemory</code> (default:
* System property <code>h2.lobClientMaxSizeMemory</code> (default:
...
...
h2/src/main/org/h2/tools/Csv.java
浏览文件 @
4c335580
...
@@ -54,11 +54,7 @@ public class Csv implements SimpleRowSource {
...
@@ -54,11 +54,7 @@ public class Csv implements SimpleRowSource {
private
boolean
caseSensitiveColumnNames
;
private
boolean
caseSensitiveColumnNames
;
private
boolean
preserveWhitespace
;
private
boolean
preserveWhitespace
;
private
boolean
writeColumnHeader
=
true
;
private
boolean
writeColumnHeader
=
true
;
private
char
lineComment
=
0
;
// TODO change the docs at setLineCommentCharacter
// TODO also change help.csv
private
char
lineComment
=
Constants
.
VERSION_MINOR
==
3
?
0
:
'#'
;
private
String
lineSeparator
=
SysProperties
.
LINE_SEPARATOR
;
private
String
lineSeparator
=
SysProperties
.
LINE_SEPARATOR
;
private
String
nullString
=
""
;
private
String
nullString
=
""
;
...
@@ -710,7 +706,7 @@ public class Csv implements SimpleRowSource {
...
@@ -710,7 +706,7 @@ public class Csv implements SimpleRowSource {
/**
/**
* Set the line comment character. The default is character code 0 (line
* Set the line comment character. The default is character code 0 (line
* comments are disabled)
for H2 version 1.3, and '#' for H2 version 1.2
.
* comments are disabled).
*
*
* @param lineCommentCharacter the line comment character
* @param lineCommentCharacter the line comment character
*/
*/
...
...
h2/src/test/org/h2/test/db/TestCsv.java
浏览文件 @
4c335580
...
@@ -24,7 +24,6 @@ import java.util.ArrayList;
...
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import
java.util.Random
;
import
java.util.Random
;
import
org.h2.constant.ErrorCode
;
import
org.h2.constant.ErrorCode
;
import
org.h2.constant.SysProperties
;
import
org.h2.constant.SysProperties
;
import
org.h2.engine.Constants
;
import
org.h2.store.fs.FileUtils
;
import
org.h2.store.fs.FileUtils
;
import
org.h2.test.TestBase
;
import
org.h2.test.TestBase
;
import
org.h2.tools.Csv
;
import
org.h2.tools.Csv
;
...
@@ -176,7 +175,7 @@ public class TestCsv extends TestBase {
...
@@ -176,7 +175,7 @@ public class TestCsv extends TestBase {
assertEquals
(
'"'
,
csv
.
getFieldDelimiter
());
assertEquals
(
'"'
,
csv
.
getFieldDelimiter
());
assertEquals
(
','
,
csv
.
getFieldSeparatorRead
());
assertEquals
(
','
,
csv
.
getFieldSeparatorRead
());
assertEquals
(
","
,
csv
.
getFieldSeparatorWrite
());
assertEquals
(
","
,
csv
.
getFieldSeparatorWrite
());
assertEquals
(
Constants
.
VERSION_MINOR
==
3
?
0
:
'#'
,
csv
.
getLineCommentCharacter
());
assertEquals
(
0
,
csv
.
getLineCommentCharacter
());
assertEquals
(
false
,
csv
.
getPreserveWhitespace
());
assertEquals
(
false
,
csv
.
getPreserveWhitespace
());
String
charset
;
String
charset
;
...
...
h2/src/test/org/h2/test/db/TestTransaction.java
浏览文件 @
4c335580
...
@@ -16,7 +16,6 @@ import java.sql.Statement;
...
@@ -16,7 +16,6 @@ import java.sql.Statement;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Random
;
import
java.util.Random
;
import
org.h2.constant.ErrorCode
;
import
org.h2.constant.ErrorCode
;
import
org.h2.engine.Constants
;
import
org.h2.test.TestBase
;
import
org.h2.test.TestBase
;
import
org.h2.util.New
;
import
org.h2.util.New
;
...
@@ -161,7 +160,7 @@ public class TestTransaction extends TestBase {
...
@@ -161,7 +160,7 @@ public class TestTransaction extends TestBase {
Connection
conn2
=
getConnection
(
"transaction"
);
Connection
conn2
=
getConnection
(
"transaction"
);
conn2
.
setAutoCommit
(
false
);
conn2
.
setAutoCommit
(
false
);
Statement
stat2
=
conn2
.
createStatement
();
Statement
stat2
=
conn2
.
createStatement
();
if
(
config
.
mvcc
&&
Constants
.
VERSION_MINOR
>=
3
)
{
if
(
config
.
mvcc
)
{
stat2
.
execute
(
"update test set name = 'Welt' where id = 2"
);
stat2
.
execute
(
"update test set name = 'Welt' where id = 2"
);
}
}
assertThrows
(
ErrorCode
.
LOCK_TIMEOUT_1
,
stat2
).
assertThrows
(
ErrorCode
.
LOCK_TIMEOUT_1
,
stat2
).
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论