增强获取别名

osinn · Jun 5, 2023 · 2668bb7 · 2668bb7
1 parent e85fe10
commit 2668bb7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@
 <dependency>
     <groupId>io.github.osinn</groupId>
     <artifactId>druid-multi-tenant-starter</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>io.github.osinn</groupId>
     <artifactId>druid-multi-tenant-starter</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <name>druid-multi-tenant-starter</name>
     <description>druid-multi-tenant-starter</description>
 

diff --git a/src/main/java/com/github/osinn/druid/multi/tenant/plugin/parser/DefaultSqlParser.java b/src/main/java/com/github/osinn/druid/multi/tenant/plugin/parser/DefaultSqlParser.java
@@ -41,14 +41,11 @@ public String setTenantParameter(String sql) {
         if (statement instanceof SQLSelectStatement) {
             SQLSelectStatement sqlSelectStatement = (SQLSelectStatement) statement;
             processSelectBody(sqlSelectStatement.getSelect().getQuery());
-        }
-        if (statement instanceof SQLInsertStatement) {
+        } else if (statement instanceof SQLInsertStatement) {
             processInsert((SQLInsertStatement) statement);
-        }
-        if (statement instanceof SQLUpdateStatement) {
+        } else if (statement instanceof SQLUpdateStatement) {
             processUpdate((SQLUpdateStatement) statement);
-        }
-        if (statement instanceof SQLDeleteStatement) {
+        } else if (statement instanceof SQLDeleteStatement) {
             processDelete((SQLDeleteStatement) statement);
         }
         return statement.toString();
@@ -500,6 +497,9 @@ private String getAlias(SQLTableSource sqlTableSource) {
             } else if (sqlJoinTableSource.getLeft() instanceof SQLExprTableSource) {
                 SQLExprTableSource sqlExprTableSource = (SQLExprTableSource) sqlJoinTableSource.getLeft();
                 return sqlExprTableSource.getAlias();
+            } else if (sqlJoinTableSource.getLeft() instanceof SQLSubqueryTableSource) {
+                SQLSubqueryTableSource sqlSubqueryTableSource = (SQLSubqueryTableSource) sqlJoinTableSource.getLeft();
+                return sqlSubqueryTableSource.getAlias();
             } else {
                 return sqlJoinTableSource.getAlias();
             }

diff --git a/src/test/java/com/github/osinn/osinn/sqlparser/test/TenantDemo.java b/src/test/java/com/github/osinn/osinn/sqlparser/test/TenantDemo.java
@@ -80,6 +80,12 @@ public class TenantDemo {
 
     private static final String sql39 = "SELECT id, name,tenant_id FROM role temp";
 
+    private static final String sql40 = "SELECT *\n" +
+            "        from\n" +
+            "                (SELECT * from test_t1) a \n" +
+            "                LEFT JOIN test_t2 pd ON a.depository_id = pd.id\n" +
+            "                LEFT JOIN test_t3 pi ON a.order_no = pi.order_no\n" +
+            "        ORDER BY a.part_no";
 
     public static void main(String[] args) {
         DefaultSqlParser defaultSqlParser = new DefaultSqlParser();
@@ -90,7 +96,7 @@ public List getTenantIds() {
                 Long tenantId2 = 1540616731523944448L;
                 List<Long> tenantIdList = new ArrayList<>();
                 tenantIdList.add(tenantId);
-                tenantIdList.add(tenantId2);
+//                tenantIdList.add(tenantId2);
                 return tenantIdList;
             }
 
@@ -194,6 +200,7 @@ public String getTenantIdColumn() {
         System.out.println(defaultSqlParser.setTenantParameter(sql38));
         System.out.println("------------------------------------- \n");
         System.out.println(defaultSqlParser.setTenantParameter(sql39));
+        System.out.println(defaultSqlParser.setTenantParameter(sql40));
 
     }
 }