Repository: calcite Updated Branches: refs/heads/master aed5bca7c -> c850e227d
http://git-wip-us.apache.org/repos/asf/calcite/blob/d97c14c5/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java b/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java index 0666dec..94551f9 100644 --- a/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java +++ b/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java @@ -5486,7 +5486,7 @@ public class SqlValidatorTest extends SqlValidatorTestCase { @Ignore("bug: should fail if sub-query does not have alias") @Test public void testJoinSubQuery() { // Sub-queries require alias - checkFails("select * from (select 1 as one from emp)\n" + checkFails("select * from (select 1 as uno from emp)\n" + "join (values (1), (2)) on true", "require alias"); } @@ -5637,8 +5637,8 @@ public class SqlValidatorTest extends SqlValidatorTestCase { checkResultType("with emp2 as (select * from emp),\n" + " dept2 as (select * from dept),\n" + " empDept as (select emp2.empno, dept2.deptno from dept2 join emp2 using (deptno))\n" - + "select 1 as one from empDept", - "RecordType(INTEGER NOT NULL ONE) NOT NULL"); + + "select 1 as uno from empDept", + "RecordType(INTEGER NOT NULL UNO) NOT NULL"); } /** Tests the {@code WITH} clause with UNION. */ @@ -5679,8 +5679,8 @@ public class SqlValidatorTest extends SqlValidatorTestCase { + " with dept2 as (select * from dept)\n" + " (\n" + " with empDept as (select emp2.empno, dept2.deptno from dept2 join emp2 using (deptno))\n" - + " select 1 as one from empDept))", - "RecordType(INTEGER NOT NULL ONE) NOT NULL"); + + " select 1 as uno from empDept))", + "RecordType(INTEGER NOT NULL UNO) NOT NULL"); // WITH inside WHERE can see enclosing tables checkResultType("select * from emp\n" @@ -5707,15 +5707,15 @@ public class SqlValidatorTest extends SqlValidatorTestCase { checkResultType("select e.empno, d.* from emp as e\n" + "join (\n" + " with dept2 as (select * from dept where dept.deptno > 10)\n" - + " select deptno, 1 as one from dept2) as d using (deptno)", + + " select deptno, 1 as uno from dept2) as d using (deptno)", "RecordType(INTEGER NOT NULL EMPNO," + " INTEGER NOT NULL DEPTNO," - + " INTEGER NOT NULL ONE) NOT NULL"); + + " INTEGER NOT NULL UNO) NOT NULL"); checkFails("select ^e^.empno, d.* from emp\n" + "join (\n" + " with dept2 as (select * from dept where dept.deptno > 10)\n" - + " select deptno, 1 as one from dept2) as d using (deptno)", + + " select deptno, 1 as uno from dept2) as d using (deptno)", "Table 'E' not found"); } @@ -7526,7 +7526,7 @@ public class SqlValidatorTest extends SqlValidatorTestCase { + " CATALOG.SALES.DEPT.DEPTNO," + " CATALOG.SALES.DEPT.NAME}"); - tester.checkFieldOrigin("select distinct emp.empno, hiredate, 1 as one,\n" + tester.checkFieldOrigin("select distinct emp.empno, hiredate, 1 as uno,\n" + " emp.empno * 2 as twiceEmpno\n" + "from emp join dept on true", "{CATALOG.SALES.EMP.EMPNO," http://git-wip-us.apache.org/repos/asf/calcite/blob/d97c14c5/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml b/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml index f949786..85bdd75 100644 --- a/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml +++ b/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml @@ -1247,7 +1247,7 @@ where c like 'X%']]> <![CDATA[ LogicalProject(EXPR$0=[+($0, $1)]) LogicalFilter(condition=[LIKE($2, 'X%')]) - LogicalProject(DEPTNO=[$0], ONE=[1], NAME=[$1]) + LogicalProject(DEPTNO=[$0], UNO=[1], NAME=[$1]) LogicalTableScan(table=[[CATALOG, SALES, DEPT]]) ]]> </Resource> http://git-wip-us.apache.org/repos/asf/calcite/blob/d97c14c5/file/src/test/java/org/apache/calcite/adapter/file/SqlTest.java ---------------------------------------------------------------------- diff --git a/file/src/test/java/org/apache/calcite/adapter/file/SqlTest.java b/file/src/test/java/org/apache/calcite/adapter/file/SqlTest.java index 27cc0f0..82a60c9 100644 --- a/file/src/test/java/org/apache/calcite/adapter/file/SqlTest.java +++ b/file/src/test/java/org/apache/calcite/adapter/file/SqlTest.java @@ -256,7 +256,7 @@ public class SqlTest { * therefore the table has a system-generated column called * "EmptyFileHasNoColumns". */ @Test public void testCsvSalesEmpty() throws SQLException { - final String sql = "select * from sales.empty"; + final String sql = "select * from sales.\"EMPTY\""; checkSql(sql, "sales-csv", new Function<ResultSet, Void>() { public Void apply(ResultSet resultSet) { try { http://git-wip-us.apache.org/repos/asf/calcite/blob/d97c14c5/site/_docs/reference.md ---------------------------------------------------------------------- diff --git a/site/_docs/reference.md b/site/_docs/reference.md index 728f5e1..d4d64f2 100644 --- a/site/_docs/reference.md +++ b/site/_docs/reference.md @@ -243,6 +243,7 @@ ALWAYS, APPLY, **ARE**, **ARRAY**, +**ARRAY_MAX_CARDINALITY**, **AS**, ASC, **ASENSITIVE**, @@ -257,6 +258,8 @@ ATTRIBUTES, **AVG**, BEFORE, **BEGIN**, +**BEGIN_FRAME**, +**BEGIN_PARTITION**, BERNOULLI, **BETWEEN**, **BIGINT**, @@ -291,6 +294,7 @@ CHARACTER_SET_NAME, CHARACTER_SET_SCHEMA, **CHAR_LENGTH**, **CHECK**, +**CLASSIFIER**, CLASS_ORIGIN, **CLOB**, **CLOSE**, @@ -319,7 +323,7 @@ CONSTRAINT_CATALOG, CONSTRAINT_NAME, CONSTRAINT_SCHEMA, CONSTRUCTOR, -CONTAINS, +**CONTAINS**, CONTINUE, **CONVERT**, **CORR**, @@ -337,6 +341,7 @@ CONTINUE, **CURRENT_DEFAULT_TRANSFORM_GROUP**, **CURRENT_PATH**, **CURRENT_ROLE**, +**CURRENT_ROW**, **CURRENT_SCHEMA**, **CURRENT_TIME**, **CURRENT_TIMESTAMP**, @@ -390,10 +395,13 @@ DYNAMIC_FUNCTION_CODE, **EACH**, **ELEMENT**, **ELSE**, +**EMPTY**, **END**, **END-EXEC**, +**END_FRAME**, +**END_PARTITION**, EPOCH, -EQUALS, +**EQUALS**, **ESCAPE**, **EVERY**, **EXCEPT**, @@ -422,6 +430,7 @@ FOLLOWING, FORTRAN, FOUND, FRAC_SECOND, +**FRAME_ROW**, **FREE**, **FROM**, **FULL**, @@ -438,6 +447,7 @@ GOTO, GRANTED, **GROUP**, **GROUPING**, +**GROUPS**, **HAVING**, HIERARCHY, **HOLD**, @@ -450,6 +460,7 @@ IMPLEMENTATION, INCLUDING, INCREMENT, **INDICATOR**, +**INITIAL**, INITIALLY, **INNER**, **INOUT**, @@ -475,17 +486,20 @@ KEY, KEY_MEMBER, KEY_TYPE, LABEL, +**LAG**, **LANGUAGE**, **LARGE**, LAST, **LAST_VALUE**, **LATERAL**, +**LEAD**, **LEADING**, **LEFT**, LENGTH, LEVEL, LIBRARY, **LIKE**, +**LIKE_REGEX**, **LIMIT**, **LN**, **LOCAL**, @@ -497,6 +511,8 @@ M, MAP, **MATCH**, MATCHED, +**MATCHES**, +**MATCH_NUMBER**, **MATCH_RECOGNIZE**, **MAX**, MAXVALUE, @@ -534,6 +550,8 @@ NESTING, **NORMALIZE**, NORMALIZED, **NOT**, +**NTH_VALUE**, +**NTILE**, **NULL**, NULLABLE, **NULLIF**, @@ -541,12 +559,15 @@ NULLS, NUMBER, **NUMERIC**, OBJECT, +**OCCURRENCES_REGEX**, OCTETS, **OCTET_LENGTH**, **OF**, **OFFSET**, **OLD**, +**OMIT**, **ON**, +**ONE**, **ONLY**, **OPEN**, OPTION, @@ -577,15 +598,21 @@ PASCAL, PASSTHROUGH, PATH, **PATTERN**, +**PER**, +**PERCENT**, **PERCENTILE_CONT**, **PERCENTILE_DISC**, **PERCENT_RANK**, +**PERIOD**, **PERMUTE**, PLACING, PLAN, PLI, +**PORTION**, **POSITION**, +**POSITION_REGEX**, **POWER**, +**PRECEDES**, PRECEDING, **PRECISION**, **PREPARE**, @@ -656,6 +683,7 @@ SCOPE_SCHEMA, **SECOND**, SECTION, SECURITY, +**SEEK**, **SELECT**, SELF, **SENSITIVE**, @@ -667,9 +695,11 @@ SESSION, **SESSION_USER**, **SET**, SETS, +**SHOW**, **SIMILAR**, SIMPLE, SIZE, +**SKIP**, **SMALLINT**, **SOME**, SOURCE, @@ -742,11 +772,15 @@ STRUCTURE, STYLE, SUBCLASS_ORIGIN, **SUBMULTISET**, +**SUBSET**, SUBSTITUTE, **SUBSTRING**, +**SUBSTRING_REGEX**, +**SUCCEEDS**, **SUM**, **SYMMETRIC**, **SYSTEM**, +**SYSTEM_TIME**, **SYSTEM_USER**, **TABLE**, **TABLESAMPLE**, @@ -771,6 +805,7 @@ TRANSACTIONS_ROLLED_BACK, TRANSFORM, TRANSFORMS, **TRANSLATE**, +**TRANSLATE_REGEX**, **TRANSLATION**, **TREAT**, **TRIGGER**, @@ -778,7 +813,9 @@ TRIGGER_CATALOG, TRIGGER_NAME, TRIGGER_SCHEMA, **TRIM**, +**TRIM_ARRAY**, **TRUE**, +**TRUNCATE**, TYPE, **UESCAPE**, UNBOUNDED, @@ -801,12 +838,14 @@ USER_DEFINED_TYPE_SCHEMA, **USING**, **VALUE**, **VALUES**, +**VALUE_OF**, **VARBINARY**, **VARCHAR**, **VARYING**, **VAR_POP**, **VAR_SAMP**, VERSION, +**VERSIONING**, VIEW, WEEK, **WHEN**, @@ -1450,7 +1489,7 @@ matchRecognize: [ PARTITION BY expression [, expression ]* ] [ ORDER BY orderItem [, orderItem ]* ] [ MEASURES measureColumn [, measureColumn ]* ] - [ ON ROW PER MATCH | ALL ROWS PER MATCH ] + [ ONE ROW PER MATCH | ALL ROWS PER MATCH ] [ AFTER MATCH ( SKIP TO NEXT ROW | SKIP PAST LAST ROW
