Skip to content

Commit

Permalink
Address review comment 2
Browse files Browse the repository at this point in the history
  • Loading branch information
ILuffZhe committed Dec 27, 2024
1 parent bc71148 commit 1d17e8e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions core/src/test/java/org/apache/calcite/test/JdbcTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -7356,18 +7356,18 @@ private void checkGetTimestamp(Connection con) throws SQLException {
/** Test case for
* <a href="https://issues.apache.org/jira/browse/CALCITE-6730">[CALCITE-6730]
* Add CONVERT function(enabled in Oracle library)</a>. */
@Test void testOracleConvert() {
@Test void testConvertOracle() {
CalciteAssert.AssertThat withOracle10 =
CalciteAssert.hr()
.with(SqlConformanceEnum.ORACLE_10);
testOracleConvertInternal(withOracle10);
testConvertOracleInternal(withOracle10);

CalciteAssert.AssertThat withOracle12
= withOracle10.with(SqlConformanceEnum.ORACLE_12);
testOracleConvertInternal(withOracle12);
testConvertOracleInternal(withOracle12);
}

private void testOracleConvertInternal(CalciteAssert.AssertThat with) {
private void testConvertOracleInternal(CalciteAssert.AssertThat with) {
with.query("select \"name\", \"empid\" from \"hr\".\"emps\"\n"
+ "where convert(\"name\", GBK)=_GBK'Eric'")
.returns("name=Eric; empid=200\n");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ static <E> List<E> list() {
assertThat(concatMultiObjectWithSeparator("abc", null, null), is(""));
}

@Test void testOracleConvert() {
@Test void testConvertOracle() {
assertThat(convertOracle("a", "UTF8", "LATIN1"), is("a"));
assertThat(convertOracle("a", "UTF8"), is("a"));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5741,8 +5741,8 @@ private static Matcher<SqlNode> isCharLiteral(String s) {
+ "FROM (VALUES (ROW(TRUE))))");
}

@Test void testOracleConvert() {
// If there are 3 params in ORACLE_CONVERT operator, it's valid when
@Test void testConvertOracle() {
// If there are 3 params in CONVERT_ORACLE operator, it's valid when
// the ORACLE function library is enabled ('fun=oracle').
// But the parser can always parse it.
expr("convert('abc', utf8, gbk)")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4649,7 +4649,7 @@ static void checkRlikeFails(SqlOperatorFixture f) {
/** Test case for
* <a href="https://issues.apache.org/jira/browse/CALCITE-6730">[CALCITE-6730]
* Add CONVERT function(enabled in Oracle library)</a>. */
@Test void testOracleConvertFunc() {
@Test void testConvertOracleFunc() {
final SqlOperatorFixture f = fixture()
.setFor(SqlLibraryOperators.CONVERT_ORACLE, VM_JAVA)
.withLibrary(SqlLibrary.ORACLE);
Expand Down

0 comments on commit 1d17e8e

Please sign in to comment.