diff --git a/partiql-ast/api/partiql-ast.api b/partiql-ast/api/partiql-ast.api index e1a5ba881..525328cc5 100644 --- a/partiql-ast/api/partiql-ast.api +++ b/partiql-ast/api/partiql-ast.api @@ -732,9 +732,9 @@ public class org/partiql/ast/DataType$StructField : org/partiql/ast/AstNode { public fun equals (Ljava/lang/Object;)Z public fun getChildren ()Ljava/util/List; public fun getName ()Lorg/partiql/ast/Identifier; - public fun getOptional ()Z public fun getType ()Lorg/partiql/ast/DataType; public fun hashCode ()I + public fun isOptional ()Z } public final class org/partiql/ast/DatetimeField : org/partiql/ast/AstEnum { @@ -1029,9 +1029,9 @@ public final class org/partiql/ast/Identifier : org/partiql/ast/AstNode { public static fun builder ()Lorg/partiql/ast/Identifier$Builder; public fun equals (Ljava/lang/Object;)Z public fun getChildren ()Ljava/util/List; - public fun getDelimited ()Z public fun getSymbol ()Ljava/lang/String; public fun hashCode ()I + public fun isDelimited ()Z } public class org/partiql/ast/Identifier$Builder { @@ -1268,9 +1268,9 @@ public class org/partiql/ast/QueryBody$SetOp : org/partiql/ast/QueryBody { protected fun canEqual (Ljava/lang/Object;)Z public fun equals (Ljava/lang/Object;)Z public fun getChildren ()Ljava/util/List; - public fun getOuter ()Z public fun getType ()Lorg/partiql/ast/SetOp; public fun hashCode ()I + public fun isOuter ()Z } public class org/partiql/ast/QueryBody$SetOp$Builder { @@ -1496,8 +1496,8 @@ public class org/partiql/ast/ddl/AttributeConstraint$Null : org/partiql/ast/ddl/ public fun accept (Lorg/partiql/ast/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object; protected fun canEqual (Ljava/lang/Object;)Z public fun equals (Ljava/lang/Object;)Z - public fun getNullable ()Z public fun hashCode ()I + public fun isNullable ()Z } public class org/partiql/ast/ddl/AttributeConstraint$Unique : org/partiql/ast/ddl/AttributeConstraint { @@ -1505,8 +1505,8 @@ public class org/partiql/ast/ddl/AttributeConstraint$Unique : org/partiql/ast/dd public fun accept (Lorg/partiql/ast/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object; protected fun canEqual (Ljava/lang/Object;)Z public fun equals (Ljava/lang/Object;)Z - public fun getPrimaryKey ()Z public fun hashCode ()I + public fun isPrimaryKey ()Z } public final class org/partiql/ast/ddl/ColumnDefinition : org/partiql/ast/AstNode { @@ -1519,8 +1519,8 @@ public final class org/partiql/ast/ddl/ColumnDefinition : org/partiql/ast/AstNod public fun getConstraints ()Ljava/util/List; public fun getDataType ()Lorg/partiql/ast/DataType; public fun getName ()Lorg/partiql/ast/Identifier; - public fun getOptional ()Z public fun hashCode ()I + public fun isOptional ()Z } public class org/partiql/ast/ddl/ColumnDefinition$Builder { @@ -1608,8 +1608,8 @@ public class org/partiql/ast/ddl/TableConstraint$Unique : org/partiql/ast/ddl/Ta public fun equals (Ljava/lang/Object;)Z public fun getChildren ()Ljava/util/List; public fun getColumns ()Ljava/util/List; - public fun getPrimaryKey ()Z public fun hashCode ()I + public fun isPrimaryKey ()Z } public abstract class org/partiql/ast/dml/ConflictAction : org/partiql/ast/AstNode { @@ -2027,10 +2027,10 @@ public final class org/partiql/ast/expr/ExprBetween : org/partiql/ast/expr/Expr public fun equals (Ljava/lang/Object;)Z public fun getChildren ()Ljava/util/List; public fun getFrom ()Lorg/partiql/ast/expr/Expr; - public fun getNot ()Z public fun getTo ()Lorg/partiql/ast/expr/Expr; public fun getValue ()Lorg/partiql/ast/expr/Expr; public fun hashCode ()I + public fun isNot ()Z } public class org/partiql/ast/expr/ExprBetween$Builder { @@ -2048,10 +2048,10 @@ public final class org/partiql/ast/expr/ExprBoolTest : org/partiql/ast/expr/Expr public static fun builder ()Lorg/partiql/ast/expr/ExprBoolTest$Builder; public fun equals (Ljava/lang/Object;)Z public fun getChildren ()Ljava/util/List; - public fun getNot ()Z public fun getTruthValue ()Lorg/partiql/ast/expr/TruthValue; public fun getValue ()Lorg/partiql/ast/expr/Expr; public fun hashCode ()I + public fun isNot ()Z } public class org/partiql/ast/expr/ExprBoolTest$Builder { @@ -2180,9 +2180,9 @@ public final class org/partiql/ast/expr/ExprInCollection : org/partiql/ast/expr/ public fun equals (Ljava/lang/Object;)Z public fun getChildren ()Ljava/util/List; public fun getLhs ()Lorg/partiql/ast/expr/Expr; - public fun getNot ()Z public fun getRhs ()Lorg/partiql/ast/expr/Expr; public fun hashCode ()I + public fun isNot ()Z } public class org/partiql/ast/expr/ExprInCollection$Builder { @@ -2199,10 +2199,10 @@ public final class org/partiql/ast/expr/ExprIsType : org/partiql/ast/expr/Expr { public static fun builder ()Lorg/partiql/ast/expr/ExprIsType$Builder; public fun equals (Ljava/lang/Object;)Z public fun getChildren ()Ljava/util/List; - public fun getNot ()Z public fun getType ()Lorg/partiql/ast/DataType; public fun getValue ()Lorg/partiql/ast/expr/Expr; public fun hashCode ()I + public fun isNot ()Z } public class org/partiql/ast/expr/ExprIsType$Builder { @@ -2220,10 +2220,10 @@ public final class org/partiql/ast/expr/ExprLike : org/partiql/ast/expr/Expr { public fun equals (Ljava/lang/Object;)Z public fun getChildren ()Ljava/util/List; public fun getEscape ()Lorg/partiql/ast/expr/Expr; - public fun getNot ()Z public fun getPattern ()Lorg/partiql/ast/expr/Expr; public fun getValue ()Lorg/partiql/ast/expr/Expr; public fun hashCode ()I + public fun isNot ()Z } public class org/partiql/ast/expr/ExprLike$Builder { @@ -2268,9 +2268,9 @@ public final class org/partiql/ast/expr/ExprMissingPredicate : org/partiql/ast/e public static fun builder ()Lorg/partiql/ast/expr/ExprMissingPredicate$Builder; public fun equals (Ljava/lang/Object;)Z public fun getChildren ()Ljava/util/List; - public fun getNot ()Z public fun getValue ()Lorg/partiql/ast/expr/Expr; public fun hashCode ()I + public fun isNot ()Z } public class org/partiql/ast/expr/ExprMissingPredicate$Builder { @@ -2320,9 +2320,9 @@ public final class org/partiql/ast/expr/ExprNullPredicate : org/partiql/ast/expr public static fun builder ()Lorg/partiql/ast/expr/ExprNullPredicate$Builder; public fun equals (Ljava/lang/Object;)Z public fun getChildren ()Ljava/util/List; - public fun getNot ()Z public fun getValue ()Lorg/partiql/ast/expr/Expr; public fun hashCode ()I + public fun isNot ()Z } public class org/partiql/ast/expr/ExprNullPredicate$Builder { @@ -2473,7 +2473,6 @@ public final class org/partiql/ast/expr/ExprRowValue : org/partiql/ast/expr/Expr public static fun builder ()Lorg/partiql/ast/expr/ExprRowValue$Builder; public fun equals (Ljava/lang/Object;)Z public fun getChildren ()Ljava/util/List; - public fun getExplicit ()Z public fun getValues ()Ljava/util/List; public fun hashCode ()I public fun isExplicit ()Z diff --git a/partiql-ast/build.gradle.kts b/partiql-ast/build.gradle.kts index 1097feb4b..b126f48d8 100644 --- a/partiql-ast/build.gradle.kts +++ b/partiql-ast/build.gradle.kts @@ -21,10 +21,6 @@ plugins { kotlin("plugin.lombok") version "2.1.0" } -kotlinLombok { - lombokConfigurationFile(file("lombok.config")) -} - dependencies { api(Deps.ionElement) compileOnly(Deps.lombok) diff --git a/partiql-ast/lombok.config b/partiql-ast/lombok.config deleted file mode 100644 index 47214f388..000000000 --- a/partiql-ast/lombok.config +++ /dev/null @@ -1,3 +0,0 @@ -# Make getters generated for `boolean` fields to use `get` prefix rather than default `is` prefix -# Also, -lombok.getter.noIsPrefix = true \ No newline at end of file diff --git a/partiql-ast/src/main/java/org/partiql/ast/expr/ExprRowValue.java b/partiql-ast/src/main/java/org/partiql/ast/expr/ExprRowValue.java index 6dfd54f81..9f1685166 100644 --- a/partiql-ast/src/main/java/org/partiql/ast/expr/ExprRowValue.java +++ b/partiql-ast/src/main/java/org/partiql/ast/expr/ExprRowValue.java @@ -22,10 +22,6 @@ @lombok.Builder(builderClassName = "Builder") @EqualsAndHashCode(callSuper = false) public final class ExprRowValue extends Expr { - public boolean isExplicit() { - return explicit; - } - /** * Specifies whether the ROW keyword explicitly precedes the elements in the textual representation. For example, * {@code ROW (1, 2, 3)} versus {@code (1, 2, 3)}. In the first example, {@code isExplicit} is true. diff --git a/partiql-ast/src/main/java/org/partiql/ast/sql/SqlDialect.kt b/partiql-ast/src/main/java/org/partiql/ast/sql/SqlDialect.kt index 82500ed3c..0bfc2444f 100644 --- a/partiql-ast/src/main/java/org/partiql/ast/sql/SqlDialect.kt +++ b/partiql-ast/src/main/java/org/partiql/ast/sql/SqlDialect.kt @@ -396,7 +396,7 @@ public abstract class SqlDialect : AstVisitor() { override fun visitExprLike(node: ExprLike, tail: SqlBlock): SqlBlock { var t = tail t = visitExprWrapped(node.value, t) - t = t concat if (node.not) " NOT LIKE " else " LIKE " + t = t concat if (node.isNot) " NOT LIKE " else " LIKE " t = visitExprWrapped(node.pattern, t) val escape = node.escape if (escape != null) { @@ -409,7 +409,7 @@ public abstract class SqlDialect : AstVisitor() { override fun visitExprBetween(node: ExprBetween, tail: SqlBlock): SqlBlock { var t = tail t = visitExprWrapped(node.value, t) - t = t concat if (node.not) " NOT BETWEEN " else " BETWEEN " + t = t concat if (node.isNot) " NOT BETWEEN " else " BETWEEN " t = visitExprWrapped(node.from, t) t = t concat " AND " t = visitExprWrapped(node.to, t) @@ -419,7 +419,7 @@ public abstract class SqlDialect : AstVisitor() { override fun visitExprInCollection(node: ExprInCollection, tail: SqlBlock): SqlBlock { var t = tail t = visitExprWrapped(node.lhs, t) - t = t concat if (node.not) " NOT IN " else " IN " + t = t concat if (node.isNot) " NOT IN " else " IN " t = visitExprWrapped(node.rhs, t) return t } @@ -427,21 +427,21 @@ public abstract class SqlDialect : AstVisitor() { override fun visitExprNullPredicate(node: ExprNullPredicate, tail: SqlBlock): SqlBlock { var t = tail t = visitExprWrapped(node.value, t) - t = t concat if (node.not) " IS NOT NULL" else " IS NULL" + t = t concat if (node.isNot) " IS NOT NULL" else " IS NULL" return t } override fun visitExprMissingPredicate(node: ExprMissingPredicate, tail: SqlBlock): SqlBlock { var t = tail t = visitExprWrapped(node.value, t) - t = t concat if (node.not) " IS NOT MISSING" else " IS MISSING" + t = t concat if (node.isNot) " IS NOT MISSING" else " IS MISSING" return t } override fun visitExprBoolTest(node: ExprBoolTest, tail: SqlBlock): SqlBlock { var t = tail t = visitExprWrapped(node.value, t) - t = t concat if (node.not) " IS NOT " else " IS " + t = t concat if (node.isNot) " IS NOT " else " IS " t = t concat when (node.truthValue.code()) { TruthValue.TRUE -> "TRUE" TruthValue.FALSE -> "FALSE" @@ -454,7 +454,7 @@ public abstract class SqlDialect : AstVisitor() { override fun visitExprIsType(node: ExprIsType, tail: SqlBlock): SqlBlock { var t = tail t = visitExprWrapped(node.value, t) - t = t concat if (node.not) " IS NOT " else " IS " + t = t concat if (node.isNot) " IS NOT " else " IS " t = visitDataType(node.type, t) return t } @@ -631,7 +631,7 @@ public abstract class SqlDialect : AstVisitor() { override fun visitQueryBodySetOp(node: QueryBody.SetOp, tail: SqlBlock): SqlBlock { val op = mutableListOf() - when (node.outer) { + when (node.isOuter) { true -> op.add("OUTER") else -> {} } @@ -894,7 +894,7 @@ public abstract class SqlDialect : AstVisitor() { ) } - private fun Identifier.sql() = when (delimited) { + private fun Identifier.sql() = when (isDelimited) { true -> "\"$symbol\"" false -> symbol // verbatim .. } diff --git a/partiql-ast/src/main/kotlin/org/partiql/ast/AstRewriter.kt b/partiql-ast/src/main/kotlin/org/partiql/ast/AstRewriter.kt index f2eee8bd7..d51dbff8c 100644 --- a/partiql-ast/src/main/kotlin/org/partiql/ast/AstRewriter.kt +++ b/partiql-ast/src/main/kotlin/org/partiql/ast/AstRewriter.kt @@ -114,8 +114,8 @@ public abstract class AstRewriter : AstVisitor() { val value = visitExpr(node.value, ctx) as Expr val from = visitExpr(node.from, ctx) as Expr val to = visitExpr(node.to, ctx) as Expr - val not = node.not - return if (value !== node.value || from !== node.from || to !== node.to || not != node.not) { + val not = node.isNot + return if (value !== node.value || from !== node.from || to !== node.to || not != node.isNot) { ExprBetween(value, from, to, not) } else { node @@ -186,8 +186,8 @@ public abstract class AstRewriter : AstVisitor() { override fun visitExprInCollection(node: ExprInCollection, ctx: C): AstNode { val lhs = visitExpr(node.lhs, ctx) as Expr val rhs = visitExpr(node.rhs, ctx) as Expr - val not = node.not - return if (lhs !== node.lhs || rhs !== node.rhs || not != node.not) { + val not = node.isNot + return if (lhs !== node.lhs || rhs !== node.rhs || not != node.isNot) { ExprInCollection(lhs, rhs, not) } else { node @@ -196,8 +196,8 @@ public abstract class AstRewriter : AstVisitor() { override fun visitExprMissingPredicate(node: ExprMissingPredicate, ctx: C): AstNode { val value = visitExpr(node.value, ctx) as Expr - val not = node.not - return if (value !== node.value || not != node.not) { + val not = node.isNot + return if (value !== node.value || not != node.isNot) { ExprMissingPredicate(value, not) } else { node @@ -206,8 +206,8 @@ public abstract class AstRewriter : AstVisitor() { override fun visitExprNullPredicate(node: ExprNullPredicate, ctx: C): AstNode { val value = visitExpr(node.value, ctx) as Expr - val not = node.not - return if (value !== node.value || not != node.not) { + val not = node.isNot + return if (value !== node.value || not != node.isNot) { ExprNullPredicate(value, not) } else { node @@ -216,9 +216,9 @@ public abstract class AstRewriter : AstVisitor() { override fun visitExprBoolTest(node: ExprBoolTest, ctx: C): AstNode { val value = visitExpr(node.value, ctx) as Expr - val not = node.not + val not = node.isNot val truthValue = node.truthValue - return if (value !== node.value || not != node.not || truthValue != node.truthValue) { + return if (value !== node.value || not != node.isNot || truthValue != node.truthValue) { ExprBoolTest(value, not, truthValue) } else { node @@ -228,8 +228,8 @@ public abstract class AstRewriter : AstVisitor() { override fun visitExprIsType(node: ExprIsType, ctx: C): AstNode { val value = visitExpr(node.value, ctx) as Expr val type = node.type - val not = node.not - return if (value !== node.value || type !== node.type || not != node.not) { + val not = node.isNot + return if (value !== node.value || type !== node.type || not != node.isNot) { ExprIsType(value, type, not) } else { node @@ -240,8 +240,8 @@ public abstract class AstRewriter : AstVisitor() { val value = visitExpr(node.value, ctx) as Expr val pattern = visitExpr(node.pattern, ctx) as Expr val escape = node.escape?.let { visitExpr(it, ctx) as Expr? } - val not = node.not - return if (value !== node.value || pattern !== node.pattern || escape !== node.escape || not != node.not) { + val not = node.isNot + return if (value !== node.value || pattern !== node.pattern || escape !== node.escape || not != node.isNot) { ExprLike(value, pattern, escape, not) } else { node @@ -670,7 +670,7 @@ public abstract class AstRewriter : AstVisitor() { override fun visitIdentifier(node: Identifier, ctx: C): AstNode { val symbol = node.symbol - val isDelimited = node.delimited + val isDelimited = node.isDelimited return identifier(symbol, isDelimited) } @@ -731,10 +731,10 @@ public abstract class AstRewriter : AstVisitor() { public override fun visitQueryBodySetOp(node: QueryBody.SetOp, ctx: C): AstNode { val type = visitSetOp(node.type, ctx) as SetOp - val isOuter = node.outer + val isOuter = node.isOuter val lhs = visitExpr(node.lhs, ctx) as Expr val rhs = visitExpr(node.rhs, ctx) as Expr - return if (type !== node.type || isOuter != node.outer || lhs !== node.lhs || rhs !== node.rhs) { + return if (type !== node.type || isOuter != node.isOuter || lhs !== node.lhs || rhs !== node.rhs) { QueryBody.SetOp(type, isOuter, lhs, rhs) } else { node diff --git a/partiql-parser/src/main/kotlin/org/partiql/parser/internal/PartiQLParserDefault.kt b/partiql-parser/src/main/kotlin/org/partiql/parser/internal/PartiQLParserDefault.kt index d78db4ae5..90100e8f1 100644 --- a/partiql-parser/src/main/kotlin/org/partiql/parser/internal/PartiQLParserDefault.kt +++ b/partiql-parser/src/main/kotlin/org/partiql/parser/internal/PartiQLParserDefault.kt @@ -645,8 +645,8 @@ internal class PartiQLParserDefault : PartiQLParser { val constrName = ctx.constraintName()?.let { visitQualifiedName(it.qualifiedName()) } val body = visitAs(ctx.columnConstraint()) when (body) { - is AttributeConstraint.Unique -> columnConstraintUnique(constrName, body.primaryKey) - is AttributeConstraint.Null -> columnConstraintNullable(constrName, body.nullable) + is AttributeConstraint.Unique -> columnConstraintUnique(constrName, body.isPrimaryKey) + is AttributeConstraint.Null -> columnConstraintNullable(constrName, body.isNullable) is AttributeConstraint.Check -> columnConstraintCheck(constrName, body.searchCondition) else -> throw error(ctx, "Unexpected Table Constraint Definition") } @@ -677,7 +677,7 @@ internal class PartiQLParserDefault : PartiQLParser { val constraintName = ctx.constraintName()?.let { visitQualifiedName(it.qualifiedName()) } val body = visitAs(ctx.tableConstraint()) when (body) { - is TableConstraint.Unique -> tableConstraintUnique(constraintName, body.columns, body.primaryKey) + is TableConstraint.Unique -> tableConstraintUnique(constraintName, body.columns, body.isPrimaryKey) else -> throw error(ctx, "Unexpected Table Constraint Definition") } } diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/AstToPlan.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/AstToPlan.kt index 7f41aa384..986fc19c7 100644 --- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/AstToPlan.kt +++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/AstToPlan.kt @@ -68,7 +68,7 @@ internal object AstToPlan { return Identifier.of(part(identifier)) } - fun part(identifier: AstIdentifier): Identifier.Part = when (identifier.delimited) { + fun part(identifier: AstIdentifier): Identifier.Part = when (identifier.isDelimited) { true -> Identifier.Part.delimited(identifier.symbol) false -> Identifier.Part.regular(identifier.symbol) } diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/NormalizeSelect.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/NormalizeSelect.kt index 45c1549be..072172f6e 100644 --- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/NormalizeSelect.kt +++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/NormalizeSelect.kt @@ -128,7 +128,7 @@ internal object NormalizeSelect { exprQuerySet( body = queryBodySetOp( type = body.type, - isOuter = body.outer, + isOuter = body.isOuter, lhs = lhs, rhs = rhs ), diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RelConverter.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RelConverter.kt index ff70b975c..bbc99472d 100644 --- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RelConverter.kt +++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RelConverter.kt @@ -532,7 +532,7 @@ internal object RelConverter { null, SetQuantifier.DISTINCT -> org.partiql.planner.internal.ir.SetQuantifier.DISTINCT else -> error("Unexpected SetQuantifier type: ${setExpr.type.setq}") } - val outer = setExpr.outer + val outer = setExpr.isOuter val op = when (setExpr.type.setOpType.code()) { SetOpType.UNION -> Rel.Op.Union(quantifier, outer, lhs, rhs) SetOpType.EXCEPT -> Rel.Op.Except(quantifier, outer, lhs, rhs) @@ -630,7 +630,7 @@ internal object RelConverter { private fun stepToExcludeType(step: ExcludeStep): Rel.Op.Exclude.Type { return when (step) { is ExcludeStep.StructField -> { - when (step.symbol.delimited) { + when (step.symbol.isDelimited) { false -> relOpExcludeTypeStructSymbol(step.symbol.symbol) true -> relOpExcludeTypeStructKey(step.symbol.symbol) } diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RexConverter.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RexConverter.kt index 01a9fbf9e..450b39887 100644 --- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RexConverter.kt +++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RexConverter.kt @@ -409,7 +409,7 @@ internal object RexConverter { // > IF NOT is specified in a , then let BP be the contained and let // > TV be the contained . The is equivalent to: // > ( NOT ( BP IS TV ) ) - if (node.not) { + if (node.isNot) { call = negate(call) } return rex(BOOL, call) @@ -519,7 +519,7 @@ internal object RexConverter { } is PathStep.Field -> { - when (curStep.field.delimited) { + when (curStep.field.isDelimited) { true -> { // case-sensitive path step becomes a key lookup rexOpPathKey(curPathNavi, rexString(curStep.field.symbol)) @@ -806,7 +806,7 @@ internal object RexConverter { else -> call("like_escape", arg0, arg1, arg2) } // NOT? - if (node.not) { + if (node.isNot) { call = negate(call) } return rex(type, call) @@ -824,7 +824,7 @@ internal object RexConverter { // Call var call = call("between", arg0, arg1, arg2) // NOT? - if (node.not) { + if (node.isNot) { call = negate(call) } rex(type, call) @@ -851,7 +851,7 @@ internal object RexConverter { // Call var call = call("in_collection", arg0, arg1) // NOT? - if (node.not) { + if (node.isNot) { call = negate(call) } return rex(type, call) @@ -863,7 +863,7 @@ internal object RexConverter { override fun visitExprNullPredicate(node: ExprNullPredicate, ctx: Env): Rex { val value = visitExprCoerce(node.value, ctx) var call = call("is_null", value) - if (node.not) { + if (node.isNot) { call = negate(call) } return rex(BOOL, call) @@ -875,7 +875,7 @@ internal object RexConverter { override fun visitExprMissingPredicate(node: ExprMissingPredicate, ctx: Env): Rex { val value = visitExprCoerce(node.value, ctx) var call = call("is_missing", value) - if (node.not) { + if (node.isNot) { call = negate(call) } return rex(BOOL, call) @@ -938,7 +938,7 @@ internal object RexConverter { else -> error("Unexpected DataType type: $targetType") } - if (node.not) { + if (node.isNot) { call = negate(call) }