mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-10-15 02:35:04 +08:00
Synchronization code
This commit is contained in:
@@ -681,6 +681,10 @@ namespace SqlSugar
|
|||||||
var entityInfo = this.Context.EntityMaintenance.GetEntityInfoWithAttr(joinInfo.EntityType);
|
var entityInfo = this.Context.EntityMaintenance.GetEntityInfoWithAttr(joinInfo.EntityType);
|
||||||
result = $" {result} AND {shortName}.{UtilMethods.GetDiscrimator(entityInfo,this.Builder)}";
|
result = $" {result} AND {shortName}.{UtilMethods.GetDiscrimator(entityInfo,this.Builder)}";
|
||||||
}
|
}
|
||||||
|
if (joinInfo.JoinType == JoinType.Cross)
|
||||||
|
{
|
||||||
|
result = result.Replace(" ON ", " WHERE ");
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
public virtual void Clear()
|
public virtual void Clear()
|
||||||
|
@@ -585,7 +585,7 @@ namespace SqlSugar
|
|||||||
{
|
{
|
||||||
++i;
|
++i;
|
||||||
var isLast = joinArray.Length == i;
|
var isLast = joinArray.Length == i;
|
||||||
var isJoinType = item.IsIn(JoinType.Full.ToString(),JoinType.Inner.ToString(), JoinType.Left.ToString(), JoinType.Right.ToString());
|
var isJoinType = item.IsIn(JoinType.Full.ToString(),JoinType.Inner.ToString(), JoinType.Left.ToString(), JoinType.Right.ToString(),JoinType.Cross.ToString());
|
||||||
if (isJoinType)
|
if (isJoinType)
|
||||||
{
|
{
|
||||||
if (joinValue != null)
|
if (joinValue != null)
|
||||||
|
@@ -10,6 +10,7 @@ namespace SqlSugar
|
|||||||
Inner = 0,
|
Inner = 0,
|
||||||
Left = 1,
|
Left = 1,
|
||||||
Right = 2,
|
Right = 2,
|
||||||
Full=3
|
Full=3,
|
||||||
|
Cross
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user