[fix]修正eql中left join on语法支持

entropy-cloud · Jan 3, 2024 · 446bc99 · 446bc99
1 parent 8b2a937
commit 446bc99
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 5 deletions.
diff --git a/nop-dao/src/main/java/io/nop/dao/api/IEntityDao.java b/nop-dao/src/main/java/io/nop/dao/api/IEntityDao.java
@@ -18,7 +18,9 @@
 import io.nop.dao.exceptions.DaoException;
 import io.nop.dao.exceptions.UnknownEntityException;
 
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -269,6 +271,10 @@ default void forEachEntity(QueryBean query, Consumer<T> consumer) {
 
     void batchLoadProps(Collection<T> entities, Collection<String> propNames);
 
+    default void batchLoadPropsForEntity(T entity, String... propNames) {
+        batchLoadProps(Collections.singleton(entity), Arrays.asList(propNames));
+    }
+
     /**
      * 将一级缓存中的修改刷新到数据库中
      */

diff --git a/nop-orm-eql/src/main/java/io/nop/orm/eql/compile/EqlTransformVisitor.java b/nop-orm-eql/src/main/java/io/nop/orm/eql/compile/EqlTransformVisitor.java
@@ -403,8 +403,16 @@ void visitTableSource(SqlTableScope tableScope, SqlTableSource table) {
             tableScope.addTable(source.getAliasName(), source);
         } else if (table instanceof SqlJoinTableSource) {
             SqlJoinTableSource source = (SqlJoinTableSource) table;
+            boolean hasCondition = source.getCondition() != null;
             visitJoinLeft(tableScope, source);
             visitJoinRight(tableScope, source);
+
+            if (hasCondition) {
+                SqlTableScope oldScope = currentScope;
+                currentScope = tableScope;
+                visitJoinCondition(source);
+                currentScope = oldScope;
+            }
         }
     }
 
@@ -481,6 +489,8 @@ void visitJoinRight(SqlTableScope tableScope, SqlJoinTableSource source) {
             SqlSingleTableSource table = (SqlSingleTableSource) right;
             table.setAlias(makeTableAlias(table.getAlias()));
 
+            tableScope.addTable(table.getAliasName(), table);
+
             SqlTableName tableName = table.getTableName();
             String fullName = tableName.getFullName();
             ISqlTableMeta entityMeta = context.resolveEntityTableMeta(fullName);
@@ -737,7 +747,7 @@ SqlExpr makePropExpr(SqlTableSource source, IEntityPropModel propModel, Object v
             col.setResolvedExprMeta(source.getResolvedTableMeta().getFieldExprMeta(propModel.getName()));
             SqlQualifiedName name = new SqlQualifiedName();
             name.setName(source.getAliasName());
-            col.setOwner(new SqlQualifiedName());
+            col.setOwner(name);
             return col;
         } else {
             if (value instanceof Number) {

diff --git a/nop-orm-eql/src/main/java/io/nop/orm/eql/sql/AstToEqlGenerator.java b/nop-orm-eql/src/main/java/io/nop/orm/eql/sql/AstToEqlGenerator.java
@@ -563,13 +563,16 @@ public void visitSqlSingleTableSource(SqlSingleTableSource node) {
     public void visitSqlJoinTableSource(SqlJoinTableSource node) {
         visit(node.getLeft());
         print(" ");
+        incIndent();
+        println();
         print(node.getJoinType().getText());
         print(" ");
         visit(node.getRight());
         if (node.getCondition() != null) {
             print(" on ");
             visit(node.getCondition());
         }
+        decIndent();
     }
 
     @Override
@@ -674,9 +677,10 @@ public void visitSqlBinaryExpr(SqlBinaryExpr node) {
     public void visitSqlIsNullExpr(SqlIsNullExpr node) {
         printLeft(node.getExpr(), SqlOperator.IS);
         if (node.getNot()) {
-            print(" not");
+            print(" is not null ");
+        }else {
+            print(" is null ");
         }
-        print(" is null ");
     }
 
     @Override

diff --git a/nop-orm/src/test/java/io/nop/orm/loader/TestEqlQuery.java b/nop-orm/src/test/java/io/nop/orm/loader/TestEqlQuery.java
@@ -242,4 +242,17 @@ public void testComplexQuery() {
             orm().findFirst(new SQL(sql));
         });
     }
+
+    @Test
+    public void testLeftJoinOn() {
+        String sql = "select o from io.nop.app.SimsClass o left join io.nop.app.SimsCollege c1 on o.collegeId = c1.collegeId";
+        List<SimsClass> list = orm().findAll(new SQL(sql));
+        assertEquals(1, list.size());
+
+
+        String sql2 = "select o from SimsClass o left join SimsCollege c1 on o.collegeId = c1.collegeId " +
+                " left join SimsCollege c2 on c1.collegeId = c2.collegeId where c1.collegeId is not null or c2.collegeId is not null";
+        List<SimsClass> list2 = orm().findAll(new SQL(sql2));
+        assertEquals(1, list2.size());
+    }
 }
diff --git a/nop-orm/src/test/resources/_vfs/nop/test/orm/app.orm.xml b/nop-orm/src/test/resources/_vfs/nop/test/orm/app.orm.xml
@@ -19,7 +19,7 @@
     <entities>
         <entity name="io.nop.app.SimsClassFee" x:override="remove"/>
 
-        <entity name="io.nop.app.SimsClass">
+        <entity name="io.nop.app.SimsClass" registerShortName="true">
             <columns>
                 <column name="collegeId" propId="100" lazy="true"/>
                 <column name="jsonExt" code="JSON_EXT" propId="101" tagSet="json" stdSqlType="JSON"
@@ -49,7 +49,7 @@
             </relations>
         </entity>
 
-        <entity name="io.nop.app.SimsCollege">
+        <entity name="io.nop.app.SimsCollege" registerShortName="true">
             <relations>
                 <to-many name="ext" refEntityName="io.nop.app.SimsExtField" keyProp="fieldName" notGenCode="true">
                     <join>