-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #57 from ergon/feature/dope-238-extend-string-func…
…tions DOPE-238: added missing string functions
- Loading branch information
Showing
104 changed files
with
6,424 additions
and
449 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 14 additions & 40 deletions
54
...on/dope/resolvable/expression/unaliased/type/function/stringfunction/Concat2Expression.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,28 @@ | ||
| package ch.ergon.dope.resolvable.expression.unaliased.type.function.stringfunction | ||
|
|
||
| import ch.ergon.dope.DopeQuery | ||
| import ch.ergon.dope.DopeQueryManager | ||
| import ch.ergon.dope.resolvable.expression.TypeExpression | ||
| import ch.ergon.dope.resolvable.expression.unaliased.type.function.FunctionExpression | ||
| import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType | ||
| import ch.ergon.dope.resolvable.operator.FunctionOperator | ||
| import ch.ergon.dope.validtype.StringType | ||
|
|
||
| // Separator is used as an argument and not as a formatting option | ||
| class Concat2Expression( | ||
| private val separator: TypeExpression<StringType>, | ||
| private val string: TypeExpression<StringType>, | ||
| private vararg val strings: TypeExpression<StringType>, | ||
| ) : TypeExpression<StringType>, FunctionOperator { | ||
| override fun toDopeQuery(manager: DopeQueryManager): DopeQuery { | ||
| val separatorDopeQuery = separator.toDopeQuery(manager) | ||
| val stringDopeQuery = string.toDopeQuery(manager) | ||
| val stringsDopeQuery = strings.map { it.toDopeQuery(manager) } | ||
| return DopeQuery( | ||
| queryString = toFunctionQueryString( | ||
| symbol = "CONCAT2", | ||
| separatorDopeQuery, | ||
| stringDopeQuery, | ||
| *stringsDopeQuery.toTypedArray(), | ||
| ), | ||
| parameters = separatorDopeQuery.parameters + stringDopeQuery.parameters + stringsDopeQuery.fold( | ||
| emptyMap(), | ||
| ) { stringParameters, field -> stringParameters + field.parameters }, | ||
| ) | ||
| } | ||
| } | ||
| separator: TypeExpression<StringType>, | ||
| string: TypeExpression<StringType>, | ||
| vararg strings: TypeExpression<StringType>, | ||
| ) : FunctionExpression<StringType>("CONCAT2", separator, string, *strings) | ||
|
|
||
| fun concat2(separator: TypeExpression<StringType>, string: TypeExpression<StringType>, vararg strings: TypeExpression<StringType>) = | ||
| Concat2Expression(separator, string, *strings) | ||
| fun concat2( | ||
| separator: TypeExpression<StringType>, | ||
| string: TypeExpression<StringType>, | ||
| vararg strings: TypeExpression<StringType>, | ||
| ) = Concat2Expression(separator, string, *strings) | ||
|
|
||
| fun concat2(separator: String, string: String, vararg strings: String) = concat2( | ||
| separator.toDopeType(), | ||
| string.toDopeType(), | ||
| *wrapVarargsWithStringValueType( | ||
| *strings, | ||
| ), | ||
| ) | ||
| fun concat2(separator: String, string: String, vararg strings: String) = | ||
| concat2(separator.toDopeType(), string.toDopeType(), *strings.map { it.toDopeType() }.toTypedArray()) | ||
|
|
||
| fun concat2(separator: TypeExpression<StringType>, string: String, vararg strings: String) = concat2( | ||
| separator, | ||
| string.toDopeType(), | ||
| *wrapVarargsWithStringValueType( | ||
| *strings, | ||
| ), | ||
| ) | ||
| fun concat2(separator: TypeExpression<StringType>, string: String, vararg strings: String) = | ||
| concat2(separator, string.toDopeType(), *strings.map { it.toDopeType() }.toTypedArray()) | ||
|
|
||
| fun concat2(separator: String, string: TypeExpression<StringType>, vararg strings: TypeExpression<StringType>) = | ||
| concat2(separator.toDopeType(), string, *strings) |
42 changes: 12 additions & 30 deletions
42
...gon/dope/resolvable/expression/unaliased/type/function/stringfunction/ConcatExpression.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,27 @@ | ||
| package ch.ergon.dope.resolvable.expression.unaliased.type.function.stringfunction | ||
|
|
||
| import ch.ergon.dope.DopeQuery | ||
| import ch.ergon.dope.DopeQueryManager | ||
| import ch.ergon.dope.resolvable.expression.TypeExpression | ||
| import ch.ergon.dope.resolvable.expression.unaliased.type.function.FunctionExpression | ||
| import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType | ||
| import ch.ergon.dope.resolvable.operator.FunctionOperator | ||
| import ch.ergon.dope.validtype.StringType | ||
|
|
||
| class ConcatExpression( | ||
| private val firstString: TypeExpression<StringType>, | ||
| private val secondString: TypeExpression<StringType>, | ||
| private vararg val stringTypes: TypeExpression<StringType>, | ||
| ) : TypeExpression<StringType>, FunctionOperator { | ||
| override fun toDopeQuery(manager: DopeQueryManager): DopeQuery { | ||
| val firstStringDopeQuery = firstString.toDopeQuery(manager) | ||
| val secondStringDopeQuery = secondString.toDopeQuery(manager) | ||
| val stringTypesDopeQuery = stringTypes.map { it.toDopeQuery(manager) } | ||
| return DopeQuery( | ||
| queryString = toFunctionQueryString( | ||
| symbol = "CONCAT", | ||
| firstStringDopeQuery, | ||
| secondStringDopeQuery, | ||
| *stringTypesDopeQuery.toTypedArray(), | ||
| ), | ||
| parameters = firstStringDopeQuery.parameters + secondStringDopeQuery.parameters + stringTypesDopeQuery.fold( | ||
| emptyMap(), | ||
| ) { stringTypeParameters, field -> stringTypeParameters + field.parameters }, | ||
| ) | ||
| } | ||
| } | ||
| firstString: TypeExpression<StringType>, | ||
| secondString: TypeExpression<StringType>, | ||
| vararg stringTypes: TypeExpression<StringType>, | ||
| ) : FunctionExpression<StringType>("CONCAT", firstString, secondString, *stringTypes) | ||
|
|
||
| fun concat(firstString: TypeExpression<StringType>, secondString: TypeExpression<StringType>, vararg strings: TypeExpression<StringType>) = | ||
| ConcatExpression(firstString, secondString, *strings) | ||
| fun concat( | ||
| firstString: TypeExpression<StringType>, | ||
| secondString: TypeExpression<StringType>, | ||
| vararg strings: TypeExpression<StringType>, | ||
| ) = ConcatExpression(firstString, secondString, *strings) | ||
|
|
||
| fun concat(firstString: String, secondString: TypeExpression<StringType>, vararg strings: TypeExpression<StringType>) = | ||
| concat(firstString.toDopeType(), secondString, *strings) | ||
|
|
||
| fun concat(firstString: TypeExpression<StringType>, secondString: String, vararg strings: String) = | ||
| concat(firstString, secondString.toDopeType(), *wrapVarargsWithStringValueType(*strings)) | ||
| concat(firstString, secondString.toDopeType(), *strings.map { it.toDopeType() }.toTypedArray()) | ||
|
|
||
| fun concat(firstString: String, secondString: String, vararg strings: String) = | ||
| concat(firstString.toDopeType(), secondString.toDopeType(), *wrapVarargsWithStringValueType(*strings)) | ||
|
|
||
| internal fun wrapVarargsWithStringValueType(vararg strings: String) = strings.map { it.toDopeType() }.toTypedArray() | ||
| concat(firstString.toDopeType(), secondString.toDopeType(), *strings.map { it.toDopeType() }.toTypedArray()) |
22 changes: 6 additions & 16 deletions
22
...n/dope/resolvable/expression/unaliased/type/function/stringfunction/ContainsExpression.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 3 additions & 25 deletions
28
...on/dope/resolvable/expression/unaliased/type/function/stringfunction/InitCapExpression.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 3 additions & 14 deletions
17
...gon/dope/resolvable/expression/unaliased/type/function/stringfunction/LengthExpression.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 2 additions & 14 deletions
16
...rgon/dope/resolvable/expression/unaliased/type/function/stringfunction/LowerExpression.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 4 additions & 19 deletions
23
...rgon/dope/resolvable/expression/unaliased/type/function/stringfunction/LtrimExpression.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,18 @@ | ||
| package ch.ergon.dope.resolvable.expression.unaliased.type.function.stringfunction | ||
|
|
||
| import ch.ergon.dope.DopeQuery | ||
| import ch.ergon.dope.DopeQueryManager | ||
| import ch.ergon.dope.resolvable.expression.TypeExpression | ||
| import ch.ergon.dope.resolvable.expression.unaliased.type.function.FunctionExpression | ||
| import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType | ||
| import ch.ergon.dope.resolvable.operator.FunctionOperator | ||
| import ch.ergon.dope.validtype.StringType | ||
|
|
||
| class LtrimExpression( | ||
| private val inStr: TypeExpression<StringType>, | ||
| private val char: TypeExpression<StringType>? = null, | ||
| ) : TypeExpression<StringType>, FunctionOperator { | ||
| override fun toDopeQuery(manager: DopeQueryManager): DopeQuery { | ||
| val inStrDopeQuery = inStr.toDopeQuery(manager) | ||
| val charDopeQuery = char?.toDopeQuery(manager) | ||
| return DopeQuery( | ||
| queryString = toFunctionQueryString(symbol = "LTRIM", inStrDopeQuery, charDopeQuery), | ||
| parameters = inStrDopeQuery.parameters + charDopeQuery?.parameters.orEmpty(), | ||
| ) | ||
| } | ||
| } | ||
| class LtrimExpression(inStr: TypeExpression<StringType>, char: TypeExpression<StringType>? = null) : | ||
| FunctionExpression<StringType>("LTRIM", inStr, char) | ||
|
|
||
| fun ltrim(inStr: TypeExpression<StringType>, char: TypeExpression<StringType>? = null) = | ||
| LtrimExpression(inStr, char) | ||
|
|
||
| fun ltrim(inStr: TypeExpression<StringType>, char: String) = ltrim(inStr, char.toDopeType()) | ||
|
|
||
| fun ltrim(inStr: String, char: TypeExpression<StringType>) = ltrim(inStr.toDopeType(), char) | ||
| fun ltrim(inStr: String, char: TypeExpression<StringType>? = null) = ltrim(inStr.toDopeType(), char) | ||
|
|
||
| fun ltrim(inStr: String, char: String) = ltrim(inStr.toDopeType(), char.toDopeType()) | ||
|
|
||
| fun ltrim(inStr: String) = ltrim(inStr.toDopeType()) |
13 changes: 13 additions & 0 deletions
13
...n/dope/resolvable/expression/unaliased/type/function/stringfunction/MBLengthExpression.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package ch.ergon.dope.resolvable.expression.unaliased.type.function.stringfunction | ||
|
|
||
| import ch.ergon.dope.resolvable.expression.TypeExpression | ||
| import ch.ergon.dope.resolvable.expression.unaliased.type.function.FunctionExpression | ||
| import ch.ergon.dope.resolvable.expression.unaliased.type.toDopeType | ||
| import ch.ergon.dope.validtype.NumberType | ||
| import ch.ergon.dope.validtype.StringType | ||
|
|
||
| class MBLengthExpression(inStr: TypeExpression<StringType>) : FunctionExpression<NumberType>("MB_LENGTH", inStr) | ||
|
|
||
| fun mbLength(inStr: TypeExpression<StringType>) = MBLengthExpression(inStr) | ||
|
|
||
| fun mbLength(inStr: String) = mbLength(inStr.toDopeType()) |
Oops, something went wrong.