Fix alter error (#107)

koxudaxi · Mar 18, 2021 · e93498d · e93498d
1 parent 108a720
commit e93498d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/kotlin/local-data-api/src/com/koxudaxi/localDataApi/Application.kt b/kotlin/local-data-api/src/com/koxudaxi/localDataApi/Application.kt
@@ -94,11 +94,11 @@ fun Application.module(testing: Boolean = false) {
  )
  val executeStatementResponse = try {
  val statement = if (request.parameters == null) {
- resource.connection.prepareStatement(request.sql, Statement.RETURN_GENERATED_KEYS)
+ resource.connection.prepareStatementWithReturnGeneratedKeys(request.sql)
  } else {
  val parameters = Parameters.parse(request.sql)
  val statement =
- resource.connection.prepareStatement(parameters.sql, Statement.RETURN_GENERATED_KEYS)
+ resource.connection.prepareStatementWithReturnGeneratedKeys(parameters.sql)
  parameters.apply(statement, request.parameters.map { Pair(it.name, it.castValue) }.toMap())
  statement
  }
@@ -151,7 +151,7 @@ fun Application.module(testing: Boolean = false) {
  val batchExecuteStatementResponse = try {
  val parameters = Parameters.parse(request.sql)
  val statement =
- resource.connection.prepareStatement(parameters.sql, Statement.RETURN_GENERATED_KEYS)
+ resource.connection.prepareStatementWithReturnGeneratedKeys(parameters.sql)
 
  request.parameterSets.forEach { parameterSet ->
  parameters.apply(statement, parameterSet.map { Pair(it.name, it.castValue) }.toMap())

diff --git a/kotlin/local-data-api/src/com/koxudaxi/localDataApi/LocalDataApi.kt b/kotlin/local-data-api/src/com/koxudaxi/localDataApi/LocalDataApi.kt
@@ -1,8 +1,6 @@
 package com.koxudaxi.localDataApi
 
-import java.sql.ResultSet
-import java.sql.Statement
-import java.sql.Types
+import java.sql.*
 import java.util.*
 
 val LONG = listOf(Types.INTEGER, Types.TINYINT, Types.SMALLINT, Types.BIGINT)
@@ -58,6 +56,19 @@ val Statement.records: List<List<Field>>
  return records.toList()
  }
 
+fun isReturnGeneratedKeysType(sql: String): Boolean {
+ val match = Regex("^[^a-zA-Z]*([a-zA-Z]+)").find(sql) ?: return false
+ return match.destructured.component1().toUpperCase() in listOf("INSERT", "UPDATE", "DELETE")
+}
+
+fun Connection.prepareStatementWithReturnGeneratedKeys(sql: String): PreparedStatement {
+ return if (isReturnGeneratedKeysType(sql)) {
+ this.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)
+ } else {
+ this.prepareStatement(sql)
+ }
+}
+
 fun createColumnMetadata(resultSet: ResultSet): List<ColumnMetadata> {
  return resultSet.metaData.let {
  IntRange(1, resultSet.metaData.columnCount).map { index ->

diff --git a/kotlin/local-data-api/test/com/koxudaxi/localDataApi/LocalDataApiTest.kt b/kotlin/local-data-api/test/com/koxudaxi/localDataApi/LocalDataApiTest.kt
@@ -22,6 +22,18 @@ class LocalDataApiTest {
  assertEquals(listOf(Types.TIMESTAMP, Types.TIMESTAMP_WITH_TIMEZONE), DATETIME)
  }
 
+ @Test
+ fun testIsReturnGeneratedKeysType() {
+ assertEquals( false, isReturnGeneratedKeysType("selEct 1"))
+ assertEquals( false, isReturnGeneratedKeysType(" selEct 1"))
+ assertEquals( true, isReturnGeneratedKeysType(" insert 1"))
+ assertEquals( true, isReturnGeneratedKeysType(" Update 1"))
+ assertEquals( true, isReturnGeneratedKeysType(" DELETE 1"))
+ assertEquals( false, isReturnGeneratedKeysType(" CREATE 1"))
+ assertEquals( false, isReturnGeneratedKeysType(" ;"))
+ assertEquals( false, isReturnGeneratedKeysType(""))
+ }
+
  @Test
  fun testMySQL() {
  mockkStatic(System::class)