From d10ab7b8f34bdfe92446406a45207a59d738841d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Fri, 4 Dec 2020 10:24:36 +0800 Subject: [PATCH] improved repository resolve support --- .../druid/sql/ast/statement/SQLSelectQueryBlock.java | 5 +++++ .../bvt/sql/sqlserver/SQLServerAlterTableTest_11.java | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java index 517d662bba..26245e8db9 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java @@ -1169,6 +1169,11 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery SQLObject object = resolveColum(columnNameHash); if (object instanceof SQLColumnDefinition) { return (SQLColumnDefinition) object; + } else if (object instanceof SQLSelectItem) { + SQLExpr expr = ((SQLSelectItem) object).getExpr(); + if (expr instanceof SQLName) { + return ((SQLName) expr).getResolvedColumn(); + } } return null; } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_11.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_11.java index 7b565f6433..e6f707906f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_11.java @@ -45,16 +45,16 @@ public class SQLServerAlterTableTest_11 extends TestCase { { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); - Assert.assertEquals("ALTER TABLE dbo.doc_exd" // + assertEquals("ALTER TABLE dbo.doc_exd" // + "\n\tWITH NOCHECK ADD CONSTRAINT exd_check CHECK (column_a > 1);", output); } { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - Assert.assertEquals("alter table dbo.doc_exd" // + assertEquals("alter table dbo.doc_exd" // + "\n\twith nocheck add constraint exd_check check (column_a > 1);", output); } - Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(1, visitor.getColumns().size()); + assertEquals(1, visitor.getTables().size()); + assertEquals(1, visitor.getColumns().size()); } }