Skip to content

Commit f8c264e

Browse files
AndreiKingsleyAndreiKingsley
authored
Merge pull request #1369 from Kotlin/cols_fix
cols with default argument deprecation
2 parents af84ca3 + 1faf7c6 commit f8c264e

File tree

12 files changed

+107
-82
lines changed

12 files changed

+107
-82
lines changed

‎core/api/core.api‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -909,6 +909,7 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsAtAnyDep
909909
}
910910

911911
public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsColumnsSelectionDsl {
912+
public fun cols (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
912913
public fun cols (Ljava/lang/String;I[I)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
913914
public fun cols (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
914915
public fun cols (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
@@ -923,36 +924,35 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColsColumnsS
923924
public fun cols (Lkotlin/reflect/KProperty;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
924925
public fun cols (Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
925926
public fun cols (Lkotlin/reflect/KProperty;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
927+
public fun cols (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
926928
public fun cols (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;I[I)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
927929
public fun cols (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
928930
public fun cols (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
929931
public fun cols (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/ranges/IntRange;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
930932
public fun cols (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
931933
public fun cols (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
932934
public fun cols (Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
935+
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
933936
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;I[I)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
934937
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
935938
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
936939
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/ranges/IntRange;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
937940
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
938941
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
939942
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
943+
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
940944
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;I[I)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
941945
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
942946
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/ranges/IntRange;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
947+
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
943948
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;I[I)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
944949
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
945950
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
946951
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/ranges/IntRange;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
947952
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/reflect/KProperty;[Lkotlin/reflect/KProperty;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
948953
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
949954
public fun cols (Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
950-
public static synthetic fun cols$default (Lorg/jetbrains/kotlinx/dataframe/api/ColsColumnsSelectionDsl;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
951955
public static synthetic fun cols$default (Lorg/jetbrains/kotlinx/dataframe/api/ColsColumnsSelectionDsl;Lkotlin/reflect/KProperty;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
952-
public static synthetic fun cols$default (Lorg/jetbrains/kotlinx/dataframe/api/ColsColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
953-
public static synthetic fun cols$default (Lorg/jetbrains/kotlinx/dataframe/api/ColsColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
954-
public static synthetic fun cols$default (Lorg/jetbrains/kotlinx/dataframe/api/ColsColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
955-
public static synthetic fun cols$default (Lorg/jetbrains/kotlinx/dataframe/api/ColsColumnsSelectionDsl;Lorg/jetbrains/kotlinx/dataframe/columns/SingleColumn;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
956956
public fun colsUnTyped (Ljava/lang/String;I[I)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
957957
public fun colsUnTyped (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;
958958
public fun colsUnTyped (Ljava/lang/String;Lkotlin/ranges/IntRange;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnSet;

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/cols.kt‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet
2121
import org.jetbrains.kotlinx.dataframe.impl.columns.transform
2222
import org.jetbrains.kotlinx.dataframe.impl.columns.transformSingle
2323
import org.jetbrains.kotlinx.dataframe.impl.headPlusArray
24+
import org.jetbrains.kotlinx.dataframe.util.COLS_TO_ALL
25+
import org.jetbrains.kotlinx.dataframe.util.COLS_TO_ALL_COLS
26+
import org.jetbrains.kotlinx.dataframe.util.COLS_TO_ALL_COLS_REPLACE
27+
import org.jetbrains.kotlinx.dataframe.util.COLS_TO_ALL_REPLACE
2428
import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
2529
import kotlin.reflect.KProperty
2630

@@ -244,9 +248,12 @@ public interface ColsColumnsSelectionDsl<out _UNUSED> {
244248

245249
/** @include [ColumnSetColsPredicateDocs] */
246250
@Suppress("UNCHECKED_CAST")
247-
public fun <C> ColumnSet<C>.cols(predicate: ColumnFilter<C> = { true }): ColumnSet<C> =
251+
public fun <C> ColumnSet<C>.cols(predicate: ColumnFilter<C>): ColumnSet<C> =
248252
colsInternal(predicate as ColumnFilter<*>).cast()
249253

254+
@Deprecated(COLS_TO_ALL, ReplaceWith(COLS_TO_ALL_REPLACE), DeprecationLevel.ERROR)
255+
public fun <C> ColumnSet<C>.cols(): ColumnSet<C> = cols { true }
256+
250257
/** @include [ColumnSetColsPredicateDocs] */
251258
public operator fun <C> ColumnSet<C>.get(predicate: ColumnFilter<C> = { true }): ColumnSet<C> = cols(predicate)
252259

@@ -269,9 +276,12 @@ public interface ColsColumnsSelectionDsl<out _UNUSED> {
269276
private interface ColumnsSelectionDslColsPredicateDocs
270277

271278
/** @include [ColumnsSelectionDslColsPredicateDocs] */
272-
public fun ColumnsSelectionDsl<*>.cols(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
279+
public fun ColumnsSelectionDsl<*>.cols(predicate: ColumnFilter<*>): ColumnSet<*> =
273280
this.asSingleColumn().colsInternal(predicate)
274281

282+
@Deprecated(COLS_TO_ALL, ReplaceWith(COLS_TO_ALL_REPLACE), DeprecationLevel.ERROR)
283+
public fun ColumnsSelectionDsl<*>.cols(): ColumnSet<*> = cols { true }
284+
275285
/** @include [ColumnsSelectionDslColsPredicateDocs] */
276286
public operator fun ColumnsSelectionDsl<*>.get(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
277287
cols(predicate)
@@ -294,9 +304,12 @@ public interface ColsColumnsSelectionDsl<out _UNUSED> {
294304
private interface SingleColumnAnyRowColsPredicateDocs
295305

296306
/** @include [SingleColumnAnyRowColsPredicateDocs] */
297-
public fun SingleColumn<DataRow<*>>.cols(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
307+
public fun SingleColumn<DataRow<*>>.cols(predicate: ColumnFilter<*>): ColumnSet<*> =
298308
this.ensureIsColumnGroup().colsInternal(predicate)
299309

310+
@Deprecated(COLS_TO_ALL_COLS, ReplaceWith(COLS_TO_ALL_COLS_REPLACE), DeprecationLevel.ERROR)
311+
public fun SingleColumn<DataRow<*>>.cols(): ColumnSet<*> = cols { true }
312+
300313
/**
301314
* @include [SingleColumnAnyRowColsPredicateDocs]
302315
*/
@@ -318,7 +331,10 @@ public interface ColsColumnsSelectionDsl<out _UNUSED> {
318331
private interface StringColsPredicateDocs
319332

320333
/** @include [StringColsPredicateDocs] */
321-
public fun String.cols(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = columnGroup(this).cols(predicate)
334+
public fun String.cols(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).cols(predicate)
335+
336+
@Deprecated(COLS_TO_ALL_COLS, ReplaceWith(COLS_TO_ALL_COLS_REPLACE), DeprecationLevel.ERROR)
337+
public fun String.cols(): ColumnSet<*> = cols { true }
322338

323339
/** @include [StringColsPredicateDocs] */
324340
public operator fun String.get(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = cols(predicate)
@@ -363,7 +379,10 @@ public interface ColsColumnsSelectionDsl<out _UNUSED> {
363379
private interface ColumnPathPredicateDocs
364380

365381
/** @include [ColumnPathPredicateDocs] */
366-
public fun ColumnPath.cols(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = columnGroup(this).cols(predicate)
382+
public fun ColumnPath.cols(predicate: ColumnFilter<*>): ColumnSet<*> = columnGroup(this).cols(predicate)
383+
384+
@Deprecated(COLS_TO_ALL_COLS, ReplaceWith(COLS_TO_ALL_COLS_REPLACE), DeprecationLevel.ERROR)
385+
public fun ColumnPath.cols(): ColumnSet<*> = cols { true }
367386

368387
/** @include [ColumnPathPredicateDocs] */
369388
public operator fun ColumnPath.get(predicate: ColumnFilter<*> = { true }): ColumnSet<*> = cols(predicate)

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,12 @@ internal const val FORMATTING_DSL_REPLACE = "FormattingDsl"
119119
internal const val RGB_COLOR = "Replaced by `RgbColor`. $MESSAGE_1_0"
120120
internal const val RGB_COLOR_REPLACE = "RgbColor"
121121

122+
internal const val COLS_TO_ALL = "This `cols()` overload will be removed in favor of `all()`. $MESSAGE_1_0"
123+
internal const val COLS_TO_ALL_REPLACE = "this.all()"
124+
125+
internal const val COLS_TO_ALL_COLS = "This `cols()` overload will be removed in favor of `allCols()`. $MESSAGE_1_0"
126+
internal const val COLS_TO_ALL_COLS_REPLACE = "this.allCols()"
127+
122128
// endregion
123129

124130
// region WARNING in 1.0, ERROR in 1.1

‎core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ class AllTests : ColumnsSelectionDslTests() {
4949
df.select { cols(name, age, city, weight, isHappy) },
5050
df.select { all() },
5151
df.select { all().all() },
52-
df.select { cols().all() },
53-
df.select { cols() },
52+
df.select { all().all() },
53+
df.select { all() },
5454
).shouldAllBeEqual()
5555

5656
listOf(
@@ -101,43 +101,43 @@ class AllTests : ColumnsSelectionDslTests() {
101101
val weightAccessor = column<Int?>("weight")
102102
listOf(
103103
df.select { weight and isHappy },
104-
df.select { cols().allAfter { "city" in it.name } },
105-
df.select { cols().allAfter { it.data == cityAccessor() } },
106-
df.select { cols().allAfter { it.data == city } },
107-
df.select { cols().allAfter(city) },
108-
df.select { cols().allAfter(cityAccessor) },
109-
df.select { cols().allAfter("city") },
110-
df.select { cols().allAfter(Person::city) },
111-
df.select { cols().allAfter(pathOf("city")) },
112-
df.select { cols().allFrom { "weight" in it.name } },
113-
df.select { cols().allFrom { it.data == weightAccessor() } },
114-
df.select { cols().allFrom { it.data == weight } },
115-
df.select { cols().allFrom(weight) },
116-
df.select { cols().allFrom(weightAccessor) },
117-
df.select { cols().allFrom("weight") },
118-
df.select { cols().allFrom(Person::weight) },
119-
df.select { cols().allFrom(pathOf("weight")) },
104+
df.select { all().allAfter { "city" in it.name } },
105+
df.select { all().allAfter { it.data == cityAccessor() } },
106+
df.select { all().allAfter { it.data == city } },
107+
df.select { all().allAfter(city) },
108+
df.select { all().allAfter(cityAccessor) },
109+
df.select { all().allAfter("city") },
110+
df.select { all().allAfter(Person::city) },
111+
df.select { all().allAfter(pathOf("city")) },
112+
df.select { all().allFrom { "weight" in it.name } },
113+
df.select { all().allFrom { it.data == weightAccessor() } },
114+
df.select { all().allFrom { it.data == weight } },
115+
df.select { all().allFrom(weight) },
116+
df.select { all().allFrom(weightAccessor) },
117+
df.select { all().allFrom("weight") },
118+
df.select { all().allFrom(Person::weight) },
119+
df.select { all().allFrom(pathOf("weight")) },
120120
).shouldAllBeEqual()
121121

122122
val ageAccessor = column<Int>("age")
123123
listOf(
124124
df.select { name and age },
125-
df.select { cols().allBefore { "city" in it.name } },
126-
df.select { cols().allBefore { it.data == cityAccessor() } },
127-
df.select { cols().allBefore { it.data == city } },
128-
df.select { cols().allBefore(city) },
129-
df.select { cols().allBefore(cityAccessor) },
130-
df.select { cols().allBefore("city") },
131-
df.select { cols().allBefore(Person::city) },
132-
df.select { cols().allBefore(pathOf("city")) },
133-
df.select { cols().allUpTo { "age" in it.name } },
134-
df.select { cols().allUpTo { it.data == ageAccessor() } },
135-
df.select { cols().allUpTo { it.data == age } },
136-
df.select { cols().allUpTo(age) },
137-
df.select { cols().allUpTo(ageAccessor) },
138-
df.select { cols().allUpTo("age") },
139-
df.select { cols().allUpTo(Person::age) },
140-
df.select { cols().allUpTo(pathOf("age")) },
125+
df.select { all().allBefore { "city" in it.name } },
126+
df.select { all().allBefore { it.data == cityAccessor() } },
127+
df.select { all().allBefore { it.data == city } },
128+
df.select { all().allBefore(city) },
129+
df.select { all().allBefore(cityAccessor) },
130+
df.select { all().allBefore("city") },
131+
df.select { all().allBefore(Person::city) },
132+
df.select { all().allBefore(pathOf("city")) },
133+
df.select { all().allUpTo { "age" in it.name } },
134+
df.select { all().allUpTo { it.data == ageAccessor() } },
135+
df.select { all().allUpTo { it.data == age } },
136+
df.select { all().allUpTo(age) },
137+
df.select { all().allUpTo(ageAccessor) },
138+
df.select { all().allUpTo("age") },
139+
df.select { all().allUpTo(Person::age) },
140+
df.select { all().allUpTo(pathOf("age")) },
141141
).shouldAllBeEqual()
142142
}
143143

‎core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -113,26 +113,26 @@ class AllExceptTests : ColumnsSelectionDslTests() {
113113
val nameAccessor = column<String>("name")
114114
listOf(
115115
df.select { cols(age, weight, isHappy) },
116-
df.select { cols().except { cols { it.name in listOf("name", "city") } } },
117-
df.select { cols().except { cityAccessor and nameAccessor } },
118-
df.select { cols().except { city and name } },
119-
df.select { cols().except(city and name) },
120-
df.select { cols().except(city, name) },
121-
df.select { cols().except(cityAccessor, nameAccessor) },
122-
df.select { cols().except("city", "name") },
123-
df.select { cols().except(Person::city, Person::name) },
124-
df.select { cols().except(pathOf("city"), pathOf("name")) },
116+
df.select { all().except { cols { it.name in listOf("name", "city") } } },
117+
df.select { all().except { cityAccessor and nameAccessor } },
118+
df.select { all().except { city and name } },
119+
df.select { all().except(city and name) },
120+
df.select { all().except(city, name) },
121+
df.select { all().except(cityAccessor, nameAccessor) },
122+
df.select { all().except("city", "name") },
123+
df.select { all().except(Person::city, Person::name) },
124+
df.select { all().except(pathOf("city"), pathOf("name")) },
125125
).shouldAllBeEqual()
126126

127127
listOf(
128128
df.select { cols(age, city, weight, isHappy) },
129-
df.select { cols() except { cols { it.name == "name" } } },
130-
df.select { cols() except cols { it.name == "name" } },
131-
df.select { cols() except nameAccessor },
132-
df.select { cols() except name },
133-
df.select { cols() except "name" },
134-
df.select { cols() except Person::name },
135-
df.select { cols() except pathOf("name") },
129+
df.select { all() except { cols { it.name == "name" } } },
130+
df.select { all() except cols { it.name == "name" } },
131+
df.select { all() except nameAccessor },
132+
df.select { all() except name },
133+
df.select { all() except "name" },
134+
df.select { all() except Person::name },
135+
df.select { all() except pathOf("name") },
136136
).shouldAllBeEqual()
137137

138138
listOf(

0 commit comments

Comments
 (0)