Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
1dd4130d
提交
1dd4130d
authored
5月 21, 2016
作者:
lukaseder
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[#285] Add support for ALTER TABLE IF EXISTS
上级
5e7df467
全部展开
显示空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
424 行增加
和
107 行删除
+424
-107
Parser.java
h2/src/main/org/h2/command/Parser.java
+107
-68
AlterTableAddConstraint.java
h2/src/main/org/h2/command/ddl/AlterTableAddConstraint.java
+12
-1
AlterTableAlterColumn.java
h2/src/main/org/h2/command/ddl/AlterTableAlterColumn.java
+36
-24
AlterTableRename.java
h2/src/main/org/h2/command/ddl/AlterTableRename.java
+15
-3
AlterTableRenameColumn.java
h2/src/main/org/h2/command/ddl/AlterTableRenameColumn.java
+25
-9
CreateIndex.java
h2/src/main/org/h2/command/ddl/CreateIndex.java
+12
-1
AlterTableSet.java
h2/src/main/org/h2/command/dml/AlterTableSet.java
+13
-1
testScript.sql
h2/src/test/org/h2/test/testScript.sql
+204
-0
没有找到文件。
h2/src/main/org/h2/command/Parser.java
浏览文件 @
1dd4130d
差异被折叠。
点击展开。
h2/src/main/org/h2/command/ddl/AlterTableAddConstraint.java
浏览文件 @
1dd4130d
...
@@ -49,6 +49,7 @@ public class AlterTableAddConstraint extends SchemaCommand {
...
@@ -49,6 +49,7 @@ public class AlterTableAddConstraint extends SchemaCommand {
private
String
comment
;
private
String
comment
;
private
boolean
checkExisting
;
private
boolean
checkExisting
;
private
boolean
primaryKeyHash
;
private
boolean
primaryKeyHash
;
private
boolean
ifTableExists
;
private
final
boolean
ifNotExists
;
private
final
boolean
ifNotExists
;
private
ArrayList
<
Index
>
createdIndexes
=
New
.
arrayList
();
private
ArrayList
<
Index
>
createdIndexes
=
New
.
arrayList
();
...
@@ -58,6 +59,10 @@ public class AlterTableAddConstraint extends SchemaCommand {
...
@@ -58,6 +59,10 @@ public class AlterTableAddConstraint extends SchemaCommand {
this
.
ifNotExists
=
ifNotExists
;
this
.
ifNotExists
=
ifNotExists
;
}
}
public
void
setIfTableExists
(
boolean
b
)
{
ifTableExists
=
b
;
}
private
String
generateConstraintName
(
Table
table
)
{
private
String
generateConstraintName
(
Table
table
)
{
if
(
constraintName
==
null
)
{
if
(
constraintName
==
null
)
{
constraintName
=
getSchema
().
getUniqueConstraintName
(
constraintName
=
getSchema
().
getUniqueConstraintName
(
...
@@ -90,7 +95,13 @@ public class AlterTableAddConstraint extends SchemaCommand {
...
@@ -90,7 +95,13 @@ public class AlterTableAddConstraint extends SchemaCommand {
session
.
commit
(
true
);
session
.
commit
(
true
);
}
}
Database
db
=
session
.
getDatabase
();
Database
db
=
session
.
getDatabase
();
Table
table
=
getSchema
().
getTableOrView
(
session
,
tableName
);
Table
table
=
getSchema
().
findTableOrView
(
session
,
tableName
);
if
(
table
==
null
)
{
if
(
ifTableExists
)
{
return
0
;
}
throw
DbException
.
get
(
ErrorCode
.
TABLE_OR_VIEW_NOT_FOUND_1
,
tableName
);
}
if
(
getSchema
().
findConstraint
(
session
,
constraintName
)
!=
null
)
{
if
(
getSchema
().
findConstraint
(
session
,
constraintName
)
!=
null
)
{
if
(
ifNotExists
)
{
if
(
ifNotExists
)
{
return
0
;
return
0
;
...
...
h2/src/main/org/h2/command/ddl/AlterTableAlterColumn.java
浏览文件 @
1dd4130d
...
@@ -48,7 +48,7 @@ import org.h2.util.New;
...
@@ -48,7 +48,7 @@ import org.h2.util.New;
*/
*/
public
class
AlterTableAlterColumn
extends
SchemaCommand
{
public
class
AlterTableAlterColumn
extends
SchemaCommand
{
private
Table
tabl
e
;
private
String
tableNam
e
;
private
Column
oldColumn
;
private
Column
oldColumn
;
private
Column
newColumn
;
private
Column
newColumn
;
private
int
type
;
private
int
type
;
...
@@ -56,6 +56,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -56,6 +56,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
private
Expression
newSelectivity
;
private
Expression
newSelectivity
;
private
String
addBefore
;
private
String
addBefore
;
private
String
addAfter
;
private
String
addAfter
;
private
boolean
ifTableExists
;
private
boolean
ifNotExists
;
private
boolean
ifNotExists
;
private
ArrayList
<
Column
>
columnsToAdd
;
private
ArrayList
<
Column
>
columnsToAdd
;
private
ArrayList
<
Column
>
columnsToRemove
;
private
ArrayList
<
Column
>
columnsToRemove
;
...
@@ -64,8 +65,12 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -64,8 +65,12 @@ public class AlterTableAlterColumn extends SchemaCommand {
super
(
session
,
schema
);
super
(
session
,
schema
);
}
}
public
void
setTable
(
Table
table
)
{
public
void
setIfTableExists
(
boolean
b
)
{
this
.
table
=
table
;
ifTableExists
=
b
;
}
public
void
setTableName
(
String
tableName
)
{
this
.
tableName
=
tableName
;
}
}
public
void
setOldColumn
(
Column
oldColumn
)
{
public
void
setOldColumn
(
Column
oldColumn
)
{
...
@@ -84,16 +89,23 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -84,16 +89,23 @@ public class AlterTableAlterColumn extends SchemaCommand {
public
int
update
()
{
public
int
update
()
{
session
.
commit
(
true
);
session
.
commit
(
true
);
Database
db
=
session
.
getDatabase
();
Database
db
=
session
.
getDatabase
();
Table
table
=
getSchema
().
findTableOrView
(
session
,
tableName
);
if
(
table
==
null
)
{
if
(
ifTableExists
)
{
return
0
;
}
throw
DbException
.
get
(
ErrorCode
.
TABLE_OR_VIEW_NOT_FOUND_1
,
tableName
);
}
session
.
getUser
().
checkRight
(
table
,
Right
.
ALL
);
session
.
getUser
().
checkRight
(
table
,
Right
.
ALL
);
table
.
checkSupportAlter
();
table
.
checkSupportAlter
();
table
.
lock
(
session
,
true
,
true
);
table
.
lock
(
session
,
true
,
true
);
if
(
newColumn
!=
null
)
{
if
(
newColumn
!=
null
)
{
checkDefaultReferencesTable
(
newColumn
.
getDefaultExpression
());
checkDefaultReferencesTable
(
table
,
newColumn
.
getDefaultExpression
());
checkClustering
(
newColumn
);
checkClustering
(
newColumn
);
}
}
if
(
columnsToAdd
!=
null
)
{
if
(
columnsToAdd
!=
null
)
{
for
(
Column
column
:
columnsToAdd
)
{
for
(
Column
column
:
columnsToAdd
)
{
checkDefaultReferencesTable
(
column
.
getDefaultExpression
());
checkDefaultReferencesTable
(
table
,
column
.
getDefaultExpression
());
checkClustering
(
column
);
checkClustering
(
column
);
}
}
}
}
...
@@ -103,7 +115,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -103,7 +115,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
// no change
// no change
break
;
break
;
}
}
checkNoNullValues
();
checkNoNullValues
(
table
);
oldColumn
.
setNullable
(
false
);
oldColumn
.
setNullable
(
false
);
db
.
updateMeta
(
session
,
table
);
db
.
updateMeta
(
session
,
table
);
break
;
break
;
...
@@ -113,17 +125,17 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -113,17 +125,17 @@ public class AlterTableAlterColumn extends SchemaCommand {
// no change
// no change
break
;
break
;
}
}
checkNullable
();
checkNullable
(
table
);
oldColumn
.
setNullable
(
true
);
oldColumn
.
setNullable
(
true
);
db
.
updateMeta
(
session
,
table
);
db
.
updateMeta
(
session
,
table
);
break
;
break
;
}
}
case
CommandInterface
.
ALTER_TABLE_ALTER_COLUMN_DEFAULT
:
{
case
CommandInterface
.
ALTER_TABLE_ALTER_COLUMN_DEFAULT
:
{
Sequence
sequence
=
oldColumn
==
null
?
null
:
oldColumn
.
getSequence
();
Sequence
sequence
=
oldColumn
==
null
?
null
:
oldColumn
.
getSequence
();
checkDefaultReferencesTable
(
defaultExpression
);
checkDefaultReferencesTable
(
table
,
defaultExpression
);
oldColumn
.
setSequence
(
null
);
oldColumn
.
setSequence
(
null
);
oldColumn
.
setDefaultExpression
(
session
,
defaultExpression
);
oldColumn
.
setDefaultExpression
(
session
,
defaultExpression
);
removeSequence
(
sequence
);
removeSequence
(
table
,
sequence
);
db
.
updateMeta
(
session
,
table
);
db
.
updateMeta
(
session
,
table
);
break
;
break
;
}
}
...
@@ -132,7 +144,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -132,7 +144,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
// need to copy the table because the length is only a constraint,
// need to copy the table because the length is only a constraint,
// and does not affect the storage structure.
// and does not affect the storage structure.
if
(
oldColumn
.
isWideningConversion
(
newColumn
))
{
if
(
oldColumn
.
isWideningConversion
(
newColumn
))
{
convertAutoIncrementColumn
(
newColumn
);
convertAutoIncrementColumn
(
table
,
newColumn
);
oldColumn
.
copy
(
newColumn
);
oldColumn
.
copy
(
newColumn
);
db
.
updateMeta
(
session
,
table
);
db
.
updateMeta
(
session
,
table
);
}
else
{
}
else
{
...
@@ -140,12 +152,12 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -140,12 +152,12 @@ public class AlterTableAlterColumn extends SchemaCommand {
oldColumn
.
setDefaultExpression
(
session
,
null
);
oldColumn
.
setDefaultExpression
(
session
,
null
);
oldColumn
.
setConvertNullToDefault
(
false
);
oldColumn
.
setConvertNullToDefault
(
false
);
if
(
oldColumn
.
isNullable
()
&&
!
newColumn
.
isNullable
())
{
if
(
oldColumn
.
isNullable
()
&&
!
newColumn
.
isNullable
())
{
checkNoNullValues
();
checkNoNullValues
(
table
);
}
else
if
(!
oldColumn
.
isNullable
()
&&
newColumn
.
isNullable
())
{
}
else
if
(!
oldColumn
.
isNullable
()
&&
newColumn
.
isNullable
())
{
checkNullable
();
checkNullable
(
table
);
}
}
convertAutoIncrementColumn
(
newColumn
);
convertAutoIncrementColumn
(
table
,
newColumn
);
copyData
();
copyData
(
table
);
}
}
break
;
break
;
}
}
...
@@ -162,7 +174,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -162,7 +174,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
table
.
isTemporary
());
table
.
isTemporary
());
}
}
}
}
copyData
();
copyData
(
table
);
break
;
break
;
}
}
case
CommandInterface
.
ALTER_TABLE_DROP_COLUMN
:
{
case
CommandInterface
.
ALTER_TABLE_DROP_COLUMN
:
{
...
@@ -171,7 +183,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -171,7 +183,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
columnsToRemove
.
get
(
0
).
getSQL
());
columnsToRemove
.
get
(
0
).
getSQL
());
}
}
table
.
dropMultipleColumnsConstraintsAndIndexes
(
session
,
columnsToRemove
);
table
.
dropMultipleColumnsConstraintsAndIndexes
(
session
,
columnsToRemove
);
copyData
();
copyData
(
table
);
break
;
break
;
}
}
case
CommandInterface
.
ALTER_TABLE_ALTER_COLUMN_SELECTIVITY
:
{
case
CommandInterface
.
ALTER_TABLE_ALTER_COLUMN_SELECTIVITY
:
{
...
@@ -186,7 +198,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -186,7 +198,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
return
0
;
return
0
;
}
}
private
void
checkDefaultReferencesTable
(
Expression
defaultExpression
)
{
private
void
checkDefaultReferencesTable
(
Table
table
,
Expression
defaultExpression
)
{
if
(
defaultExpression
==
null
)
{
if
(
defaultExpression
==
null
)
{
return
;
return
;
}
}
...
@@ -209,7 +221,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -209,7 +221,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
}
}
}
}
private
void
convertAutoIncrementColumn
(
Column
c
)
{
private
void
convertAutoIncrementColumn
(
Table
table
,
Column
c
)
{
if
(
c
.
isAutoIncrement
())
{
if
(
c
.
isAutoIncrement
())
{
if
(
c
.
isPrimaryKey
())
{
if
(
c
.
isPrimaryKey
())
{
c
.
setOriginalSQL
(
"IDENTITY"
);
c
.
setOriginalSQL
(
"IDENTITY"
);
...
@@ -221,7 +233,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -221,7 +233,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
}
}
}
}
private
void
removeSequence
(
Sequence
sequence
)
{
private
void
removeSequence
(
Table
table
,
Sequence
sequence
)
{
if
(
sequence
!=
null
)
{
if
(
sequence
!=
null
)
{
table
.
removeSequence
(
sequence
);
table
.
removeSequence
(
sequence
);
sequence
.
setBelongsToTable
(
false
);
sequence
.
setBelongsToTable
(
false
);
...
@@ -230,7 +242,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -230,7 +242,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
}
}
}
}
private
void
copyData
()
{
private
void
copyData
(
Table
table
)
{
if
(
table
.
isTemporary
())
{
if
(
table
.
isTemporary
())
{
throw
DbException
.
getUnsupportedException
(
"TEMP TABLE"
);
throw
DbException
.
getUnsupportedException
(
"TEMP TABLE"
);
}
}
...
@@ -239,7 +251,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -239,7 +251,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
String
tempName
=
db
.
getTempTableName
(
baseName
,
session
);
String
tempName
=
db
.
getTempTableName
(
baseName
,
session
);
Column
[]
columns
=
table
.
getColumns
();
Column
[]
columns
=
table
.
getColumns
();
ArrayList
<
Column
>
newColumns
=
New
.
arrayList
();
ArrayList
<
Column
>
newColumns
=
New
.
arrayList
();
Table
newTable
=
cloneTableStructure
(
columns
,
db
,
tempName
,
newColumns
);
Table
newTable
=
cloneTableStructure
(
table
,
columns
,
db
,
tempName
,
newColumns
);
try
{
try
{
// check if a view would become invalid
// check if a view would become invalid
// (because the column to drop is referenced or so)
// (because the column to drop is referenced or so)
...
@@ -289,7 +301,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -289,7 +301,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
}
}
}
}
private
Table
cloneTableStructure
(
Column
[]
columns
,
Database
db
,
private
Table
cloneTableStructure
(
Table
table
,
Column
[]
columns
,
Database
db
,
String
tempName
,
ArrayList
<
Column
>
newColumns
)
{
String
tempName
,
ArrayList
<
Column
>
newColumns
)
{
for
(
Column
col
:
columns
)
{
for
(
Column
col
:
columns
)
{
newColumns
.
add
(
col
.
getClone
());
newColumns
.
add
(
col
.
getClone
());
...
@@ -479,7 +491,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -479,7 +491,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
}
}
}
}
private
void
checkNullable
()
{
private
void
checkNullable
(
Table
table
)
{
for
(
Index
index
:
table
.
getIndexes
())
{
for
(
Index
index
:
table
.
getIndexes
())
{
if
(
index
.
getColumnIndex
(
oldColumn
)
<
0
)
{
if
(
index
.
getColumnIndex
(
oldColumn
)
<
0
)
{
continue
;
continue
;
...
@@ -492,7 +504,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
...
@@ -492,7 +504,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
}
}
}
}
private
void
checkNoNullValues
()
{
private
void
checkNoNullValues
(
Table
table
)
{
String
sql
=
"SELECT COUNT(*) FROM "
+
String
sql
=
"SELECT COUNT(*) FROM "
+
table
.
getSQL
()
+
" WHERE "
+
table
.
getSQL
()
+
" WHERE "
+
oldColumn
.
getSQL
()
+
" IS NULL"
;
oldColumn
.
getSQL
()
+
" IS NULL"
;
...
...
h2/src/main/org/h2/command/ddl/AlterTableRename.java
浏览文件 @
1dd4130d
...
@@ -20,7 +20,8 @@ import org.h2.table.Table;
...
@@ -20,7 +20,8 @@ import org.h2.table.Table;
*/
*/
public
class
AlterTableRename
extends
SchemaCommand
{
public
class
AlterTableRename
extends
SchemaCommand
{
private
Table
oldTable
;
private
boolean
ifTableExists
;
private
String
oldTableName
;
private
String
newTableName
;
private
String
newTableName
;
private
boolean
hidden
;
private
boolean
hidden
;
...
@@ -28,8 +29,12 @@ public class AlterTableRename extends SchemaCommand {
...
@@ -28,8 +29,12 @@ public class AlterTableRename extends SchemaCommand {
super
(
session
,
schema
);
super
(
session
,
schema
);
}
}
public
void
setOldTable
(
Table
table
)
{
public
void
setIfTableExists
(
boolean
b
)
{
oldTable
=
table
;
ifTableExists
=
b
;
}
public
void
setOldTableName
(
String
name
)
{
oldTableName
=
name
;
}
}
public
void
setNewTableName
(
String
name
)
{
public
void
setNewTableName
(
String
name
)
{
...
@@ -40,6 +45,13 @@ public class AlterTableRename extends SchemaCommand {
...
@@ -40,6 +45,13 @@ public class AlterTableRename extends SchemaCommand {
public
int
update
()
{
public
int
update
()
{
session
.
commit
(
true
);
session
.
commit
(
true
);
Database
db
=
session
.
getDatabase
();
Database
db
=
session
.
getDatabase
();
Table
oldTable
=
getSchema
().
findTableOrView
(
session
,
oldTableName
);
if
(
oldTable
==
null
)
{
if
(
ifTableExists
)
{
return
0
;
}
throw
DbException
.
get
(
ErrorCode
.
TABLE_OR_VIEW_NOT_FOUND_1
,
oldTableName
);
}
session
.
getUser
().
checkRight
(
oldTable
,
Right
.
ALL
);
session
.
getUser
().
checkRight
(
oldTable
,
Right
.
ALL
);
Table
t
=
getSchema
().
findTableOrView
(
session
,
newTableName
);
Table
t
=
getSchema
().
findTableOrView
(
session
,
newTableName
);
if
(
t
!=
null
&&
hidden
&&
newTableName
.
equals
(
oldTable
.
getName
()))
{
if
(
t
!=
null
&&
hidden
&&
newTableName
.
equals
(
oldTable
.
getName
()))
{
...
...
h2/src/main/org/h2/command/ddl/AlterTableRenameColumn.java
浏览文件 @
1dd4130d
...
@@ -5,12 +5,15 @@
...
@@ -5,12 +5,15 @@
*/
*/
package
org
.
h2
.
command
.
ddl
;
package
org
.
h2
.
command
.
ddl
;
import
org.h2.api.ErrorCode
;
import
org.h2.command.CommandInterface
;
import
org.h2.command.CommandInterface
;
import
org.h2.engine.Database
;
import
org.h2.engine.Database
;
import
org.h2.engine.DbObject
;
import
org.h2.engine.DbObject
;
import
org.h2.engine.Right
;
import
org.h2.engine.Right
;
import
org.h2.engine.Session
;
import
org.h2.engine.Session
;
import
org.h2.expression.Expression
;
import
org.h2.expression.Expression
;
import
org.h2.message.DbException
;
import
org.h2.schema.Schema
;
import
org.h2.table.Column
;
import
org.h2.table.Column
;
import
org.h2.table.Table
;
import
org.h2.table.Table
;
...
@@ -18,22 +21,27 @@ import org.h2.table.Table;
...
@@ -18,22 +21,27 @@ import org.h2.table.Table;
* This class represents the statement
* This class represents the statement
* ALTER TABLE ALTER COLUMN RENAME
* ALTER TABLE ALTER COLUMN RENAME
*/
*/
public
class
AlterTableRenameColumn
extends
Define
Command
{
public
class
AlterTableRenameColumn
extends
Schema
Command
{
private
Table
table
;
private
boolean
ifTableExists
;
private
Column
column
;
private
String
tableName
;
private
String
oldName
;
private
String
newName
;
private
String
newName
;
public
AlterTableRenameColumn
(
Session
session
)
{
public
AlterTableRenameColumn
(
Session
session
,
Schema
schema
)
{
super
(
session
);
super
(
session
,
schema
);
}
}
public
void
set
Table
(
Table
table
)
{
public
void
set
IfTableExists
(
boolean
b
)
{
this
.
table
=
table
;
this
.
ifTableExists
=
b
;
}
}
public
void
setColumn
(
Column
column
)
{
public
void
setTableName
(
String
tableName
)
{
this
.
column
=
column
;
this
.
tableName
=
tableName
;
}
public
void
setOldColumnName
(
String
oldName
)
{
this
.
oldName
=
oldName
;
}
}
public
void
setNewColumnName
(
String
newName
)
{
public
void
setNewColumnName
(
String
newName
)
{
...
@@ -44,6 +52,14 @@ public class AlterTableRenameColumn extends DefineCommand {
...
@@ -44,6 +52,14 @@ public class AlterTableRenameColumn extends DefineCommand {
public
int
update
()
{
public
int
update
()
{
session
.
commit
(
true
);
session
.
commit
(
true
);
Database
db
=
session
.
getDatabase
();
Database
db
=
session
.
getDatabase
();
Table
table
=
getSchema
().
findTableOrView
(
session
,
tableName
);
if
(
table
==
null
)
{
if
(
ifTableExists
)
{
return
0
;
}
throw
DbException
.
get
(
ErrorCode
.
TABLE_OR_VIEW_NOT_FOUND_1
,
tableName
);
}
Column
column
=
table
.
getColumn
(
oldName
);
session
.
getUser
().
checkRight
(
table
,
Right
.
ALL
);
session
.
getUser
().
checkRight
(
table
,
Right
.
ALL
);
table
.
checkSupportAlter
();
table
.
checkSupportAlter
();
// we need to update CHECK constraint
// we need to update CHECK constraint
...
...
h2/src/main/org/h2/command/ddl/CreateIndex.java
浏览文件 @
1dd4130d
...
@@ -27,6 +27,7 @@ public class CreateIndex extends SchemaCommand {
...
@@ -27,6 +27,7 @@ public class CreateIndex extends SchemaCommand {
private
String
indexName
;
private
String
indexName
;
private
IndexColumn
[]
indexColumns
;
private
IndexColumn
[]
indexColumns
;
private
boolean
primaryKey
,
unique
,
hash
,
spatial
;
private
boolean
primaryKey
,
unique
,
hash
,
spatial
;
private
boolean
ifTableExists
;
private
boolean
ifNotExists
;
private
boolean
ifNotExists
;
private
String
comment
;
private
String
comment
;
...
@@ -34,6 +35,10 @@ public class CreateIndex extends SchemaCommand {
...
@@ -34,6 +35,10 @@ public class CreateIndex extends SchemaCommand {
super
(
session
,
schema
);
super
(
session
,
schema
);
}
}
public
void
setIfTableExists
(
boolean
b
)
{
this
.
ifTableExists
=
b
;
}
public
void
setIfNotExists
(
boolean
ifNotExists
)
{
public
void
setIfNotExists
(
boolean
ifNotExists
)
{
this
.
ifNotExists
=
ifNotExists
;
this
.
ifNotExists
=
ifNotExists
;
}
}
...
@@ -57,7 +62,13 @@ public class CreateIndex extends SchemaCommand {
...
@@ -57,7 +62,13 @@ public class CreateIndex extends SchemaCommand {
}
}
Database
db
=
session
.
getDatabase
();
Database
db
=
session
.
getDatabase
();
boolean
persistent
=
db
.
isPersistent
();
boolean
persistent
=
db
.
isPersistent
();
Table
table
=
getSchema
().
getTableOrView
(
session
,
tableName
);
Table
table
=
getSchema
().
findTableOrView
(
session
,
tableName
);
if
(
table
==
null
)
{
if
(
ifTableExists
)
{
return
0
;
}
throw
DbException
.
get
(
ErrorCode
.
TABLE_OR_VIEW_NOT_FOUND_1
,
tableName
);
}
if
(
getSchema
().
findIndex
(
session
,
indexName
)
!=
null
)
{
if
(
getSchema
().
findIndex
(
session
,
indexName
)
!=
null
)
{
if
(
ifNotExists
)
{
if
(
ifNotExists
)
{
return
0
;
return
0
;
...
...
h2/src/main/org/h2/command/dml/AlterTableSet.java
浏览文件 @
1dd4130d
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
*/
*/
package
org
.
h2
.
command
.
dml
;
package
org
.
h2
.
command
.
dml
;
import
org.h2.api.ErrorCode
;
import
org.h2.command.CommandInterface
;
import
org.h2.command.CommandInterface
;
import
org.h2.command.ddl.SchemaCommand
;
import
org.h2.command.ddl.SchemaCommand
;
import
org.h2.engine.Right
;
import
org.h2.engine.Right
;
...
@@ -19,6 +20,7 @@ import org.h2.table.Table;
...
@@ -19,6 +20,7 @@ import org.h2.table.Table;
*/
*/
public
class
AlterTableSet
extends
SchemaCommand
{
public
class
AlterTableSet
extends
SchemaCommand
{
private
boolean
ifTableExists
;
private
String
tableName
;
private
String
tableName
;
private
final
int
type
;
private
final
int
type
;
...
@@ -40,13 +42,23 @@ public class AlterTableSet extends SchemaCommand {
...
@@ -40,13 +42,23 @@ public class AlterTableSet extends SchemaCommand {
return
true
;
return
true
;
}
}
public
void
setIfTableExists
(
boolean
b
)
{
this
.
ifTableExists
=
b
;
}
public
void
setTableName
(
String
tableName
)
{
public
void
setTableName
(
String
tableName
)
{
this
.
tableName
=
tableName
;
this
.
tableName
=
tableName
;
}
}
@Override
@Override
public
int
update
()
{
public
int
update
()
{
Table
table
=
getSchema
().
getTableOrView
(
session
,
tableName
);
Table
table
=
getSchema
().
findTableOrView
(
session
,
tableName
);
if
(
table
==
null
)
{
if
(
ifTableExists
)
{
return
0
;
}
throw
DbException
.
get
(
ErrorCode
.
TABLE_OR_VIEW_NOT_FOUND_1
,
tableName
);
}
session
.
getUser
().
checkRight
(
table
,
Right
.
ALL
);
session
.
getUser
().
checkRight
(
table
,
Right
.
ALL
);
table
.
lock
(
session
,
true
,
true
);
table
.
lock
(
session
,
true
,
true
);
switch
(
type
)
{
switch
(
type
)
{
...
...
h2/src/test/org/h2/test/testScript.sql
浏览文件 @
1dd4130d
...
@@ -10227,3 +10227,207 @@ select 0 from ((
...
@@ -10227,3 +10227,207 @@ select 0 from ((
>
rows
:
0
>
rows
:
0
}
;
}
;
>
update
count
:
0
>
update
count
:
0
create
table
x
(
id
int
not
null
);
>
ok
alter
table
if
exists
y
add
column
a
varchar
;
>
ok
alter
table
if
exists
x
add
column
a
varchar
;
>
ok
alter
table
if
exists
x
add
column
a
varchar
;
>
exception
alter
table
if
exists
y
alter
column
a
rename
to
b
;
>
ok
alter
table
if
exists
x
alter
column
a
rename
to
b
;
>
ok
alter
table
if
exists
x
alter
column
a
rename
to
b
;
>
exception
alter
table
if
exists
y
alter
column
b
set
default
'a'
;
>
ok
alter
table
if
exists
x
alter
column
b
set
default
'a'
;
>
ok
insert
into
x
(
id
)
values
(
1
);
>
update
count
:
1
select
b
from
x
;
>
B
>
-
>
a
>
rows
:
1
delete
from
x
;
>
update
count
:
1
alter
table
if
exists
y
alter
column
b
drop
default
;
>
ok
alter
table
if
exists
x
alter
column
b
drop
default
;
>
ok
alter
table
if
exists
y
alter
column
b
set
not
null
;
>
ok
alter
table
if
exists
x
alter
column
b
set
not
null
;
>
ok
insert
into
x
(
id
)
values
(
1
);
>
exception
alter
table
if
exists
y
alter
column
b
drop
not
null
;
>
ok
alter
table
if
exists
x
alter
column
b
drop
not
null
;
>
ok
insert
into
x
(
id
)
values
(
1
);
>
update
count
:
1
select
b
from
x
;
>
B
>
----
>
null
>
rows
:
1
delete
from
x
;
>
update
count
:
1
alter
table
if
exists
y
add
constraint
x_pk
primary
key
(
id
);
>
ok
alter
table
if
exists
x
add
constraint
x_pk
primary
key
(
id
);
>
ok
alter
table
if
exists
x
add
constraint
x_pk
primary
key
(
id
);
>
exception
insert
into
x
(
id
)
values
(
1
);
>
update
count
:
1
insert
into
x
(
id
)
values
(
1
);
>
exception
delete
from
x
;
>
update
count
:
1
alter
table
if
exists
y
add
constraint
x_chk
check
(
b
=
'a'
);
>
ok
alter
table
if
exists
x
add
constraint
x_chk
check
(
b
=
'a'
);
>
ok
alter
table
if
exists
x
add
constraint
x_chk
check
(
b
=
'a'
);
>
exception
insert
into
x
(
id
,
b
)
values
(
1
,
'b'
);
>
exception
alter
table
if
exists
y
rename
constraint
x_chk
to
x_chk1
;
>
ok
alter
table
if
exists
x
rename
constraint
x_chk
to
x_chk1
;
>
ok
alter
table
if
exists
x
rename
constraint
x_chk
to
x_chk1
;
>
exception
alter
table
if
exists
y
drop
constraint
x_chk1
;
>
ok
alter
table
if
exists
x
drop
constraint
x_chk1
;
>
ok
alter
table
if
exists
y
rename
to
z
;
>
ok
alter
table
if
exists
x
rename
to
z
;
>
ok
alter
table
if
exists
x
rename
to
z
;
>
ok
insert
into
z
(
id
,
b
)
values
(
1
,
'b'
);
>
update
count
:
1
delete
from
z
;
>
update
count
:
1
alter
table
if
exists
y
add
constraint
z_uk
unique
(
b
);
>
ok
alter
table
if
exists
z
add
constraint
z_uk
unique
(
b
);
>
ok
alter
table
if
exists
z
add
constraint
z_uk
unique
(
b
);
>
exception
insert
into
z
(
id
,
b
)
values
(
1
,
'b'
);
>
update
count
:
1
insert
into
z
(
id
,
b
)
values
(
1
,
'b'
);
>
exception
delete
from
z
;
>
update
count
:
1
alter
table
if
exists
y
drop
column
b
;
>
ok
alter
table
if
exists
z
drop
column
b
;
>
ok
alter
table
if
exists
z
drop
column
b
;
>
exception
alter
table
if
exists
y
drop
primary
key
;
>
ok
alter
table
if
exists
z
drop
primary
key
;
>
ok
alter
table
if
exists
z
drop
primary
key
;
>
exception
create
table
x
(
id
int
not
null
primary
key
);
>
ok
alter
table
if
exists
y
add
constraint
z_fk
foreign
key
(
id
)
references
x
(
id
);
>
ok
alter
table
if
exists
z
add
constraint
z_fk
foreign
key
(
id
)
references
x
(
id
);
>
ok
alter
table
if
exists
z
add
constraint
z_fk
foreign
key
(
id
)
references
x
(
id
);
>
exception
insert
into
z
(
id
)
values
(
1
);
>
exception
alter
table
if
exists
y
drop
foreign
key
z_fk
;
>
ok
alter
table
if
exists
z
drop
foreign
key
z_fk
;
>
ok
alter
table
if
exists
z
drop
foreign
key
z_fk
;
>
exception
insert
into
z
(
id
)
values
(
1
);
>
update
count
:
1
delete
from
z
;
>
update
count
:
1
drop
table
x
;
>
ok
drop
table
z
;
>
ok
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论