Skip to content

Commit 8f41e8f

Browse files
jansigijansigi
authored
Merge branch 'main' into feature/mongo-poc
2 parents 7801d96 + 4127b4d commit 8f41e8f

96 files changed

Lines changed: 1897 additions & 275 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎core/src/main/kotlin/ch/ergon/dope/resolvable/expression/type/function/array/ArrayAppendExpression.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package ch.ergon.dope.resolvable.expression.type.function.array
22

33
import ch.ergon.dope.resolvable.clause.ISelectOffsetClause
44
import ch.ergon.dope.resolvable.expression.type.TypeExpression
5+
import ch.ergon.dope.resolvable.expression.type.function.FunctionExpression
56
import ch.ergon.dope.resolvable.expression.type.toDopeType
67
import ch.ergon.dope.validtype.ArrayType
78
import ch.ergon.dope.validtype.BooleanType
@@ -13,7 +14,7 @@ data class ArrayAppendExpression<T : ValidType>(
1314
val array: TypeExpression<ArrayType<T>>,
1415
val value: TypeExpression<T>,
1516
val additionalValues: List<TypeExpression<T>> = emptyList(),
16-
) : ArrayFunctionExpression<ArrayType<T>>(listOf(array, value) + additionalValues)
17+
) : FunctionExpression<ArrayType<T>>(listOf(array, value) + additionalValues)
1718

1819
fun <T : ValidType> TypeExpression<ArrayType<T>>.append(
1920
value: TypeExpression<T>,

‎core/src/main/kotlin/ch/ergon/dope/resolvable/expression/type/function/array/ArrayAverageExpression.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ package ch.ergon.dope.resolvable.expression.type.function.array
22

33
import ch.ergon.dope.resolvable.clause.ISelectOffsetClause
44
import ch.ergon.dope.resolvable.expression.type.TypeExpression
5+
import ch.ergon.dope.resolvable.expression.type.function.FunctionExpression
56
import ch.ergon.dope.validtype.ArrayType
67
import ch.ergon.dope.validtype.NumberType
78

89
data class ArrayAverageExpression<T : NumberType>(
910
val array: TypeExpression<ArrayType<T>>,
10-
) : ArrayFunctionExpression<T>(listOf(array))
11+
) : FunctionExpression<T>(listOf(array))
1112

1213
fun <T : NumberType> TypeExpression<ArrayType<T>>.average() = ArrayAverageExpression(this)
1314

‎core/src/main/kotlin/ch/ergon/dope/resolvable/expression/type/function/array/ArrayBinarySearchExpression.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package ch.ergon.dope.resolvable.expression.type.function.array
22

33
import ch.ergon.dope.resolvable.clause.ISelectOffsetClause
44
import ch.ergon.dope.resolvable.expression.type.TypeExpression
5+
import ch.ergon.dope.resolvable.expression.type.function.FunctionExpression
56
import ch.ergon.dope.resolvable.expression.type.toDopeType
67
import ch.ergon.dope.validtype.ArrayType
78
import ch.ergon.dope.validtype.BooleanType
@@ -12,7 +13,7 @@ import ch.ergon.dope.validtype.ValidType
1213
data class ArrayBinarySearchExpression<T : ValidType>(
1314
val array: TypeExpression<ArrayType<T>>,
1415
val value: TypeExpression<T>,
15-
) : ArrayFunctionExpression<NumberType>(listOf(array, value))
16+
) : FunctionExpression<NumberType>(listOf(array, value))
1617

1718
fun <T : ValidType> TypeExpression<ArrayType<T>>.binarySearch(
1819
value: TypeExpression<T>,

‎core/src/main/kotlin/ch/ergon/dope/resolvable/expression/type/function/array/ArrayConcatExpression.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ package ch.ergon.dope.resolvable.expression.type.function.array
22

33
import ch.ergon.dope.resolvable.clause.ISelectOffsetClause
44
import ch.ergon.dope.resolvable.expression.type.TypeExpression
5+
import ch.ergon.dope.resolvable.expression.type.function.FunctionExpression
56
import ch.ergon.dope.validtype.ArrayType
67
import ch.ergon.dope.validtype.ValidType
78

89
data class ArrayConcatExpression<T : ValidType>(
910
val firstArray: TypeExpression<ArrayType<T>>,
1011
val secondArray: TypeExpression<ArrayType<T>>,
1112
val additionalArrays: List<TypeExpression<ArrayType<T>>> = emptyList(),
12-
) : ArrayFunctionExpression<ArrayType<T>>(listOf(firstArray, secondArray) + additionalArrays)
13+
) : FunctionExpression<ArrayType<T>>(listOf(firstArray, secondArray) + additionalArrays)
1314

1415
fun <T : ValidType> TypeExpression<ArrayType<T>>.concat(
1516
secondArray: TypeExpression<ArrayType<T>>,

‎core/src/main/kotlin/ch/ergon/dope/resolvable/expression/type/function/array/ArrayContainsExpression.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package ch.ergon.dope.resolvable.expression.type.function.array
22

33
import ch.ergon.dope.resolvable.clause.ISelectOffsetClause
44
import ch.ergon.dope.resolvable.expression.type.TypeExpression
5+
import ch.ergon.dope.resolvable.expression.type.function.FunctionExpression
56
import ch.ergon.dope.resolvable.expression.type.toDopeType
67
import ch.ergon.dope.validtype.ArrayType
78
import ch.ergon.dope.validtype.BooleanType
@@ -12,7 +13,7 @@ import ch.ergon.dope.validtype.ValidType
1213
data class ArrayContainsExpression<T : ValidType>(
1314
val array: TypeExpression<ArrayType<T>>,
1415
val value: TypeExpression<T>,
15-
) : ArrayFunctionExpression<BooleanType>(listOf(array, value))
16+
) : FunctionExpression<BooleanType>(listOf(array, value))
1617

1718
fun <T : ValidType> TypeExpression<ArrayType<T>>.contains(value: TypeExpression<T>) =
1819
ArrayContainsExpression(this, value)

‎core/src/main/kotlin/ch/ergon/dope/resolvable/expression/type/function/array/ArrayCountExpression.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ package ch.ergon.dope.resolvable.expression.type.function.array
22

33
import ch.ergon.dope.resolvable.clause.ISelectOffsetClause
44
import ch.ergon.dope.resolvable.expression.type.TypeExpression
5+
import ch.ergon.dope.resolvable.expression.type.function.FunctionExpression
56
import ch.ergon.dope.validtype.ArrayType
67
import ch.ergon.dope.validtype.NumberType
78
import ch.ergon.dope.validtype.ValidType
89

910
data class ArrayCountExpression<T : ValidType>(
1011
val array: TypeExpression<ArrayType<T>>,
11-
) : ArrayFunctionExpression<NumberType>(listOf(array))
12+
) : FunctionExpression<NumberType>(listOf(array))
1213

1314
fun <T : ValidType> TypeExpression<ArrayType<T>>.count() = ArrayCountExpression(this)
1415

‎core/src/main/kotlin/ch/ergon/dope/resolvable/expression/type/function/array/ArrayDistinctExpression.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package ch.ergon.dope.resolvable.expression.type.function.array
22

33
import ch.ergon.dope.resolvable.clause.ISelectOffsetClause
44
import ch.ergon.dope.resolvable.expression.type.TypeExpression
5+
import ch.ergon.dope.resolvable.expression.type.function.FunctionExpression
56
import ch.ergon.dope.validtype.ArrayType
67
import ch.ergon.dope.validtype.ValidType
78

8-
data class ArrayDistinctExpression<T : ValidType>(val array: TypeExpression<ArrayType<T>>) :
9-
ArrayFunctionExpression<ArrayType<T>>(listOf(array))
9+
data class ArrayDistinctExpression<T : ValidType>(val array: TypeExpression<ArrayType<T>>) : FunctionExpression<ArrayType<T>>(listOf(array))
1010

1111
fun <T : ValidType> TypeExpression<ArrayType<T>>.distinct() = ArrayDistinctExpression(this)
1212

‎core/src/main/kotlin/ch/ergon/dope/resolvable/expression/type/function/array/ArrayExceptExpression.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ package ch.ergon.dope.resolvable.expression.type.function.array
22

33
import ch.ergon.dope.resolvable.clause.ISelectOffsetClause
44
import ch.ergon.dope.resolvable.expression.type.TypeExpression
5+
import ch.ergon.dope.resolvable.expression.type.function.FunctionExpression
56
import ch.ergon.dope.validtype.ArrayType
67
import ch.ergon.dope.validtype.ValidType
78

89
data class ArrayExceptExpression<T : ValidType>(
910
val array: TypeExpression<ArrayType<T>>,
1011
val except: TypeExpression<ArrayType<T>>,
11-
) : ArrayFunctionExpression<ArrayType<T>>(listOf(array, except))
12+
) : FunctionExpression<ArrayType<T>>(listOf(array, except))
1213

1314
fun <T : ValidType> TypeExpression<ArrayType<T>>.except(except: TypeExpression<ArrayType<T>>) =
1415
ArrayExceptExpression(this, except)

‎core/src/main/kotlin/ch/ergon/dope/resolvable/expression/type/function/array/ArrayFlattenExpression.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@ package ch.ergon.dope.resolvable.expression.type.function.array
22

33
import ch.ergon.dope.resolvable.clause.ISelectOffsetClause
44
import ch.ergon.dope.resolvable.expression.type.TypeExpression
5+
import ch.ergon.dope.resolvable.expression.type.function.FunctionExpression
56
import ch.ergon.dope.resolvable.expression.type.toDopeType
67
import ch.ergon.dope.validtype.ArrayType
78
import ch.ergon.dope.validtype.NumberType
89
import ch.ergon.dope.validtype.ValidType
910

10-
data class ArrayFlattenExpression<T : ValidType>(val array: TypeExpression<ArrayType<T>>, val depth: TypeExpression<NumberType>) :
11-
ArrayFunctionExpression<ArrayType<T>>(listOf(array, depth))
11+
data class ArrayFlattenExpression<T : ValidType>(
12+
val array: TypeExpression<ArrayType<T>>,
13+
val depth: TypeExpression<NumberType>,
14+
) : FunctionExpression<ArrayType<T>>(listOf(array, depth))
1215

1316
fun <T : ValidType> TypeExpression<ArrayType<T>>.flatten(depth: TypeExpression<NumberType>) =
1417
ArrayFlattenExpression(this, depth)

‎core/src/main/kotlin/ch/ergon/dope/resolvable/expression/type/function/array/ArrayFunctionExpression.kt‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)