fix 3.3.45

Author: xlorne

example/example-application/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.44</version>
+        <version>3.3.45</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-domain/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.44</version>
+        <version>3.3.45</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-infra-flow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.44</version>
+        <version>3.3.45</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-infra-jpa/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.44</version>
+        <version>3.3.45</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.44</version>
+        <version>3.3.45</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/pom.xml

@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.44</version>
+    <version>3.3.45</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>

pom.xml

@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.44</version>
+    <version>3.3.45</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-authorization/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.44</version>
+        <version>3.3.45</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>

springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/enhancer/TableColumnAliasHolder.java

@@ -42,14 +42,15 @@ private void searchSubSelect(String parent, PlainSelect plainSelect) {
         // FROM 项是表
         if (fromItem instanceof Table) {
             this.appendTableAlias(fromItem);
-            this.appendColumnAlias(parent, plainSelect.getSelectItems());
+            Table table = (Table) fromItem;
+            this.appendColumnAlias(parent, table.getName(), plainSelect.getSelectItems());
         }
 
 
         // FROM是子查询
         if (fromItem instanceof Select) {
             PlainSelect subPlainSelect = ((Select) fromItem).getPlainSelect();
-            this.appendColumnAlias(parent, plainSelect.getSelectItems());
+            this.appendColumnAlias(parent, null, plainSelect.getSelectItems());
             parent = fromItem.getAlias().getName();
             this.searchSubSelect(parent, subPlainSelect);
         }
@@ -60,14 +61,15 @@ private void searchSubSelect(String parent, PlainSelect plainSelect) {
                 if (join.getRightItem() instanceof Select) {
                     FromItem currentItem = join.getRightItem();
                     PlainSelect subPlainSelect = ((Select) currentItem).getPlainSelect();
-                    this.appendColumnAlias(parent, plainSelect.getSelectItems());
+                    this.appendColumnAlias(parent, null, plainSelect.getSelectItems());
                     parent = currentItem.getAlias().getName();
                     this.searchSubSelect(parent, subPlainSelect);
                 }
                 if (join.getRightItem() instanceof Table) {
                     FromItem currentItem = join.getRightItem();
                     this.appendTableAlias(currentItem);
-                    this.appendColumnAlias(parent, plainSelect.getSelectItems());
+                    Table table = (Table) currentItem;
+                    this.appendColumnAlias(parent, table.getName(), plainSelect.getSelectItems());
                 }
             }
         }
@@ -82,7 +84,7 @@ private void searchSubSelect(String parent, PlainSelect plainSelect) {
     private void appendTableAlias(FromItem fromItem) {
         Table table = (Table) fromItem;
         Alias alias = table.getAlias();
-        String aliasName = alias!=null?alias.getName():table.getName();
+        String aliasName = alias != null ? alias.getName() : table.getName();
         aliasContext.addTable(aliasName, table.getName());
     }
 
@@ -93,12 +95,14 @@ private void appendTableAlias(FromItem fromItem) {
      * @param parent      父表别名
      * @param selectItems 列
      */
-    private void appendColumnAlias(String parent, List<SelectItem<?>> selectItems) {
+    private void appendColumnAlias(String parent, String tableName, List<SelectItem<?>> selectItems) {
         if (selectItems != null) {
             for (SelectItem<?> selectItem : selectItems) {
                 if (selectItem.getExpression() instanceof Column) {
                     Column column = (Column) selectItem.getExpression();
-                    String tableName = column.getTable().getName();
+                    if (column.getTable() != null) {
+                        tableName = column.getTable().getName();
+                    }
                     String columnName = column.getColumnName();
                     Alias columnAlias = selectItem.getAlias();
                     String aliasName = columnAlias != null ? selectItem.getAlias().getName() : columnName;

springboot-starter-data-authorization/src/test/java/com/codingapi/springboot/authorization/DataAuthorizationContextTest.java

@@ -369,4 +369,8 @@ public boolean supportRowAuthorization(String tableName, String tableAlias) {
         List<Map<String, Object>> data = jdbcTemplate.queryForList(sql);
 //        System.out.println(data);
     }
+
+
+
+
 }

springboot-starter-data-authorization/src/test/java/com/codingapi/springboot/authorization/analyzer/SelectSQLAnalyzerTest.java

@@ -3,6 +3,7 @@
 import com.codingapi.springboot.authorization.enhancer.DataPermissionSQLEnhancer;
 import com.codingapi.springboot.authorization.handler.Condition;
 import com.codingapi.springboot.authorization.handler.RowHandler;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
@@ -145,4 +146,20 @@ void test4() throws SQLException{
         System.out.println(builder.getNewSQL());
         System.out.println(builder.getTableAlias());;
     }
+
+    @Test
+    @Order(5)
+    void test5() throws Exception{
+        String sql = "SELECT next_val AS id_val FROM t_league_seq FOR UPDATE";
+        RowHandler rowHandler = (subSql, tableName, tableAlias) -> {
+            if (tableName.equalsIgnoreCase("t_league")) {
+                String conditionTemplate = "%s.id < 100 ";
+                return Condition.formatCondition(conditionTemplate, tableAlias);
+            }
+            return null;
+        };
+        DataPermissionSQLEnhancer builder = new DataPermissionSQLEnhancer(sql, rowHandler);
+        System.out.println(builder.getNewSQL());
+        System.out.println(builder.getTableAlias());;
+    }
 }

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.44</version>
+        <version>3.3.45</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.44</version>
+        <version>3.3.45</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.44</version>
+        <version>3.3.45</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.44</version>
+        <version>3.3.45</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

springboot-starter/src/main/resources/banner.txt

@@ -1,4 +1,4 @@
 ------------------------------------------------------
-CodingApi SpringBoot-Starter 3.3.44
+CodingApi SpringBoot-Starter 3.3.45
 springboot version (${spring-boot.version})
 ------------------------------------------------------