Skip to content
This repository has been archived by the owner on Jul 12, 2022. It is now read-only.

Hotfix/fix condiguration delete validation #1239

Merged
merged 2 commits into from
May 17, 2021
Merged

Hotfix/fix condiguration delete validation #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45bc54a
fixing query
barbararochazup May 14, 2021
12470dc
Merge branch 'charlescd-release-1.0.0' of https://github.com/ZupIT/ch…
barbararochazup May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .../src/main/kotlin/io/charlescd/moove/infrastructure/repository/JdbcDeploymentRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,13 @@ class JdbcDeploymentRepository(
) { resultSet, _ ->
resultSet.getInt(1)
}

return count != null && count >= 1
}

private fun createParametersArray(param: String?): Array<Any> {
val parameters = ArrayList<Any>()
param?.let { parameters.add("%$param%") }
param?.let { parameters.add("$param") }
return parameters.toTypedArray()
}

Expand Down
4 changes: 2 additions & 2 deletions ...e/src/main/kotlin/io/charlescd/moove/infrastructure/repository/JdbcWorkspaceRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class JdbcWorkspaceRepository(
return parameters
}

private fun createParametersArray(param: String?): Array<Any> {
private fun createParametersArrayILikeQuery(param: String?): Array<Any> {
val parameters = ArrayList<Any>()
param?.let { parameters.add("%$param%") }
return parameters.toTypedArray()
Expand All @@ -197,7 +197,7 @@ class JdbcWorkspaceRepository(
name?.let { statement.appendln("AND workspaces.name ILIKE ?") }
return this.jdbcTemplate.queryForObject(
statement.toString(),
createParametersArray(name)
createParametersArrayILikeQuery(name)
) { resultSet, _ ->
resultSet.getInt(1)
}
Expand Down