Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
3d192cd0
提交
3d192cd0
authored
2月 26, 2019
作者:
Evgenij Ryazanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Do not write column names in SCRIPT-generated INSERT statements by default
上级
f6b2ced2
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
68 行增加
和
42 行删除
+68
-42
help.csv
h2/src/docsrc/help/help.csv
+4
-2
Parser.java
h2/src/main/org/h2/command/Parser.java
+9
-4
ScriptCommand.java
h2/src/main/org/h2/command/dml/ScriptCommand.java
+12
-3
script.sql
h2/src/test/org/h2/test/scripts/dml/script.sql
+11
-1
testScript.sql
h2/src/test/org/h2/test/scripts/testScript.sql
+32
-32
没有找到文件。
h2/src/docsrc/help/help.csv
浏览文件 @
3d192cd0
...
...
@@ -223,7 +223,8 @@ RUNSCRIPT FROM 'classpath:/com/acme/test.sql'
"
"Commands (DML)","SCRIPT","
SCRIPT [ SIMPLE ] [ NODATA ] [ NOPASSWORDS ] [ NOSETTINGS ]
SCRIPT { [ NODATA ] | [ SIMPLE ] [ COLUMNS ] }
[ NOPASSWORDS ] [ NOSETTINGS ]
[ DROP ] [ BLOCKSIZE blockSizeInt ]
[ TO fileNameString scriptCompressionEncryption
[ CHARSET charsetString ] ]
...
...
@@ -232,8 +233,9 @@ SCRIPT [ SIMPLE ] [ NODATA ] [ NOPASSWORDS ] [ NOSETTINGS ]
","
Creates a SQL script from the database.
SIMPLE does not use multi-row insert statements.
NODATA will not emit INSERT statements.
SIMPLE does not use multi-row insert statements.
COLUMNS includes column name lists into insert statements.
If the DROP option is specified, drop statements are created for tables, views,
and sequences. If the block size is set, CLOB and BLOB values larger than this
size are split into separate blocks.
...
...
h2/src/main/org/h2/command/Parser.java
浏览文件 @
3d192cd0
...
...
@@ -7032,12 +7032,16 @@ public class Parser {
private
ScriptCommand
parseScript
()
{
ScriptCommand
command
=
new
ScriptCommand
(
session
);
boolean
data
=
true
,
passwords
=
true
,
settings
=
true
;
boolean
dropTables
=
false
,
simple
=
false
;
boolean
dropTables
=
false
,
simple
=
false
,
withColumns
=
false
;
if
(
readIf
(
"NODATA"
))
{
data
=
false
;
}
else
{
if
(
readIf
(
"SIMPLE"
))
{
simple
=
true
;
}
if
(
readIf
(
"NODATA"
))
{
data
=
false
;
if
(
readIf
(
"COLUMNS"
))
{
withColumns
=
true
;
}
}
if
(
readIf
(
"NOPASSWORDS"
))
{
passwords
=
false
;
...
...
@@ -7057,6 +7061,7 @@ public class Parser {
command
.
setSettings
(
settings
);
command
.
setDrop
(
dropTables
);
command
.
setSimple
(
simple
);
command
.
setWithColumns
(
withColumns
);
if
(
readIf
(
"TO"
))
{
command
.
setFileNameExpr
(
readExpression
());
if
(
readIf
(
"COMPRESSION"
))
{
...
...
h2/src/main/org/h2/command/dml/ScriptCommand.java
浏览文件 @
3d192cd0
...
...
@@ -78,6 +78,7 @@ public class ScriptCommand extends ScriptBase {
// true if we're generating the DROP statements
private
boolean
drop
;
private
boolean
simple
;
private
boolean
withColumns
;
private
LocalResult
result
;
private
String
lineSeparatorString
;
private
byte
[]
lineSeparator
;
...
...
@@ -387,9 +388,13 @@ public class ScriptCommand extends ScriptBase {
Cursor
cursor
=
index
.
find
(
session
,
null
,
null
);
Column
[]
columns
=
table
.
getColumns
();
StringBuilder
builder
=
new
StringBuilder
(
"INSERT INTO "
);
table
.
getSQL
(
builder
).
append
(
'('
);
table
.
getSQL
(
builder
);
if
(
withColumns
)
{
builder
.
append
(
'('
);
Column
.
writeColumns
(
builder
,
columns
);
builder
.
append
(
") VALUES"
);
builder
.
append
(
')'
);
}
builder
.
append
(
" VALUES"
);
if
(!
simple
)
{
builder
.
append
(
'\n'
);
}
...
...
@@ -707,6 +712,10 @@ public class ScriptCommand extends ScriptBase {
this
.
simple
=
simple
;
}
public
void
setWithColumns
(
boolean
withColumns
)
{
this
.
withColumns
=
withColumns
;
}
public
void
setCharset
(
Charset
charset
)
{
this
.
charset
=
charset
;
}
...
...
h2/src/test/org/h2/test/scripts/dml/script.sql
浏览文件 @
3d192cd0
...
...
@@ -9,7 +9,17 @@ create memory table test(id int primary key, name varchar(255));
INSERT
INTO
TEST
VALUES
(
2
,
STRINGDECODE
(
'abcsond
\3
44rzeich
\3
44 '
)
||
char
(
22222
)
||
STRINGDECODE
(
'
\3
66
\3
44
\3
74
\3
26
\3
04
\3
34
\3
51
\3
50
\3
40
\3
61!'
));
>
update
count
:
1
script
nopasswords
nosettings
;
SCRIPT
NOPASSWORDS
NOSETTINGS
;
>
SCRIPT
>
---------------------------------------------------------------------------------------------------------------------------------------------------
>
-- 1 +/- SELECT COUNT(*) FROM PUBLIC.TEST;
>
ALTER
TABLE
PUBLIC
.
TEST
ADD
CONSTRAINT
PUBLIC
.
CONSTRAINT_2
PRIMARY
KEY
(
ID
);
>
CREATE
MEMORY
TABLE
PUBLIC
.
TEST
(
ID
INT
NOT
NULL
,
NAME
VARCHAR
(
255
)
);
>
CREATE
USER
IF
NOT
EXISTS
SA
PASSWORD
''
ADMIN
;
>
INSERT
INTO
PUBLIC
.
TEST
VALUES
(
2
,
STRINGDECODE
(
'abcsond
\u
00e4rzeich
\u
00e4
\u
56ce
\u
00f6
\u
00e4
\u
00fc
\u
00d6
\u
00c4
\u
00dc
\u
00e9
\u
00e8
\u
00e0
\u
00f1!'
));
>
rows
:
5
SCRIPT
COLUMNS
NOPASSWORDS
NOSETTINGS
;
>
SCRIPT
>
-------------------------------------------------------------------------------------------------------------------------------------------------------------
>
-- 1 +/- SELECT COUNT(*) FROM PUBLIC.TEST;
...
...
h2/src/test/org/h2/test/scripts/testScript.sql
浏览文件 @
3d192cd0
...
...
@@ -1111,11 +1111,11 @@ select * from test order by id;
script
nopasswords
nosettings
;
>
SCRIPT
>
-------------------------------------------------------------------------------------------------------------------------------
----------
>
-------------------------------------------------------------------------------------------------------------------------------
>
-- 3 +/- SELECT COUNT(*) FROM PUBLIC.TEST;
>
CREATE
MEMORY
TABLE
PUBLIC
.
TEST
(
ID
INT
,
D
DOUBLE
,
F
FLOAT
);
>
CREATE
USER
IF
NOT
EXISTS
SA
PASSWORD
''
ADMIN
;
>
INSERT
INTO
PUBLIC
.
TEST
(
ID
,
D
,
F
)
VALUES
(
0
,
POWER
(
0
,
-
1
),
POWER
(
0
,
-
1
)),
(
1
,
(
-
POWER
(
0
,
-
1
)),
(
-
POWER
(
0
,
-
1
))),
(
2
,
SQRT
(
-
1
),
SQRT
(
-
1
));
>
INSERT
INTO
PUBLIC
.
TEST
VALUES
(
0
,
POWER
(
0
,
-
1
),
POWER
(
0
,
-
1
)),
(
1
,
(
-
POWER
(
0
,
-
1
)),
(
-
POWER
(
0
,
-
1
))),
(
2
,
SQRT
(
-
1
),
SQRT
(
-
1
));
>
rows
:
4
DROP
TABLE
TEST
;
...
...
@@ -2138,7 +2138,7 @@ script nopasswords nosettings blocksize 10;
> DROP ALIAS IF EXISTS SYSTEM_COMBINE_BLOB;
> DROP ALIAS IF EXISTS SYSTEM_COMBINE_CLOB;
> DROP TABLE IF EXISTS SYSTEM_LOB_STREAM;
> INSERT INTO PUBLIC.TEST
(ID, DATA)
VALUES (1, SYSTEM_COMBINE_CLOB(0));
> INSERT INTO PUBLIC.TEST VALUES (1, SYSTEM_COMBINE_CLOB(0));
> INSERT INTO SYSTEM_LOB_STREAM VALUES(0, 0, '
abc
', NULL);
> INSERT INTO SYSTEM_LOB_STREAM VALUES(0, 1, '
', NULL);
> INSERT INTO SYSTEM_LOB_STREAM VALUES(0, 2, '
', NULL);
...
...
@@ -3706,7 +3706,7 @@ script NOPASSWORDS NOSETTINGS drop;
> CREATE MEMORY TABLE PUBLIC.TEST( I INT NOT NULL, NAME VARCHAR(255), Y INT AS (I + 1) );
> CREATE USER IF NOT EXISTS SA PASSWORD
''
ADMIN;
> DROP TABLE IF EXISTS PUBLIC.TEST CASCADE;
> INSERT INTO PUBLIC.TEST
(I, NAME, Y)
VALUES (1, '
Hello
', 2);
> INSERT INTO PUBLIC.TEST VALUES (1, '
Hello
', 2);
> rows: 8
INSERT INTO TEST(i, name) VALUES(2, '
World
');
...
...
@@ -4355,9 +4355,9 @@ script simple nopasswords nosettings;
> ALTER TABLE PUBLIC.TEST ADD CONSTRAINT PUBLIC.CONSTRAINT_2 PRIMARY KEY(ID);
> CREATE MEMORY TABLE PUBLIC.TEST( ID INT NOT NULL, C CLOB, B BLOB );
> CREATE USER IF NOT EXISTS SA PASSWORD
''
ADMIN;
> INSERT INTO PUBLIC.TEST
(ID, C, B)
VALUES(0, NULL, NULL);
> INSERT INTO PUBLIC.TEST
(ID, C, B)
VALUES(1,
''
, X
''
);
> INSERT INTO PUBLIC.TEST
(ID, C, B)
VALUES(2, '
Cafe
', X'
cafe
');
> INSERT INTO PUBLIC.TEST VALUES(0, NULL, NULL);
> INSERT INTO PUBLIC.TEST VALUES(1,
''
, X
''
);
> INSERT INTO PUBLIC.TEST VALUES(2, '
Cafe
', X'
cafe
');
> rows: 7
drop table test;
...
...
@@ -4824,11 +4824,11 @@ SCRIPT SIMPLE NOPASSWORDS NOSETTINGS;
> CREATE MEMORY TABLE PUBLIC.TEST( ID INT NOT NULL, NAME VARCHAR(255) DEFAULT 1, CREATEDATE VARCHAR(255) DEFAULT '
2001
-
01
-
01
' NOT NULL, MODIFY_DATE TIMESTAMP );
> CREATE MEMORY TABLE PUBLIC.TEST_SEQ( ID INT DEFAULT 20 NOT NULL, DATA VARCHAR );
> CREATE USER IF NOT EXISTS SA PASSWORD
''
ADMIN;
> INSERT INTO PUBLIC.TEST
(ID, NAME, CREATEDATE, MODIFY_DATE)
VALUES(1, '
Hi
', '
2001
-
01
-
01
', NULL);
> INSERT INTO PUBLIC.TEST_SEQ
(ID, DATA)
VALUES(-1, '
-
1
');
> INSERT INTO PUBLIC.TEST_SEQ
(ID, DATA)
VALUES(1, '
1
');
> INSERT INTO PUBLIC.TEST_SEQ
(ID, DATA)
VALUES(10, '
10
');
> INSERT INTO PUBLIC.TEST_SEQ
(ID, DATA)
VALUES(20, '
20
');
> INSERT INTO PUBLIC.TEST VALUES(1, '
Hi
', '
2001
-
01
-
01
', NULL);
> INSERT INTO PUBLIC.TEST_SEQ VALUES(-1, '
-
1
');
> INSERT INTO PUBLIC.TEST_SEQ VALUES(1, '
1
');
> INSERT INTO PUBLIC.TEST_SEQ VALUES(10, '
10
');
> INSERT INTO PUBLIC.TEST_SEQ VALUES(20, '
20
');
> rows: 12
CREATE UNIQUE INDEX IDX_NAME_ID ON TEST(ID, NAME);
...
...
@@ -4856,7 +4856,7 @@ SCRIPT NOPASSWORDS NOSETTINGS;
> ALTER TABLE PUBLIC.TEST ADD CONSTRAINT PUBLIC.CONSTRAINT_2 PRIMARY KEY(ID);
> CREATE MEMORY TABLE PUBLIC.TEST( ID INT NOT NULL, CREATEDATE VARCHAR(255) DEFAULT '
2001
-
01
-
01
' NOT NULL, MODIFY_DATE TIMESTAMP );
> CREATE USER IF NOT EXISTS SA PASSWORD
''
ADMIN;
> INSERT INTO PUBLIC.TEST
(ID, CREATEDATE, MODIFY_DATE)
VALUES (1, '
2001
-
01
-
01
', NULL);
> INSERT INTO PUBLIC.TEST VALUES (1, '
2001
-
01
-
01
', NULL);
> rows: 5
ALTER TABLE TEST ADD NAME VARCHAR(255) NULL BEFORE CREATEDATE;
...
...
@@ -4869,7 +4869,7 @@ SCRIPT NOPASSWORDS NOSETTINGS;
> ALTER TABLE PUBLIC.TEST ADD CONSTRAINT PUBLIC.CONSTRAINT_2 PRIMARY KEY(ID);
> CREATE MEMORY TABLE PUBLIC.TEST( ID INT NOT NULL, NAME VARCHAR(255), CREATEDATE VARCHAR(255) DEFAULT '
2001
-
01
-
01
' NOT NULL, MODIFY_DATE TIMESTAMP );
> CREATE USER IF NOT EXISTS SA PASSWORD
''
ADMIN;
> INSERT INTO PUBLIC.TEST
(ID, NAME, CREATEDATE, MODIFY_DATE)
VALUES (1, NULL, '
2001
-
01
-
01
', NULL);
> INSERT INTO PUBLIC.TEST VALUES (1, NULL, '
2001
-
01
-
01
', NULL);
> rows: 5
UPDATE TEST SET NAME = '
Hi
';
...
...
@@ -6157,14 +6157,14 @@ CAST(XT AS TIMESTAMP) D2TS, CAST(XD AS TIMESTAMP) D2TS FROM TEST;
SCRIPT
SIMPLE
NOPASSWORDS
NOSETTINGS
;
>
SCRIPT
>
-----------------------------------------------------------------------------------------------------------------
-----------------
>
-----------------------------------------------------------------------------------------------------------------
>
-- 4 +/- SELECT COUNT(*) FROM PUBLIC.TEST;
>
CREATE
MEMORY
TABLE
PUBLIC
.
TEST
(
ID
INT
,
XT
TIME
,
XD
DATE
,
XTS
TIMESTAMP
(
9
)
);
>
CREATE
USER
IF
NOT
EXISTS
SA
PASSWORD
''
ADMIN
;
>
INSERT
INTO
PUBLIC
.
TEST
(
ID
,
XT
,
XD
,
XTS
)
VALUES
(
0
,
TIME
'00:00:00'
,
DATE
'0001-02-03'
,
TIMESTAMP
'0002-03-04 00:00:00'
);
>
INSERT
INTO
PUBLIC
.
TEST
(
ID
,
XT
,
XD
,
XTS
)
VALUES
(
1
,
TIME
'01:02:03'
,
DATE
'0004-05-06'
,
TIMESTAMP
'0007-08-09 00:01:02'
);
>
INSERT
INTO
PUBLIC
.
TEST
(
ID
,
XT
,
XD
,
XTS
)
VALUES
(
2
,
TIME
'23:59:59'
,
DATE
'1999-12-31'
,
TIMESTAMP
'1999-12-31 23:59:59.123456789'
);
>
INSERT
INTO
PUBLIC
.
TEST
(
ID
,
XT
,
XD
,
XTS
)
VALUES
(
NULL
,
NULL
,
NULL
,
NULL
);
>
INSERT
INTO
PUBLIC
.
TEST
VALUES
(
0
,
TIME
'00:00:00'
,
DATE
'0001-02-03'
,
TIMESTAMP
'0002-03-04 00:00:00'
);
>
INSERT
INTO
PUBLIC
.
TEST
VALUES
(
1
,
TIME
'01:02:03'
,
DATE
'0004-05-06'
,
TIMESTAMP
'0007-08-09 00:01:02'
);
>
INSERT
INTO
PUBLIC
.
TEST
VALUES
(
2
,
TIME
'23:59:59'
,
DATE
'1999-12-31'
,
TIMESTAMP
'1999-12-31 23:59:59.123456789'
);
>
INSERT
INTO
PUBLIC
.
TEST
VALUES
(
NULL
,
NULL
,
NULL
,
NULL
);
>
rows
:
7
DROP
TABLE
TEST
;
...
...
@@ -7268,7 +7268,7 @@ SCRIPT NOPASSWORDS NOSETTINGS;
>
CREATE
MEMORY
TABLE
PUBLIC
.
A_TEST
(
A_INT
INT
NOT
NULL
,
A_VARCHAR
VARCHAR
(
255
)
DEFAULT
'x'
,
A_DATE
DATE
,
A_DECIMAL
DECIMAL
(
10
,
2
)
);
>
CREATE
MEMORY
TABLE
PUBLIC
.
B_TEST
(
B_INT
INT
DEFAULT
-
1
NOT
NULL
,
B_VARCHAR
VARCHAR
(
255
)
DEFAULT
NULL
);
>
CREATE
USER
IF
NOT
EXISTS
SA
PASSWORD
''
ADMIN
;
>
INSERT
INTO
PUBLIC
.
B_TEST
(
B_INT
,
B_VARCHAR
)
VALUES
(
-
1
,
'XX'
);
>
INSERT
INTO
PUBLIC
.
B_TEST
VALUES
(
-
1
,
'XX'
);
>
rows
:
14
DROP
TABLE
A_TEST
;
...
...
@@ -7367,12 +7367,12 @@ SCRIPT SIMPLE NOPASSWORDS NOSETTINGS;
>
CREATE
MEMORY
TABLE
PUBLIC
.
FAMILY
(
ID
INT
,
NAME
VARCHAR
(
20
)
);
>
CREATE
MEMORY
TABLE
PUBLIC
.
PARENT
(
ID
INT
,
FAMILY_ID
INT
,
NAME
VARCHAR
(
20
)
);
>
CREATE
USER
IF
NOT
EXISTS
SA
PASSWORD
''
ADMIN
;
>
INSERT
INTO
PUBLIC
.
CHILD
(
ID
,
PARENTID
,
FAMILY_ID
,
NAME
)
VALUES
(
100
,
3
,
1
,
'Simon'
);
>
INSERT
INTO
PUBLIC
.
CHILD
(
ID
,
PARENTID
,
FAMILY_ID
,
NAME
)
VALUES
(
101
,
3
,
1
,
'Sabine'
);
>
INSERT
INTO
PUBLIC
.
CHILD
(
ID
,
PARENTID
,
FAMILY_ID
,
NAME
)
VALUES
(
200
,
NULL
,
NULL
,
'Jim'
);
>
INSERT
INTO
PUBLIC
.
CHILD
(
ID
,
PARENTID
,
FAMILY_ID
,
NAME
)
VALUES
(
201
,
NULL
,
NULL
,
'Johann'
);
>
INSERT
INTO
PUBLIC
.
FAMILY
(
ID
,
NAME
)
VALUES
(
1
,
'Capone'
);
>
INSERT
INTO
PUBLIC
.
PARENT
(
ID
,
FAMILY_ID
,
NAME
)
VALUES
(
3
,
1
,
'Sue'
);
>
INSERT
INTO
PUBLIC
.
CHILD
VALUES
(
100
,
3
,
1
,
'Simon'
);
>
INSERT
INTO
PUBLIC
.
CHILD
VALUES
(
101
,
3
,
1
,
'Sabine'
);
>
INSERT
INTO
PUBLIC
.
CHILD
VALUES
(
200
,
NULL
,
NULL
,
'Jim'
);
>
INSERT
INTO
PUBLIC
.
CHILD
VALUES
(
201
,
NULL
,
NULL
,
'Johann'
);
>
INSERT
INTO
PUBLIC
.
FAMILY
VALUES
(
1
,
'Capone'
);
>
INSERT
INTO
PUBLIC
.
PARENT
VALUES
(
3
,
1
,
'Sue'
);
>
rows
:
17
ALTER
TABLE
CHILD
DROP
CONSTRAINT
PARENT_CHILD
;
...
...
@@ -7391,12 +7391,12 @@ SCRIPT SIMPLE NOPASSWORDS NOSETTINGS;
>
CREATE
MEMORY
TABLE
PUBLIC
.
FAMILY
(
ID
INT
,
NAME
VARCHAR
(
20
)
);
>
CREATE
MEMORY
TABLE
PUBLIC
.
PARENT
(
ID
INT
,
FAMILY_ID
INT
,
NAME
VARCHAR
(
20
)
);
>
CREATE
USER
IF
NOT
EXISTS
SA
PASSWORD
''
ADMIN
;
>
INSERT
INTO
PUBLIC
.
CHILD
(
ID
,
PARENTID
,
FAMILY_ID
,
NAME
)
VALUES
(
100
,
3
,
1
,
'Simon'
);
>
INSERT
INTO
PUBLIC
.
CHILD
(
ID
,
PARENTID
,
FAMILY_ID
,
NAME
)
VALUES
(
101
,
3
,
1
,
'Sabine'
);
>
INSERT
INTO
PUBLIC
.
CHILD
(
ID
,
PARENTID
,
FAMILY_ID
,
NAME
)
VALUES
(
200
,
NULL
,
NULL
,
'Jim'
);
>
INSERT
INTO
PUBLIC
.
CHILD
(
ID
,
PARENTID
,
FAMILY_ID
,
NAME
)
VALUES
(
201
,
NULL
,
NULL
,
'Johann'
);
>
INSERT
INTO
PUBLIC
.
FAMILY
(
ID
,
NAME
)
VALUES
(
1
,
'Capone'
);
>
INSERT
INTO
PUBLIC
.
PARENT
(
ID
,
FAMILY_ID
,
NAME
)
VALUES
(
3
,
1
,
'Sue'
);
>
INSERT
INTO
PUBLIC
.
CHILD
VALUES
(
100
,
3
,
1
,
'Simon'
);
>
INSERT
INTO
PUBLIC
.
CHILD
VALUES
(
101
,
3
,
1
,
'Sabine'
);
>
INSERT
INTO
PUBLIC
.
CHILD
VALUES
(
200
,
NULL
,
NULL
,
'Jim'
);
>
INSERT
INTO
PUBLIC
.
CHILD
VALUES
(
201
,
NULL
,
NULL
,
'Johann'
);
>
INSERT
INTO
PUBLIC
.
FAMILY
VALUES
(
1
,
'Capone'
);
>
INSERT
INTO
PUBLIC
.
PARENT
VALUES
(
3
,
1
,
'Sue'
);
>
rows
:
16
DELETE
FROM
PARENT
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论