Skip to content

Commit 46adcc3

Browse files
committed
ActionInsert允许插入空值
1 parent 3aaf187 commit 46adcc3

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

module/database/src/main/kotlin/taboolib/module/database/ActionInsert.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ActionInsert(val table: String, val keys: Array<String>) : Action {
1515
private var finallyCallback: (PreparedStatement.(Connection) -> Unit)? = null
1616

1717
/** 插入值 */
18-
private var values = ArrayList<Array<Any>>()
18+
private var values = ArrayList<Array<Any?>>()
1919

2020
/** 重复时更新 */
2121
private var duplicateUpdate = ArrayList<UpdateOperation>()
@@ -37,26 +37,26 @@ class ActionInsert(val table: String, val keys: Array<String>) : Action {
3737
}.build()
3838

3939
/** 元素 */
40-
override val elements: List<Any>
40+
override val elements: List<Any?>
4141
get() {
42-
val el = ArrayList<Any>()
42+
val el = ArrayList<Any?>()
4343
el.addAll(values.flatMap { it.toList() })
4444
el.addAll(duplicateUpdate.mapNotNull { it.value })
4545
return el
4646
}
4747

4848
/** 插入值 */
49-
fun value(vararg args: Any) {
49+
fun value(vararg args: Any?) {
5050
values.add(arrayOf(*args))
5151
}
5252

5353
/** 插入值 */
54-
fun values(args: Array<Any>) {
54+
fun values(args: Array<Any?>) {
5555
values.add(args)
5656
}
5757

5858
/** 插入值 */
59-
fun values(args: List<Any>) {
59+
fun values(args: List<Any?>) {
6060
values.add(args.toTypedArray())
6161
}
6262

module/database/src/main/kotlin/taboolib/module/database/Attributes.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ interface Attributes {
1212
val query: String
1313

1414
/** 占位符对应的元素 */
15-
val elements: List<Any>
15+
val elements: List<Any?>
1616
get() = emptyList()
1717
}

module/database/src/main/kotlin/taboolib/module/database/Statement.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class Statement {
7171
}
7272

7373
/** 追加值 */
74-
fun addValues(values: List<Array<Any>>): Statement {
74+
fun addValues(values: List<Array<Any?>>): Statement {
7575
query += values.joinToString { "(${it.joinToString { "?" }})" }
7676
return this
7777
}

0 commit comments

Comments
 (0)