honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SQL: Align SYS TABLE for ODBC SQL_ALL_* args (#33364) 

Fix a bug in SYS TABLES command that did skipped SQL_ALL_* arguments for
catalog and table types

Fix #33312
This commit is contained in:
Costin Leau 2018-09-05 10:44:18 +03:00 committed by GitHub
parent 9f96d2ce17
commit d7965ba681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/CommandBuilder.java
View File

@ -157,9 +157,9 @@ abstract class CommandBuilder extends LogicalPlanBuilder {
if (value != null) {
// check special ODBC wildcard case
if (value.equals(StringUtils.SQL_WILDCARD) && ctx.string().size() == 1) {
// since % is the same as not specifying a value, choose
// convert % to enumeration
// https://docs.microsoft.com/en-us/sql/odbc/reference/develop-app/value-list-arguments?view=ssdt-18vs2017
// that is skip the value
types.addAll(IndexType.VALID);
}
// special case for legacy apps (like msquery) that always asks for 'TABLE'
// which we manually map to all concrete tables supported

7
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/sys/SysTables.java
View File

@ -78,7 +78,7 @@ public class SysTables extends Command {
// https://docs.microsoft.com/en-us/sql/odbc/reference/syntax/sqltables-function?view=ssdt-18vs2017#comments
if (clusterPattern != null && clusterPattern.pattern().equals(SQL_WILDCARD)) {
if (pattern != null && pattern.pattern().isEmpty() && CollectionUtils.isEmpty(types)) {
if ((pattern == null || pattern.pattern().isEmpty()) && CollectionUtils.isEmpty(types)) {
Object[] enumeration = new Object[10];
// send only the cluster, everything else null
enumeration[0] = cluster;
@ -88,8 +88,9 @@ public class SysTables extends Command {
}
// if no types were specified (the parser takes care of the % case)
if (CollectionUtils.isEmpty(types)) {
if (clusterPattern != null && clusterPattern.pattern().isEmpty()) {
if (IndexType.VALID.equals(types)) {
if ((clusterPattern == null || clusterPattern.pattern().isEmpty())
&& (pattern == null || pattern.pattern().isEmpty())) {
List<List<?>> values = new ArrayList<>();
// send only the types, everything else null
for (IndexType type : IndexType.VALID) {

39
x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/plan/logical/command/sys/SysTablesTests.java
View File

@ -49,6 +49,22 @@ public class SysTablesTests extends ESTestCase {
private final IndexInfo index = new IndexInfo("test", IndexType.INDEX);
private final IndexInfo alias = new IndexInfo("alias", IndexType.ALIAS);
public void testSysTablesEnumerateCatalog() throws Exception {
executeCommand("SYS TABLES CATALOG LIKE '%'", r -> {
assertEquals(1, r.size());
assertEquals(CLUSTER_NAME, r.column(0));
});
}
public void testSysTablesEnumerateTypes() throws Exception {
executeCommand("SYS TABLES TYPE '%'", r -> {
assertEquals(2, r.size());
assertEquals("ALIAS", r.column(3));
assertTrue(r.advanceRow());
assertEquals("BASE TABLE", r.column(3));
});
}
public void testSysTablesDifferentCatalog() throws Exception {
executeCommand("SYS TABLES CATALOG LIKE 'foo'", r -> {
assertEquals(0, r.size());
@ -58,10 +74,10 @@ public class SysTablesTests extends ESTestCase {
public void testSysTablesNoTypes() throws Exception {
executeCommand("SYS TABLES", r -> {
assertEquals("alias", r.column(2));
assertTrue(r.advanceRow());
assertEquals(2, r.size());
assertEquals("test", r.column(2));
assertEquals("ALIAS", r.column(3));
assertTrue(r.advanceRow());
assertEquals("BASE TABLE", r.column(3));
}, index, alias);
}
@ -208,22 +224,7 @@ public class SysTablesTests extends ESTestCase {
public void testSysTablesTypesEnumerationWoString() throws Exception {
executeCommand("SYS TABLES CATALOG LIKE '' LIKE '' ", r -> {
assertEquals(2, r.size());
Iterator<IndexType> it = IndexType.VALID.stream().sorted(Comparator.comparing(IndexType::toSql)).iterator();
for (int t = 0; t < r.size(); t++) {
assertEquals(it.next().toSql(), r.column(3));
// everything else should be null
for (int i = 0; i < 10; i++) {
if (i != 3) {
assertNull(r.column(i));
}
}
r.advanceRow();
}
assertEquals(0, r.size());
}, new IndexInfo[0]);
}