jlengrand/Exposed
1
0
Fork 0
mirror of https://github.com/jlengrand/Exposed.git synced 2026-03-10 08:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

removing redundant code related to create sequence and adding [IF EXISTS] option in the "drop sequence" command. (#789)

Browse Source 
* removing redundant code related to create sequence and adding [IF EXISTS] option to drop sequence

* indentation fix
This commit is contained in:
hichem-fazai
2020-02-13 20:05:36 +01:00
committed by GitHub
parent 21e354d865
commit cdbc588494
2 changed files with 32 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/Sequence.kt
View File

@@ -6,15 +6,15 @@ import org.jetbrains.exposed.sql.vendors.currentDialect
import java.lang.StringBuilder
/**
* Sequence : an object that generates a sequence of numeric values.
* Database Sequence.
*
* @param name The name of the sequence
* @param startWith The first sequence number to be generated.
* @param incrementBy The interval between sequence numbers.
* @param minValue The minimum value of the sequence.
* @param maxValue The maximum value of the sequence.
* @param cycle Indicates that the sequence continues to generate values after reaching either its maximum or minimum value.
* @param cache Number of values of the sequence the database preallocates and keeps in memory for faster access.
* @param name Name of the sequence.
* @param startWith Beginning of the sequence.
* @param incrementBy Value is added to the current sequence value to create a new value.
* @param minValue Minimum value a sequence can generate.
* @param maxValue Maximum value for the sequence.
* @param cycle Allows the sequence to wrap around when the [maxValue] or [minValue] has been reached by an ascending or descending sequence respectively.
* @param cache Specifies how many sequence numbers are to be preallocated and stored in memory for faster access.
*/
class Sequence(private val name: String,
val startWith: Int? = null,
@@ -29,12 +29,15 @@ class Sequence(private val name: String,
val ddl: List<String>
get() = createStatement()
/**
* Returns the SQL command that creates sequence with the specified properties.
*/
fun createStatement(): List<String> {
if (!currentDialect.supportsCreateSequence ) {
throw UnsupportedByDialectException("The current dialect doesn't support create sequence statement", currentDialect)
}
val createTableDDL = buildString {
val createSequenceDDL = buildString {
append("CREATE SEQUENCE ")
if (currentDialect.supportsIfNotExists) {
append("IF NOT EXISTS ")
@@ -52,14 +55,29 @@ class Sequence(private val name: String,
appendIfNotNull(" CACHE", cache)
}
return listOf(createTableDDL)
return listOf(createSequenceDDL)
}
fun dropStatement() = listOf("DROP SEQUENCE $identifier")
fun dropStatement(): List<String> {
if (!currentDialect.supportsCreateSequence) {
throw UnsupportedByDialectException("The current dialect doesn't support drop sequence statement", currentDialect)
}
fun StringBuilder.appendIfNotNull(str: String, strToCheck: Any?) = apply {
if (strToCheck != null) {
this.append("$str $strToCheck")
val dropSequenceDDL = buildString {
append("DROP SEQUENCE ")
if (currentDialect.supportsIfNotExists) {
append("IF EXISTS ")
}
append(identifier)
}
return listOf(dropSequenceDDL)
}
/** Appends both [str1] and [str2] to the receiver [StringBuilder] if [str2] is not `null`. */
fun StringBuilder.appendIfNotNull(str1: String, str2: Any?) = apply {
if (str2 != null) {
this.append("$str1 $str2")
}
}

44
exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/vendors/Default.kt vendored
View File

@@ -532,50 +532,6 @@ interface DatabaseDialect {
/** Returns the SQL command that modifies the specified [column]. */
fun modifyColumn(column: Column<*>): String
/**
* Returns the SQL command that creates sequence with the specified properties.
*
* @param identifier Name of the sequence.
* @param startWith Beginning of the sequence.
* @param incrementBy Value is added to the current sequence value to create a new value.
* @param minValue Minimum value a sequence can generate.
* @param maxValue Maximum value for the sequence.
* @param cycle Allows the sequence to wrap around when the [maxValue] or [minValue] has been reached by an ascending or descending sequence respectively.
* @param cache Specifies how many sequence numbers are to be preallocated and stored in memory for faster access.
*/
fun createSequence(
identifier: String,
startWith: Int?,
incrementBy: Int?,
minValue: Int?,
maxValue: Int?,
cycle: Boolean?,
cache: Int?
): String = buildString {
append("CREATE SEQUENCE ")
if (currentDialect.supportsIfNotExists) {
append("IF NOT EXISTS ")
}
append(identifier)
appendIfNotNull(" START WITH", startWith)
appendIfNotNull(" INCREMENT BY", incrementBy)
appendIfNotNull(" MINVALUE", minValue)
appendIfNotNull(" MAXVALUE", maxValue)
if (cycle == true) {
append(" CYCLE")
}
appendIfNotNull(" CACHE", cache)
}
/** Appends both [str1] and [str2] to the receiver [StringBuilder] if [str2] is not `null`. */
fun StringBuilder.appendIfNotNull(str1: String, str2: Any?): StringBuilder = apply {
if (str2 != null) {
this.append("$str1 $str2")
}
}
fun createDatabase(name: String) = "CREATE DATABASE IF NOT EXISTS ${name.inProperCase()}"
fun dropDatabase(name: String) = "DROP DATABASE IF EXISTS ${name.inProperCase()}"