Skip to content

feat: enhance support for oracle using_index_clause #6461

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+130 −0
Open

feat: enhance support for oracle using_index_clause #6461

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab252eb
feat: enhance support using_index_clause
zchazc Jun 18, 2025
6837adf
feat: more support using_index_clause
zchazc Jul 17, 2025
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
3 changes: 3 additions & 0 deletions core/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,9 @@ private OracleUsingIndexClause parseUsingIndex() {
OracleCreateIndexStatement createIndex = new OracleStatementParser(lexer).parseCreateIndex();
using.setIndex(createIndex);
accept(Token.RPAREN);
} else if (lexer.token() == Token.LITERAL_ALIAS) {
SQLName index = new OracleStatementParser(lexer).getExprParser().name();
Copy link

@mengnankkkk mengnankkkk Jul 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if分支不够健壮，可能还有IDENTIFIER 或其他 token，建议补充其他情况使用else if
直接用 OracleStatementParser(lexer).getExprParser().name() 解析 index 名称，可能会影响 lexer 状态，建议复用当前 parser 实例，避免新建对象导致上下文丢失。
没有进行异常处理，建议补充异常处理和日志

using.setIndex(index);
}

for (; ; ) {
Expand Down
23 changes: 23 additions & 0 deletions core/src/test/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleUsingIndexTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.alibaba.druid.sql.dialect.oracle.parser;

import com.alibaba.druid.DbType;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import org.junit.Assert;
import org.junit.Test;

public class OracleUsingIndexTest {


@Test
public void testUsingIndex() {
Copy link

@mengnankkkk mengnankkkk Jul 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

只测试了 index 名称为 "SC"."PK_XXX" 的场景，未覆盖 index 名为普通标识符、带 storage/tablespace、无 index 名等边界情况。
没有负面测试（如语法错误、异常分支）

只断言了 SQL 还原，未断言 AST 结构是否正确解析 index 名称。

Copy link
Author

@zchazc zchazc Jul 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"带 storage/tablespace" 指的是图例中的 schema 吗？

Copy link

@mengnankkkk mengnankkkk Jul 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"带 storage/tablespace" 指的是图例中的 schema 吗？

storage/tablespace指定索引的物理存储位置的 TABLESPACE 子句，用于管理数据的物理存储位置和特性。比如,CREATE INDEX idx_name ON table_name (column_name) TABLESPACE tablespace_name;
感谢您的回复，这个范围更小一点，只是其中一个具体的物理存储属性。

Copy link
Author

@zchazc zchazc Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • 根据图例来看，using_index_clause 有三个分支。
  • 我这边添加的是最上直接指定 (schema.)index 的分支。
  • 中间的分支create_index 已经实现了，最下的分支是 index_properties 。
  • 继续查询图例得知 “带 storage/tablespace” 属于 index_attributes， index_properties 包含 index_attributes ， create_index 包含 index_properties。

所以您的意思是让我将最下面第三个分支 index_properties 也同时实现吗？

Copy link
Author

@zchazc zchazc Jul 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我将除 index_properties 以外的其它内容处理了，不知道是否符合您的要求。

  • "未断言 AST 结构是否正确解析 index 名称" 的原因是因为我参考了其它的单元测试，不太清楚我这样写是否合适。
  • 有关于 index_properties，我认为需要像 com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleUsingIndexClause 做独立实现，来确保被可以被其它地方复用，这个坑有点儿多，因为我看到后续有很多类似的语句都没有独立实现，所以短时间内没办法做到。

String sql = "ALTER TABLE \"SC\".\"TB1\"\n" +
"\tADD CONSTRAINT \"PK_XXX\" PRIMARY KEY (\"ID\")\n" +
"\t\tUSING INDEX \"SC\".\"PK_XXX\"\n" +
"\t\tENABLE";
SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle,false);
System.out.println(stat);
Assert.assertEquals(sql, stat.toString());
System.out.println("=============");
}
}