Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skyline syntax (preferring clause) #2078

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
import net.sf.jsqlparser.expression.operators.relational.MinorThan;
import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
import net.sf.jsqlparser.expression.operators.relational.Plus;
import net.sf.jsqlparser.expression.operators.relational.PriorTo;
import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
import net.sf.jsqlparser.expression.operators.relational.TSQLLeftJoin;
Expand Down Expand Up @@ -633,4 +635,34 @@ default void visit(StructType structType) {
default void visit(LambdaExpression lambdaExpression) {
this.visit(lambdaExpression, null);
}

<S> T visit(HighExpression highExpression, S context);

default void visit(HighExpression highExpression) {
this.visit(highExpression, null);
}

<S> T visit(LowExpression lowExpression, S context);

default void visit(LowExpression lowExpression) {
this.visit(lowExpression, null);
}

<S> T visit(Plus plus, S context);

default void visit(Plus plus) {
this.visit(plus, null);
}

<S> T visit(PriorTo priorTo, S context);

default void visit(PriorTo priorTo) {
this.visit(priorTo, null);
}

<S> T visit(Inverse inverse, S context);

default void visit(Inverse inverse) {
this.visit(inverse, null);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@
import net.sf.jsqlparser.expression.operators.relational.Contains;
import net.sf.jsqlparser.expression.operators.relational.DoubleAnd;
import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
import net.sf.jsqlparser.expression.operators.relational.ExcludesExpression;
import net.sf.jsqlparser.expression.operators.relational.ExistsExpression;
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
import net.sf.jsqlparser.expression.operators.relational.FullTextSearch;
import net.sf.jsqlparser.expression.operators.relational.GeometryDistance;
import net.sf.jsqlparser.expression.operators.relational.GreaterThan;
import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals;
import net.sf.jsqlparser.expression.operators.relational.InExpression;
import net.sf.jsqlparser.expression.operators.relational.IncludesExpression;
import net.sf.jsqlparser.expression.operators.relational.IsBooleanExpression;
import net.sf.jsqlparser.expression.operators.relational.IsDistinctExpression;
import net.sf.jsqlparser.expression.operators.relational.IsNullExpression;
Expand All @@ -46,9 +48,12 @@
import net.sf.jsqlparser.expression.operators.relational.MinorThan;
import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
import net.sf.jsqlparser.expression.operators.relational.Plus;
import net.sf.jsqlparser.expression.operators.relational.PriorTo;
import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
import net.sf.jsqlparser.expression.operators.relational.*;
import net.sf.jsqlparser.expression.operators.relational.TSQLLeftJoin;
import net.sf.jsqlparser.expression.operators.relational.TSQLRightJoin;
import net.sf.jsqlparser.schema.Column;
import net.sf.jsqlparser.statement.select.AllColumns;
import net.sf.jsqlparser.statement.select.AllTableColumns;
Expand Down Expand Up @@ -762,4 +767,29 @@ public <S> T visit(LambdaExpression lambdaExpression, S context) {
return lambdaExpression.getExpression().accept(this, context);
}

@Override
public <S> T visit(HighExpression highExpression, S context) {
return highExpression.getExpression().accept(this, context);
}

@Override
public <S> T visit(LowExpression lowExpression, S context) {
return lowExpression.getExpression().accept(this, context);
}

@Override
public <S> T visit(Plus plus, S context) {
return visitBinaryExpression(plus, context);
}

@Override
public <S> T visit(PriorTo priorTo, S context) {
return visitBinaryExpression(priorTo, context);
}

@Override
public <S> T visit(Inverse inverse, S context) {
return inverse.getExpression().accept(this, context);
}

}
42 changes: 42 additions & 0 deletions src/main/java/net/sf/jsqlparser/expression/HighExpression.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*-
* #%L
* JSQLParser library
* %%
* Copyright (C) 2004 - 2019 JSQLParser
* %%
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
* #L%
*/
package net.sf.jsqlparser.expression;

import net.sf.jsqlparser.parser.ASTNodeAccessImpl;

public class HighExpression extends ASTNodeAccessImpl implements Expression {
private Expression expression;

public HighExpression() {
// empty constructor
}

public HighExpression(Expression expression) {
this.expression = expression;
}

@Override
public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S context) {
return expressionVisitor.visit(this, context);
}

public Expression getExpression() {
return expression;
}

public void setExpression(Expression expression) {
this.expression = expression;
}

@Override
public String toString() {
return "HIGH " + expression.toString();
}
}
42 changes: 42 additions & 0 deletions src/main/java/net/sf/jsqlparser/expression/Inverse.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*-
* #%L
* JSQLParser library
* %%
* Copyright (C) 2004 - 2019 JSQLParser
* %%
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
* #L%
*/
package net.sf.jsqlparser.expression;

import net.sf.jsqlparser.parser.ASTNodeAccessImpl;

public class Inverse extends ASTNodeAccessImpl implements Expression {
private Expression expression;

public Inverse() {
// empty constructor
}

public Inverse(Expression expression) {
this.expression = expression;
}

@Override
public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S context) {
return expressionVisitor.visit(this, context);
}

public Expression getExpression() {
return expression;
}

public void setExpression(Expression expression) {
this.expression = expression;
}

@Override
public String toString() {
return "INVERSE (" + expression.toString() + ")";
}
}
42 changes: 42 additions & 0 deletions src/main/java/net/sf/jsqlparser/expression/LowExpression.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*-
* #%L
* JSQLParser library
* %%
* Copyright (C) 2004 - 2019 JSQLParser
* %%
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
* #L%
*/
package net.sf.jsqlparser.expression;

import net.sf.jsqlparser.parser.ASTNodeAccessImpl;

public class LowExpression extends ASTNodeAccessImpl implements Expression {
private Expression expression;

public LowExpression() {
// empty constructor
}

public LowExpression(Expression expression) {
this.expression = expression;
}

@Override
public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S context) {
return expressionVisitor.visit(this, context);
}

public Expression getExpression() {
return expression;
}

public void setExpression(Expression expression) {
this.expression = expression;
}

@Override
public String toString() {
return "LOW " + expression.toString();
}
}
48 changes: 48 additions & 0 deletions src/main/java/net/sf/jsqlparser/expression/PreferringClause.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*-
* #%L
* JSQLParser library
* %%
* Copyright (C) 2004 - 2019 JSQLParser
* %%
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
* #L%
*/
package net.sf.jsqlparser.expression;

import net.sf.jsqlparser.expression.operators.relational.ExpressionList;

import java.io.Serializable;

public class PreferringClause implements Serializable {
private Expression preferring;
private PartitionByClause partitionBy;

public PreferringClause(Expression preferring) {
this.preferring = preferring;
}

public void setPartitionExpressionList(ExpressionList expressionList,
boolean brackets) {
if (this.partitionBy == null) {
this.partitionBy = new PartitionByClause();
}
partitionBy.setPartitionExpressionList(expressionList, brackets);
}

public void toStringPreferring(StringBuilder b) {
b.append("PREFERRING ");
b.append(preferring.toString());

if (partitionBy != null) {
b.append(" ");
partitionBy.toStringPartitionBy(b);
}
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
toStringPreferring(sb);
return sb.toString();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*-
* #%L
* JSQLParser library
* %%
* Copyright (C) 2004 - 2019 JSQLParser
* %%
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
* #L%
*/
package net.sf.jsqlparser.expression.operators.relational;

import net.sf.jsqlparser.expression.BinaryExpression;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.ExpressionVisitor;

public class Plus extends BinaryExpression {
public Plus(Expression leftExpression, Expression rightExpression) {
super(leftExpression, rightExpression);
}

@Override
public String getStringExpression() {
return "PLUS";
}

@Override
public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S context) {
return expressionVisitor.visit(this, context);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*-
* #%L
* JSQLParser library
* %%
* Copyright (C) 2004 - 2019 JSQLParser
* %%
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
* #L%
*/
package net.sf.jsqlparser.expression.operators.relational;

import net.sf.jsqlparser.expression.BinaryExpression;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.ExpressionVisitor;

public class PriorTo extends BinaryExpression {
public PriorTo(Expression leftExpression, Expression rightExpression) {
super(leftExpression, rightExpression);
}

@Override
public String getStringExpression() {
return "PRIOR TO";
}

@Override
public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S context) {
return expressionVisitor.visit(this, context);
}
}
Loading
Loading