소스 검색

code style

miemie 4 년 전
부모
커밋
22311c449c

+ 3 - 4
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DynamicTableNameInnerInterceptor.java

@@ -52,7 +52,7 @@ public class DynamicTableNameInnerInterceptor implements InnerInterceptor {
     @Override
     public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
         PluginUtils.MPBoundSql mpBs = PluginUtils.mpBoundSql(boundSql);
-        mpBs.sql(doIt(mpBs.sql()));
+        mpBs.sql(this.changeTable(mpBs.sql()));
     }
 
     @Override
@@ -62,11 +62,11 @@ public class DynamicTableNameInnerInterceptor implements InnerInterceptor {
         SqlCommandType sct = ms.getSqlCommandType();
         if (sct == SqlCommandType.INSERT || sct == SqlCommandType.UPDATE || sct == SqlCommandType.DELETE) {
             PluginUtils.MPBoundSql mpBs = mpSh.mPBoundSql();
-            mpBs.sql(doIt(mpBs.sql()));
+            mpBs.sql(this.changeTable(mpBs.sql()));
         }
     }
 
-    protected String doIt(String sql) {
+    protected String changeTable(String sql) {
         TableNameParser parser = new TableNameParser(sql);
         List<TableNameParser.SqlToken> names = new ArrayList<>();
         parser.accept(names::add);
@@ -91,5 +91,4 @@ public class DynamicTableNameInnerInterceptor implements InnerInterceptor {
         }
         return builder.toString();
     }
-    
 }

+ 5 - 5
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/inner/DynamicTableNameInnerInterceptorTest.java

@@ -29,22 +29,22 @@ class DynamicTableNameInnerInterceptorTest {
         // 表名相互包含
         @Language("SQL")
         String origin = "SELECT * FROM t_user, t_user_role", replaced = "SELECT * FROM t_user_r, t_user_role";
-        assertEquals(replaced, interceptor.doIt(origin));
+        assertEquals(replaced, interceptor.changeTable(origin));
         // 表名在末尾
         origin = "SELECT * FROM t_user";
         replaced = "SELECT * FROM t_user_r";
-        assertEquals(replaced, interceptor.doIt(origin));
+        assertEquals(replaced, interceptor.changeTable(origin));
         // 表名前后有注释
         origin = "SELECT * FROM /**/t_user/* t_user */";
         replaced = "SELECT * FROM /**/t_user_r/* t_user */";
-        assertEquals(replaced, interceptor.doIt(origin));
+        assertEquals(replaced, interceptor.changeTable(origin));
         // 值中带有表名
         origin = "SELECT * FROM t_user WHERE name = 't_user'";
         replaced = "SELECT * FROM t_user_r WHERE name = 't_user'";
-        assertEquals(replaced, interceptor.doIt(origin));
+        assertEquals(replaced, interceptor.changeTable(origin));
         // 别名被声明要替换
         origin = "SELECT t_user.* FROM t_user_real t_user";
-        assertEquals(origin, interceptor.doIt(origin));
+        assertEquals(origin, interceptor.changeTable(origin));
     }
 
     /**