inList with Pair and Triple support

#643 / Formatting
JetBrains · Apr 25, 2021 · 26c90a4 · 26c90a4
1 parent f1adac4
commit 26c90a4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/SQLExpressionBuilder.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/SQLExpressionBuilder.kt
@@ -348,15 +348,15 @@ interface ISqlExpressionBuilder {
      * Checks if both expressions are equal to elements from [list].
      * Doesn't supported by SQLite
      **/
-    infix fun <T1, T2> Pair<ExpressionWithColumnType<T1>, ExpressionWithColumnType<T2>>.inList(list: Iterable<Pair<T1, T2>>): InListOrNotInListBaseOp<Pair<T1, T2>>
-        = PairInListOp(this, list, isInList = true)
+    infix fun <T1, T2> Pair<ExpressionWithColumnType<T1>, ExpressionWithColumnType<T2>>.inList(list: Iterable<Pair<T1, T2>>): InListOrNotInListBaseOp<Pair<T1, T2>> =
+        PairInListOp(this, list, isInList = true)
 
     /**
      * Checks if expressions from triple are equal to elements from [list].
      * Doesn't supported by SQLite
      **/
-    infix fun <T1, T2, T3> Triple<ExpressionWithColumnType<T1>, ExpressionWithColumnType<T2>, ExpressionWithColumnType<T3>>.inList(list: Iterable<Triple<T1, T2, T3>>): InListOrNotInListBaseOp<Triple<T1, T2, T3>>
-            = TripleInListOp(this, list, isInList = true)
+    infix fun <T1, T2, T3> Triple<ExpressionWithColumnType<T1>, ExpressionWithColumnType<T2>, ExpressionWithColumnType<T3>>.inList(list: Iterable<Triple<T1, T2, T3>>): InListOrNotInListBaseOp<Triple<T1, T2, T3>> =
+        TripleInListOp(this, list, isInList = true)
 
     /** Checks if this expression is equals to any element from [list]. */
     @Suppress("UNCHECKED_CAST")
@@ -373,15 +373,15 @@ interface ISqlExpressionBuilder {
      * Checks if both expressions are not equal to elements from [list].
      * Doesn't supported by SQLite
      **/
-    infix fun <T1, T2> Pair<ExpressionWithColumnType<T1>, ExpressionWithColumnType<T2>>.notInList(list: Iterable<Pair<T1, T2>>): InListOrNotInListBaseOp<Pair<T1, T2>>
-            = PairInListOp(this, list, isInList = false)
+    infix fun <T1, T2> Pair<ExpressionWithColumnType<T1>, ExpressionWithColumnType<T2>>.notInList(list: Iterable<Pair<T1, T2>>): InListOrNotInListBaseOp<Pair<T1, T2>> =
+        PairInListOp(this, list, isInList = false)
 
     /**
      * Checks if expressions from triple are not equal to elements from [list].
      * Doesn't supported by SQLite
      **/
-    infix fun <T1, T2, T3> Triple<ExpressionWithColumnType<T1>, ExpressionWithColumnType<T2>, ExpressionWithColumnType<T3>>.notInList(list: Iterable<Triple<T1, T2, T3>>): InListOrNotInListBaseOp<Triple<T1, T2, T3>>
-            = TripleInListOp(this, list, isInList = false)
+    infix fun <T1, T2, T3> Triple<ExpressionWithColumnType<T1>, ExpressionWithColumnType<T2>, ExpressionWithColumnType<T3>>.notInList(list: Iterable<Triple<T1, T2, T3>>): InListOrNotInListBaseOp<Triple<T1, T2, T3>> =
+        TripleInListOp(this, list, isInList = false)
 
     /** Checks if this expression is not equals to any element from [list]. */
     @Suppress("UNCHECKED_CAST")

diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/ops/InListOps.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/ops/InListOps.kt
@@ -72,7 +72,7 @@ abstract class InListOrNotInListBaseOp<V> (
 }
 
 class SingleValueInListOp<T>(
-    expr : ExpressionWithColumnType<T>,
+    expr: ExpressionWithColumnType<T>,
     list: Iterable<T>,
     isInList: Boolean = true
 ) : InListOrNotInListBaseOp<T>(expr, list, isInList) {
@@ -82,7 +82,7 @@ class SingleValueInListOp<T>(
 }
 
 class PairInListOp<T1, T2>(
-    expr : Pair<ExpressionWithColumnType<T1>, ExpressionWithColumnType<T2>>,
+    expr: Pair<ExpressionWithColumnType<T1>, ExpressionWithColumnType<T2>>,
     list: Iterable<Pair<T1, T2>>,
     isInList: Boolean = true
 ) : InListOrNotInListBaseOp<Pair<T1, T2>>(expr, list, isInList) {
@@ -92,11 +92,11 @@ class PairInListOp<T1, T2>(
 }
 
 class TripleInListOp<T1, T2, T3>(
-    expr : Triple<ExpressionWithColumnType<T1>, ExpressionWithColumnType<T2>, ExpressionWithColumnType<T3>>,
+    expr: Triple<ExpressionWithColumnType<T1>, ExpressionWithColumnType<T2>, ExpressionWithColumnType<T3>>,
     list: Iterable<Triple<T1, T2, T3>>,
     isInList: Boolean = true
 ) : InListOrNotInListBaseOp<Triple<T1, T2, T3>>(expr, list, isInList) {
     override val columnTypes: List<ExpressionWithColumnType<*>> = listOf(expr.first, expr.second, expr.third)
 
     override fun extractValues(value: Triple<T1, T2, T3>): List<Any?> = listOf(value.first, value.second, value.third)
-}
+}