lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-07-16 16:50:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SqlSugarScope MasterSlave BUG

Browse Source
This commit is contained in:
sunkaixuna 2021-11-07 00:38:08 +08:00
parent 255c03ce5d
commit 0e47c98431
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Asp.Net/SqlSugar/Abstract/AdoProvider/AdoProvider.cs
View File

@ -68,6 +68,7 @@ namespace SqlSugar
public virtual Action<DiffLogModel> DiffLogEvent => this.Context.CurrentConnectionConfig.AopEvents?.OnDiffLogEvent; public virtual Action<DiffLogModel> DiffLogEvent => this.Context.CurrentConnectionConfig.AopEvents?.OnDiffLogEvent;
public virtual List<IDbConnection> SlaveConnections { get; set; } public virtual List<IDbConnection> SlaveConnections { get; set; }
public virtual IDbConnection MasterConnection { get; set; } public virtual IDbConnection MasterConnection { get; set; }
public virtual string MasterConnectionString { get; set; }
public virtual CancellationToken? CancellationToken { get; set; } public virtual CancellationToken? CancellationToken { get; set; }
#endregion #endregion
@ -1373,6 +1374,7 @@ namespace SqlSugar
if (this.MasterConnection == null) if (this.MasterConnection == null)
{ {
this.MasterConnection = this.Connection; this.MasterConnection = this.Connection;
this.MasterConnectionString = this.MasterConnection.ConnectionString;
} }
var saves = this.Context.CurrentConnectionConfig.SlaveConnectionConfigs.Where(it => it.HitRate > 0).ToList(); var saves = this.Context.CurrentConnectionConfig.SlaveConnectionConfigs.Where(it => it.HitRate > 0).ToList();
var currentIndex = UtilRandom.GetRandomIndex(saves.ToDictionary(it => saves.ToList().IndexOf(it), it => it.HitRate)); var currentIndex = UtilRandom.GetRandomIndex(saves.ToDictionary(it => saves.ToList().IndexOf(it), it => it.HitRate));
@ -1401,7 +1403,7 @@ namespace SqlSugar
if (this.IsMasterSlaveSeparation && IsRead(sql) && this.Transaction == null) if (this.IsMasterSlaveSeparation && IsRead(sql) && this.Transaction == null)
{ {
this.Connection = this.MasterConnection; this.Connection = this.MasterConnection;
this.Context.CurrentConnectionConfig.ConnectionString = this.MasterConnection.ConnectionString; this.Context.CurrentConnectionConfig.ConnectionString = this.MasterConnectionString;
} }
} }

4
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/AdoProvider/AdoProvider.cs
View File

@ -68,6 +68,7 @@ namespace SqlSugar
public virtual Action<DiffLogModel> DiffLogEvent => this.Context.CurrentConnectionConfig.AopEvents?.OnDiffLogEvent; public virtual Action<DiffLogModel> DiffLogEvent => this.Context.CurrentConnectionConfig.AopEvents?.OnDiffLogEvent;
public virtual List<IDbConnection> SlaveConnections { get; set; } public virtual List<IDbConnection> SlaveConnections { get; set; }
public virtual IDbConnection MasterConnection { get; set; } public virtual IDbConnection MasterConnection { get; set; }
public virtual string MasterConnectionString { get; set; }
public virtual CancellationToken? CancellationToken { get; set; } public virtual CancellationToken? CancellationToken { get; set; }
#endregion #endregion
@ -1373,6 +1374,7 @@ namespace SqlSugar
if (this.MasterConnection == null) if (this.MasterConnection == null)
{ {
this.MasterConnection = this.Connection; this.MasterConnection = this.Connection;
this.MasterConnectionString = this.MasterConnection.ConnectionString;
} }
var saves = this.Context.CurrentConnectionConfig.SlaveConnectionConfigs.Where(it => it.HitRate > 0).ToList(); var saves = this.Context.CurrentConnectionConfig.SlaveConnectionConfigs.Where(it => it.HitRate > 0).ToList();
var currentIndex = UtilRandom.GetRandomIndex(saves.ToDictionary(it => saves.ToList().IndexOf(it), it => it.HitRate)); var currentIndex = UtilRandom.GetRandomIndex(saves.ToDictionary(it => saves.ToList().IndexOf(it), it => it.HitRate));
@ -1401,7 +1403,7 @@ namespace SqlSugar
if (this.IsMasterSlaveSeparation && IsRead(sql) && this.Transaction == null) if (this.IsMasterSlaveSeparation && IsRead(sql) && this.Transaction == null)
{ {
this.Connection = this.MasterConnection; this.Connection = this.MasterConnection;
this.Context.CurrentConnectionConfig.ConnectionString = this.MasterConnection.ConnectionString; this.Context.CurrentConnectionConfig.ConnectionString = this.MasterConnectionString;
} }
} }