miemie 4 anos atrás
pai
commit
06409d883d

+ 18 - 39
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptorTest.java

@@ -103,52 +103,31 @@ class TenantLineInnerInterceptorTest {
         /* = */
         assertSql("SELECT * FROM entity e WHERE e.id = (select e1.id from entity1 e1 where e1.id = ?)",
             "SELECT * FROM entity e WHERE e.id = (SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.tenant_id = 1");
-        // 在最前
-        assertSql("SELECT * FROM entity e WHERE e.id = " +
-                "(select e1.id from entity1 e1 where e1.id = ?) and e.id = ?",
-            "SELECT * FROM entity e WHERE e.id = " +
-                "(SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.id = ? AND e.tenant_id = 1");
-        // 在最后
-        assertSql("SELECT * FROM entity e WHERE e.id = ? and e.id = " +
-                "(select e1.id from entity1 e1 where e1.id = ?)",
-            "SELECT * FROM entity e WHERE e.id = ? AND e.id = " +
-                "(SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.tenant_id = 1");
 
 
         /* >= */
         assertSql("SELECT * FROM entity e WHERE e.id >= (select e1.id from entity1 e1 where e1.id = ?)",
             "SELECT * FROM entity e WHERE e.id >= (SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.tenant_id = 1");
-        // 在最前
-        assertSql("SELECT * FROM entity e WHERE e.id >= (select e1.id from entity1 e1 where e1.id = ?) and e.id = ?",
-            "SELECT * FROM entity e WHERE e.id >= " +
-                "(SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.id = ? AND e.tenant_id = 1");
-        // 在最后
-        assertSql("SELECT * FROM entity e WHERE e.id = ? and e.id >= " +
-                "(select e1.id from entity1 e1 where e1.id = ?)",
-            "SELECT * FROM entity e WHERE e.id = ? AND e.id >= " +
-                "(SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.tenant_id = 1");
 
 
-        // <=
-        assertSql("SELECT * FROM entity e WHERE e.id = ? and e.id <= " +
-                "(select e1.id from entity1 e1 where e1.id = ?) and e.id = ?",
-            "SELECT * FROM entity e WHERE e.id = ? AND e.id <= " +
-                "(SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.id = ? AND e.tenant_id = 1");
-        // <>
-        assertSql("SELECT * FROM entity e WHERE e.id = ? and e.id <> " +
-                "(select e1.id from entity1 e1 where e1.id = ?) and e.id = ?",
-            "SELECT * FROM entity e WHERE e.id = ? AND e.id <> " +
-                "(SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.id = ? AND e.tenant_id = 1");
-        // EXISTS
-        assertSql("SELECT * FROM entity e WHERE e.id = ? and EXISTS " +
-                "(select e1.id from entity1 e1 where e1.id = ?) and e.id = ?",
-            "SELECT * FROM entity e WHERE e.id = ? AND EXISTS " +
-                "(SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.id = ? AND e.tenant_id = 1");
-        // NOT EXISTS
-        assertSql("SELECT * FROM entity e WHERE e.id = ? and NOT EXISTS " +
-                "(select e1.id from entity1 e1 where e1.id = ?) and e.id = ?",
-            "SELECT * FROM entity e WHERE e.id = ? AND NOT EXISTS " +
-                "(SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.id = ? AND e.tenant_id = 1");
+        /* <= */
+        assertSql("SELECT * FROM entity e WHERE e.id <= (select e1.id from entity1 e1 where e1.id = ?)",
+            "SELECT * FROM entity e WHERE e.id <= (SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.tenant_id = 1");
+
+
+        /* <> */
+        assertSql("SELECT * FROM entity e WHERE e.id <> (select e1.id from entity1 e1 where e1.id = ?)",
+            "SELECT * FROM entity e WHERE e.id <> (SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.tenant_id = 1");
+
+
+        /* EXISTS */
+        assertSql("SELECT * FROM entity e WHERE EXISTS (select e1.id from entity1 e1 where e1.id = ?)",
+            "SELECT * FROM entity e WHERE EXISTS (SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.tenant_id = 1");
+
+
+        /* NOT EXISTS */
+        assertSql("SELECT * FROM entity e WHERE NOT EXISTS (select e1.id from entity1 e1 where e1.id = ?)",
+            "SELECT * FROM entity e WHERE NOT EXISTS (SELECT e1.id FROM entity1 e1 WHERE e1.id = ? AND e1.tenant_id = 1) AND e.tenant_id = 1");
     }
 
     @Test