Skip to content

Commit 93abde1

Browse files
JolanrensenJolanrensen
committed
updated grammar dsls for colsAtAnyDepth and colsInGroups, removing predicate
1 parent 6f9a9ae commit 93abde1

7 files changed

Lines changed: 113 additions & 126 deletions

File tree

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

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
1212
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
1313
import org.jetbrains.kotlinx.dataframe.impl.columnName
1414
import org.jetbrains.kotlinx.dataframe.impl.columns.asAnyFrameColumn
15+
import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
1516
import kotlin.reflect.KProperty
1617

1718
/**
@@ -43,15 +44,11 @@ public interface ColumnsContainer<out T> : ColumnsScope<T> {
4344

4445
public fun getColumnOrNull(index: Int): AnyCol?
4546

46-
@Deprecated(
47-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
48-
)
47+
@Deprecated(DEPRECATED_ACCESS_API)
4948
@AccessApiOverload
5049
public fun <R> getColumnOrNull(column: ColumnReference<R>): DataColumn<R>?
5150

52-
@Deprecated(
53-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
54-
)
51+
@Deprecated(DEPRECATED_ACCESS_API)
5552
@AccessApiOverload
5653
public fun <R> getColumnOrNull(column: KProperty<R>): DataColumn<R>?
5754

@@ -67,58 +64,40 @@ public interface ColumnsContainer<out T> : ColumnsScope<T> {
6764

6865
public operator fun get(columnPath: ColumnPath): AnyCol = getColumn(columnPath)
6966

70-
@Deprecated(
71-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
72-
)
67+
@Deprecated(DEPRECATED_ACCESS_API)
7368
@AccessApiOverload
7469
public operator fun <R> get(column: DataColumn<R>): DataColumn<R> = getColumn(column.name()).cast()
7570

76-
@Deprecated(
77-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
78-
)
71+
@Deprecated(DEPRECATED_ACCESS_API)
7972
@AccessApiOverload
8073
public operator fun <R> get(column: DataColumn<DataRow<R>>): ColumnGroup<R> = getColumn(column)
8174

82-
@Deprecated(
83-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
84-
)
75+
@Deprecated(DEPRECATED_ACCESS_API)
8576
@AccessApiOverload
8677
public operator fun <R> get(column: DataColumn<DataFrame<R>>): FrameColumn<R> = getColumn(column)
8778

88-
@Deprecated(
89-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
90-
)
79+
@Deprecated(DEPRECATED_ACCESS_API)
9180
@AccessApiOverload
9281
public operator fun <R> get(column: ColumnReference<R>): DataColumn<R> = getColumn(column)
9382

94-
@Deprecated(
95-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
96-
)
83+
@Deprecated(DEPRECATED_ACCESS_API)
9784
@AccessApiOverload
9885
public operator fun <R> get(column: ColumnReference<DataRow<R>>): ColumnGroup<R> = getColumn(column)
9986

100-
@Deprecated(
101-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
102-
)
87+
@Deprecated(DEPRECATED_ACCESS_API)
10388
@AccessApiOverload
10489
public operator fun <R> get(column: ColumnReference<DataFrame<R>>): FrameColumn<R> = getColumn(column)
10590

106-
@Deprecated(
107-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
108-
)
91+
@Deprecated(DEPRECATED_ACCESS_API)
10992
@AccessApiOverload
11093
public operator fun <R> get(column: KProperty<R>): DataColumn<R> = get(column.columnName).cast()
11194

112-
@Deprecated(
113-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
114-
)
95+
@Deprecated(DEPRECATED_ACCESS_API)
11596
@AccessApiOverload
11697
public operator fun <R> get(column: KProperty<DataRow<R>>): ColumnGroup<R> =
11798
get(column.columnName).asColumnGroup().cast()
11899

119-
@Deprecated(
120-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
121-
)
100+
@Deprecated(DEPRECATED_ACCESS_API)
122101
@AccessApiOverload
123102
public operator fun <R> get(column: KProperty<DataFrame<R>>): FrameColumn<R> =
124103
get(column.columnName).asAnyFrameColumn().castFrameColumn()

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import org.jetbrains.kotlinx.dataframe.impl.headPlusIterable
2424
import org.jetbrains.kotlinx.dataframe.impl.schema.createEmptyDataFrame
2525
import org.jetbrains.kotlinx.dataframe.impl.schema.createEmptyDataFrameOf
2626
import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema
27+
import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
2728
import kotlin.reflect.KType
2829

2930
/**
@@ -121,9 +122,7 @@ public interface DataFrame<out T> :
121122
*/
122123
public operator fun <T, C> DataFrame<T>.get(columns: ColumnsSelector<T, C>): List<DataColumn<C>> = this.get(columns)
123124

124-
@Deprecated(
125-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
126-
)
125+
@Deprecated(DEPRECATED_ACCESS_API)
127126
@AccessApiOverload
128127
public operator fun <T> DataFrame<T>.get(first: AnyColumnReference, vararg other: AnyColumnReference): DataFrame<T> =
129128
select { (listOf(first) + other).toColumnSet() }

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

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
99
import org.jetbrains.kotlinx.dataframe.impl.columnName
1010
import org.jetbrains.kotlinx.dataframe.impl.owner
1111
import org.jetbrains.kotlinx.dataframe.impl.toIterable
12+
import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
1213
import kotlin.reflect.KProperty
1314

1415
/**
@@ -28,27 +29,19 @@ public interface DataRow<out T> {
2829

2930
public operator fun <R> get(expression: RowExpression<T, R>): R = expression(this, this)
3031

31-
@Deprecated(
32-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
33-
)
32+
@Deprecated(DEPRECATED_ACCESS_API)
3433
@AccessApiOverload
3534
public operator fun <R> get(column: ColumnReference<R>): R
3635

37-
@Deprecated(
38-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
39-
)
36+
@Deprecated(DEPRECATED_ACCESS_API)
4037
@AccessApiOverload
4138
public operator fun <R> get(columns: List<ColumnReference<R>>): List<R> = columns.map { get(it) }
4239

43-
@Deprecated(
44-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
45-
)
40+
@Deprecated(DEPRECATED_ACCESS_API)
4641
@AccessApiOverload
4742
public operator fun <R> get(property: KProperty<R>): R = get(property.columnName) as R
4843

49-
@Deprecated(
50-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
51-
)
44+
@Deprecated(DEPRECATED_ACCESS_API)
5245
@AccessApiOverload
5346
public operator fun get(first: AnyColumnReference, vararg other: AnyColumnReference): DataRow<T> =
5447
owner.get(first, *other)[index]
@@ -83,9 +76,7 @@ public interface DataRow<out T> {
8376

8477
public fun getOrNull(name: String): Any?
8578

86-
@Deprecated(
87-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
88-
)
79+
@Deprecated(DEPRECATED_ACCESS_API)
8980
@AccessApiOverload
9081
public fun <R> getValueOrNull(column: ColumnReference<R>): R?
9182

@@ -95,9 +86,7 @@ public interface DataRow<out T> {
9586

9687
public operator fun String.get(vararg path: String): ColumnPath = ColumnPath(listOf(this) + path)
9788

98-
@Deprecated(
99-
"Recommended to migrate to use String or Extension properties API https://kotlin.github.io/dataframe/apilevels.html",
100-
)
89+
@Deprecated(DEPRECATED_ACCESS_API)
10190
@AccessApiOverload
10291
public operator fun <R> ColumnReference<R>.invoke(): R = get(this)
10392

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,9 @@ public interface ColumnsSelectionDsl<out T> : // SingleColumn<DataRow<T>>
193193
*
194194
* `| `{@include [ColsColumnsSelectionDsl.Grammar.PlainDslName]}`[`**`<`**{@include [DslGrammarTemplate.ColumnTypeRef]}**`>`**`]`**`(`**{@include [DslGrammarTemplate.ColumnRef]}**`,`**` .. | `{@include [DslGrammarTemplate.IndexRef]}**`,`**` .. | `{@include [DslGrammarTemplate.IndexRangeRef]}**`)`**
195195
*
196-
* `| `{@include [ColsAtAnyDepthColumnsSelectionDsl.Grammar.PlainDslName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]`
196+
* `| `{@include [ColsAtAnyDepthColumnsSelectionDsl.Grammar.PlainDslName]}`()`
197197
*
198-
* `| `{@include [ColsInGroupsColumnsSelectionDsl.Grammar.PlainDslName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]`
198+
* `| `{@include [ColsInGroupsColumnsSelectionDsl.Grammar.PlainDslName]}`()`
199199
*
200200
* `| `{@include [ColsOfColumnsSelectionDsl.Grammar.PlainDslName]}**`<`**{@include [DslGrammarTemplate.ColumnTypeRef]}**`>`**` [ `**`(`**{@include [DslGrammarTemplate.KTypeRef]}**`)`**` ] [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]`
201201
*
@@ -247,9 +247,9 @@ public interface ColumnsSelectionDsl<out T> : // SingleColumn<DataRow<T>>
247247
*
248248
* {@include [Indent]}`| `{@include [ColsColumnsSelectionDsl.Grammar.ColumnSetName]}**`(`**{@include [DslGrammarTemplate.IndexRef]}**`,`**` .. | `{@include [DslGrammarTemplate.IndexRangeRef]}**`)`**
249249
*
250-
* {@include [Indent]}`| `{@include [ColsAtAnyDepthColumnsSelectionDsl.Grammar.ColumnSetName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]`
250+
* {@include [Indent]}`| `{@include [ColsAtAnyDepthColumnsSelectionDsl.Grammar.ColumnSetName]}`()`
251251
*
252-
* {@include [Indent]}`| `{@include [ColsInGroupsColumnsSelectionDsl.Grammar.ColumnSetName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]`
252+
* {@include [Indent]}`| `{@include [ColsInGroupsColumnsSelectionDsl.Grammar.ColumnSetName]}`()`
253253
*
254254
* {@include [Indent]}`| `{@include [ColsOfColumnsSelectionDsl.Grammar.ColumnSetName]}**`<`**{@include [DslGrammarTemplate.ColumnTypeRef]}**`>`**` [ `**`(`**{@include [DslGrammarTemplate.KTypeRef]}**`)`**` ] [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]`
255255
*
@@ -318,9 +318,9 @@ public interface ColumnsSelectionDsl<out T> : // SingleColumn<DataRow<T>>
318318
*
319319
* {@include [Indent]}`| `{@include [ColsColumnsSelectionDsl.Grammar.ColumnGroupName]}`[`**`<`**{@include [DslGrammarTemplate.ColumnTypeRef]}**`>`**`]`**`(`**{@include [DslGrammarTemplate.ColumnRef]}**`,`**` .. | `{@include [DslGrammarTemplate.IndexRef]}**`,`**` .. | `{@include [DslGrammarTemplate.IndexRangeRef]}**`)`**
320320
*
321-
* {@include [Indent]}`| `{@include [ColsAtAnyDepthColumnsSelectionDsl.Grammar.ColumnGroupName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]`
321+
* {@include [Indent]}`| `{@include [ColsAtAnyDepthColumnsSelectionDsl.Grammar.ColumnGroupName]}`()`
322322
*
323-
* {@include [Indent]}`| `{@include [ColsInGroupsColumnsSelectionDsl.Grammar.ColumnGroupName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]`
323+
* {@include [Indent]}`| `{@include [ColsInGroupsColumnsSelectionDsl.Grammar.ColumnGroupName]}`()`
324324
*
325325
* {@include [Indent]}`| `{@include [ColumnNameFiltersColumnsSelectionDsl.Grammar.ColumnGroupNameStartsWith]}__`(`__{@include [DslGrammarTemplate.TextRef]}`[`**`, `**{@include [DslGrammarTemplate.IgnoreCaseRef]}`]`**`)`**
326326
*

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

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSe
1515
import org.jetbrains.kotlinx.dataframe.documentation.Indent
1616
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
1717
import org.jetbrains.kotlinx.dataframe.impl.columns.atAnyDepthImpl
18+
import org.jetbrains.kotlinx.dataframe.util.COLS_AT_ANY_DEPTH
19+
import org.jetbrains.kotlinx.dataframe.util.COLS_AT_ANY_DEPTH_REPLACE
1820
import kotlin.reflect.KProperty
1921

2022
// region ColumnsSelectionDsl
@@ -36,18 +38,16 @@ public interface ColsAtAnyDepthColumnsSelectionDsl {
3638
* {@include [DslGrammarTemplate.ColumnSetDef]}
3739
* {@include [LineBreak]}
3840
* {@include [DslGrammarTemplate.ColumnGroupDef]}
39-
* {@include [LineBreak]}
40-
* {@include [DslGrammarTemplate.ConditionDef]}
4141
* }
4242
*
4343
* {@set [DslGrammarTemplate.PLAIN_DSL_FUNCTIONS]
44-
* {@include [PlainDslName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]`
44+
* {@include [PlainDslName]}`()`
4545
* }
4646
* {@set [DslGrammarTemplate.COLUMN_SET_FUNCTIONS]
47-
* {@include [Indent]}{@include [ColumnSetName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]`
47+
* {@include [Indent]}{@include [ColumnSetName]}`()`
4848
* }
4949
* {@set [DslGrammarTemplate.COLUMN_GROUP_FUNCTIONS]
50-
* {@include [Indent]}{@include [ColumnGroupName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]`
50+
* {@include [Indent]}{@include [ColumnGroupName]}`()`
5151
* }
5252
*/
5353
public interface Grammar {
@@ -99,11 +99,11 @@ public interface ColsAtAnyDepthColumnsSelectionDsl {
9999
*
100100
* `dfsOf<Type> { condition } -> `[colsAtAnyDepth][colsAtAnyDepth]`().`[colsOf][ColumnsSelectionDsl.colsOf]`<Type> { condition }`
101101
*
102-
* [cols][ColumnsSelectionDsl.cols]` { condition }.`[recursively][recursively]`() -> `[colsAtAnyDepth][colsAtAnyDepth]`().`[filter][FilterColumnsSelectionDsl.filter]` { condition }`
102+
* [cols][ColumnsSelectionDsl.cols]` { condition }.recursively() -> `[colsAtAnyDepth][colsAtAnyDepth]`().`[filter][FilterColumnsSelectionDsl.filter]` { condition }`
103103
*
104-
* [first][ColumnsSelectionDsl.first]` { condition }.`[rec][rec]`() -> `[colsAtAnyDepth][colsAtAnyDepth]` { condition }.`[first][ColumnsSelectionDsl.first]`()`
104+
* [first][ColumnsSelectionDsl.first]` { condition }.rec() -> `[colsAtAnyDepth][colsAtAnyDepth]` { condition }.`[first][ColumnsSelectionDsl.first]`()`
105105
*
106-
* [all][ColumnsSelectionDsl.all]`().`[recursively][recursively]`() -> `[colsAtAnyDepth][colsAtAnyDepth]`()`
106+
* [all][ColumnsSelectionDsl.all]`().recursively() -> `[colsAtAnyDepth][colsAtAnyDepth]`()`
107107
*
108108
* @see [DataFrame.flatten\]
109109
* @see [ColumnsSelectionDsl.simplify\]
@@ -121,7 +121,11 @@ public interface ColsAtAnyDepthColumnsSelectionDsl {
121121
* `df.`[select][DataFrame.select]` { `[colGroups][ColumnsSelectionDsl.colGroups]`().`[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }`
122122
*/
123123
@Interpretable("ColsAtAnyDepth0")
124-
@Deprecated("", replaceWith = ReplaceWith("colsAtAnyDepth().filter(predicate)"))
124+
@Deprecated(
125+
message = COLS_AT_ANY_DEPTH,
126+
replaceWith = ReplaceWith(COLS_AT_ANY_DEPTH_REPLACE),
127+
level = DeprecationLevel.WARNING,
128+
)
125129
public fun ColumnSet<*>.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
126130
colsAtAnyDepthInternal(predicate)
127131

@@ -143,7 +147,11 @@ public interface ColsAtAnyDepthColumnsSelectionDsl {
143147
* `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]` { !it.`[isColumnGroup][DataColumn.isColumnGroup]` } }`
144148
*/
145149
@Interpretable("ColsAtAnyDepth1")
146-
@Deprecated("", replaceWith = ReplaceWith("colsAtAnyDepth().filter(predicate)"))
150+
@Deprecated(
151+
message = COLS_AT_ANY_DEPTH,
152+
replaceWith = ReplaceWith(COLS_AT_ANY_DEPTH_REPLACE),
153+
level = DeprecationLevel.WARNING,
154+
)
147155
public fun ColumnsSelectionDsl<*>.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
148156
asSingleColumn().colsAtAnyDepthInternal(predicate)
149157

@@ -165,7 +173,11 @@ public interface ColsAtAnyDepthColumnsSelectionDsl {
165173
* `df.`[select][DataFrame.select]` { myColGroup.`[colsAtAnyDepth][SingleColumn.colsAtAnyDepth]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }`
166174
*/
167175
@Interpretable("ColsAtAnyDepth2")
168-
@Deprecated("", replaceWith = ReplaceWith("colsAtAnyDepth().filter(predicate)"))
176+
@Deprecated(
177+
message = COLS_AT_ANY_DEPTH,
178+
replaceWith = ReplaceWith(COLS_AT_ANY_DEPTH_REPLACE),
179+
level = DeprecationLevel.WARNING,
180+
)
169181
public fun SingleColumn<DataRow<*>>.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
170182
ensureIsColumnGroup().colsAtAnyDepthInternal(predicate)
171183

@@ -185,7 +197,11 @@ public interface ColsAtAnyDepthColumnsSelectionDsl {
185197
*
186198
* `df.`[select][DataFrame.select]` { "myColumnGroup".`[colsAtAnyDepth][String.colsAtAnyDepth]` { "Alice" `[in][Iterable.contains]` it.`[values][DataColumn.values]`() } }`
187199
*/
188-
@Deprecated("", replaceWith = ReplaceWith("colsAtAnyDepth().filter(predicate)"))
200+
@Deprecated(
201+
message = COLS_AT_ANY_DEPTH,
202+
replaceWith = ReplaceWith(COLS_AT_ANY_DEPTH_REPLACE),
203+
level = DeprecationLevel.WARNING,
204+
)
189205
public fun String.colsAtAnyDepth(predicate: ColumnFilter<*> = { true }): ColumnSet<*> =
190206
columnGroup(this).colsAtAnyDepth(predicate)
191207

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,18 @@ public interface ColsInGroupsColumnsSelectionDsl {
3434
* {@include [DslGrammarTemplate.ColumnSetDef]}
3535
* {@include [LineBreak]}
3636
* {@include [DslGrammarTemplate.ColumnGroupDef]}
37-
* {@include [LineBreak]}
38-
* {@include [DslGrammarTemplate.ConditionDef]}
3937
* }
4038
*
4139
* {@set [DslGrammarTemplate.PLAIN_DSL_FUNCTIONS]
42-
* {@include [PlainDslName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]`
40+
* {@include [PlainDslName]}`()`
4341
* }
4442
*
4543
* {@set [DslGrammarTemplate.COLUMN_SET_FUNCTIONS]
46-
* {@include [Indent]}{@include [ColumnSetName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]`
44+
* {@include [Indent]}{@include [ColumnSetName]}`()`
4745
* }
4846
*
4947
* {@set [DslGrammarTemplate.COLUMN_GROUP_FUNCTIONS]
50-
* {@include [Indent]}{@include [ColumnGroupName]}` [ `**`{ `**{@include [DslGrammarTemplate.ConditionRef]}**` \}`**` ]`
48+
* {@include [Indent]}{@include [ColumnGroupName]}`()`
5149
* }
5250
*/
5351
public interface Grammar {

0 commit comments

Comments
 (0)