Commita6eb0f2

authored

fix(BranchBarrier): fix QueryPrepared method not return real insert exception (#82)

1 parentaee2970 commita6eb0f2Copy full SHA for a6eb0f2

File tree

+40

-14

lines changed

+40

-14

lines changed

Lines changed: 14 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -184,21 +184,21 @@ public async Task Call(DbConnection db, Func<Task> busiCall, TransactionScopeOpt`
`184`	`184`
`185`	`185`	`publicasyncTask<string>QueryPrepared(DbConnectiondb)`
`186`	`186`	`{`
`187`		`-try`
	`187`	`+if(db==null)return"db is null";`
	`188`	`+`
	`189`	`+(int_,ExceptioninsertException)=awaitDbUtils.InsertBarrier(`
	`190`	`+db,`
	`191`	`+this.TransType,`
	`192`	`+this.Gid,`
	`193`	`+Constant.Barrier.MSG_BRANCHID,`
	`194`	`+Constant.TYPE_MSG,`
	`195`	`+Constant.Barrier.MSG_BARRIER_ID,`
	`196`	`+Constant.Barrier.MSG_BARRIER_REASON);`
	`197`	`+`
	`198`	`+if(insertException!=null)`
`188`	`199`	`{`
`189`		`-vartmp=awaitDbUtils.InsertBarrier(`
`190`		`-db,`
`191`		`-this.TransType,`
`192`		`-this.Gid,`
`193`		`-Constant.Barrier.MSG_BRANCHID,`
`194`		`-Constant.TYPE_MSG,`
`195`		`-Constant.Barrier.MSG_BARRIER_ID,`
`196`		`-Constant.Barrier.MSG_BARRIER_REASON);`
`197`		`-}`
`198`		`-catch(Exceptionex)`
`199`		`-{`
`200`		`-Logger?.LogWarning(ex,"Insert Barrier error, gid={gid}",this.Gid);`
`201`		`-returnex.Message;`
	`200`	`+Logger?.LogWarning(insertException,"Insert Barrier error, gid={gid}",this.Gid);`
	`201`	`+returninsertException.Message;`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`varreason=string.Empty;`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -178,5 +178,31 @@ public async void Call_Should_Throw_Duplicated_Exception_When_QueryPrepared_At_F`
`178`	`178`	`Assert.Equal(DtmCommon.Constant.ResultDuplicated,ex.Message);`
`179`	`179`	`mockBusiCall.Verify(x=>x.Invoke(It.IsAny<System.Data.Common.DbTransaction>()),Times.Never);`
`180`	`180`	`}`
	`181`	`+`
	`182`	`+[Fact]`
	`183`	`+publicasyncvoidQueryPrepared_InsertException()`
	`184`	`+{`
	`185`	`+varbranchBarrier=_factory.CreateBranchBarrier("msg","gid","bid","msg");`
	`186`	`+`
	`187`	`+varconnQ=GetDbConnection();`
	`188`	`+connQ.Mocks.When(cmd=>cmd.CommandText.Contains("insert",StringComparison.Ordinal))`
	`189`	`+.ThrowsException(newException("DB account no insert permission"));`
	`190`	`+connQ.Mocks.When(cmd=>cmd.CommandText.Contains("select",StringComparison.OrdinalIgnoreCase))`
	`191`	`+.ReturnsScalar<string>(cmd=>null);`
	`192`	`+`
	`193`	`+varqRes=awaitbranchBarrier.QueryPrepared(connQ);`
	`194`	`+Assert.NotEqual("Object reference not set to an instance of an object.",qRes);`
	`195`	`+Assert.Equal("DB account no insert permission",qRes);`
	`196`	`+}`
	`197`	`+`
	`198`	`+[Fact]`
	`199`	`+publicasyncvoidQueryPrepared_DbIsNull()`
	`200`	`+{`
	`201`	`+varbranchBarrier=_factory.CreateBranchBarrier("msg","gid","bid","msg");`
	`202`	`+`
	`203`	`+varqRes=awaitbranchBarrier.QueryPrepared(db:null);`
	`204`	`+Assert.NotEqual("Object reference not set to an instance of an object.",qRes);`
	`205`	`+Assert.Equal("db is null",qRes);`
	`206`	`+}`
`181`	`207`	`}`
`182`	`208`	`}`

Comments

(0)