From 4b9cca2d80cf3a797e54afe8a5f0abf42c3aeb8a Mon Sep 17 00:00:00 2001 From: Jonny Dixon Date: Mon, 22 May 2023 13:15:02 +0100 Subject: [PATCH] 24.0.0 --- dremio-sybasearp-plugin.jar | Bin 17423 -> 17474 bytes pom.xml | 10 +++++---- .../exec/store/jdbc/conf/SybaseConf.java | 2 +- .../store/jdbc/dialect/SybaseDialect.java | 19 ++++++++++-------- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dremio-sybasearp-plugin.jar b/dremio-sybasearp-plugin.jar index e382f56678d8b7d3df8242a010ac2b60cb607004..ae759c80df225694ada254df05f637d08432b02b 100644 GIT binary patch delta 9180 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 LBh(o2Uv2*fyF6$G delta 9138 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 - - 4.0.0 + 4.0.0 com.dremio.plugin - 19.1.0 + 24.0.0 dremio-sybasearp-plugin Dremio Sybase ARP Community Connector - 19.1.0-202111160130570172-0ee00450 + 24.0.0-202302100528110223-3a169b7c diff --git a/src/main/java/com/dremio/exec/store/jdbc/conf/SybaseConf.java b/src/main/java/com/dremio/exec/store/jdbc/conf/SybaseConf.java index 2e9707e..85edde1 100644 --- a/src/main/java/com/dremio/exec/store/jdbc/conf/SybaseConf.java +++ b/src/main/java/com/dremio/exec/store/jdbc/conf/SybaseConf.java @@ -44,7 +44,7 @@ /** * Configuration for Sybase sources. */ -@SourceType(value = "SYBASEARP", label = "Sybase", uiConfig = "sybasearp-layout.json", externalQuerySupported = true) +@SourceType(value = "SYBASEARP", label = "Sybase", uiConfig = "sybasearp-layout.json", externalQuerySupported = true, previewEngineRequired = true) public class SybaseConf extends AbstractArpConf { private static final String ARP_FILENAME = "arp/implementation/sybase-arp.yaml"; private static final ArpDialect ARP_DIALECT = diff --git a/src/main/java/com/dremio/exec/store/jdbc/dialect/SybaseDialect.java b/src/main/java/com/dremio/exec/store/jdbc/dialect/SybaseDialect.java index 2d48557..85e8992 100644 --- a/src/main/java/com/dremio/exec/store/jdbc/dialect/SybaseDialect.java +++ b/src/main/java/com/dremio/exec/store/jdbc/dialect/SybaseDialect.java @@ -12,6 +12,7 @@ import org.apache.calcite.sql.SqlLiteral; import org.apache.calcite.sql.SqlNodeList; import org.apache.calcite.sql.SqlWriter; +import org.apache.calcite.sql.SqlOperator; import org.apache.calcite.sql.parser.SqlParserPos; import org.apache.calcite.sql.SqlAbstractDateTimeLiteral; import com.dremio.exec.store.jdbc.dialect.arp.ArpDialect; @@ -71,22 +72,23 @@ public void unparseDateTimeLiteral(SqlWriter writer, } @Override - public void unparseCall(final SqlWriter writer, final SqlCall call, final int leftPrec, final int rightPrec) { - // Transform SqlSelect nodes that have a fetch node to be SqlSelect nodes with a TOP and no fetch. - if (call instanceof SqlSelect) { - final SqlSelect select = (SqlSelect) call; + public void unparseCall(SqlWriter writer, SqlCall call, int leftPrec, int rightPrec) { + final SqlOperator op = call.getOperator(); + if (call instanceof SqlSelect) { // Transform SqlSelect nodes that have a fetch node without offset to be // SqlSelect nodes with a TOP and no fetch. - if (null != select.getFetch() - && (null == select.getOffset() || 0 == ((SqlLiteral) select.getOffset()).getValueAs(Long.class))) { + final SqlSelect select = (SqlSelect) call; + + if (select.getFetch() != null + && (select.getOffset() == null || ((SqlLiteral) select.getOffset()).getValueAs(Long.class) == 0)) { final SqlNodeList keywords = new SqlNodeList(SqlParserPos.ZERO); // Add the DISTINCT or ALL keywords if the original Select had either. (Only can have one of these). // These must go before TOP. - if (null != select.getModifierNode(SqlSelectKeyword.DISTINCT)) { + if (select.getModifierNode(SqlSelectKeyword.DISTINCT) != null) { keywords.add(select.getModifierNode(SqlSelectKeyword.DISTINCT)); - } else if (null != select.getModifierNode(SqlSelectKeyword.ALL)) { + } else if (select.getModifierNode(SqlSelectKeyword.ALL) != null) { keywords.add(select.getModifierNode(SqlSelectKeyword.ALL)); } @@ -103,6 +105,7 @@ public void unparseCall(final SqlWriter writer, final SqlCall call, final int le select.getGroup(), select.getHaving(), select.getWindowList(), + select.getQualify(), select.getOrderList(), null, null,