Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
CAP
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
CAP
Commits
a9e0743f
Commit
a9e0743f
authored
Aug 15, 2017
by
yangxiaodong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed issue #25
parent
1248facd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
13 deletions
+25
-13
CapPublisher.cs
src/DotNetCore.CAP.MySql/CapPublisher.cs
+8
-4
CapPublisher.cs
src/DotNetCore.CAP.PostgreSql/CapPublisher.cs
+8
-4
CapPublisher.cs
src/DotNetCore.CAP.SqlServer/CapPublisher.cs
+9
-5
No files found.
src/DotNetCore.CAP.MySql/CapPublisher.cs
View file @
a9e0743f
...
@@ -34,13 +34,17 @@ namespace DotNetCore.CAP.MySql
...
@@ -34,13 +34,17 @@ namespace DotNetCore.CAP.MySql
protected
override
void
PrepareConnectionForEF
()
protected
override
void
PrepareConnectionForEF
()
{
{
DbConnection
=
_dbContext
.
Database
.
GetDbConnection
();
DbConnection
=
_dbContext
.
Database
.
GetDbConnection
();
var
transaction
=
_dbContext
.
Database
.
CurrentTransaction
;
var
dbContextTransaction
=
_dbContext
.
Database
.
CurrentTransaction
;
if
(
transaction
==
null
)
var
dbTrans
=
dbContextTransaction
?.
GetDbTransaction
();
//DbTransaction is dispose in original
if
(
dbTrans
?.
Connection
==
null
)
{
{
IsCapOpenedTrans
=
true
;
IsCapOpenedTrans
=
true
;
transaction
=
_dbContext
.
Database
.
BeginTransaction
(
IsolationLevel
.
ReadCommitted
);
dbContextTransaction
?.
Dispose
();
dbContextTransaction
=
_dbContext
.
Database
.
BeginTransaction
(
IsolationLevel
.
ReadCommitted
);
dbTrans
=
dbContextTransaction
.
GetDbTransaction
();
}
}
DbTranasaction
=
transaction
.
GetDbTransaction
()
;
DbTranasaction
=
dbTrans
;
}
}
protected
override
void
Execute
(
IDbConnection
dbConnection
,
IDbTransaction
dbTransaction
,
CapPublishedMessage
message
)
protected
override
void
Execute
(
IDbConnection
dbConnection
,
IDbTransaction
dbTransaction
,
CapPublishedMessage
message
)
...
...
src/DotNetCore.CAP.PostgreSql/CapPublisher.cs
View file @
a9e0743f
...
@@ -34,13 +34,17 @@ namespace DotNetCore.CAP.PostgreSql
...
@@ -34,13 +34,17 @@ namespace DotNetCore.CAP.PostgreSql
protected
override
void
PrepareConnectionForEF
()
protected
override
void
PrepareConnectionForEF
()
{
{
DbConnection
=
_dbContext
.
Database
.
GetDbConnection
();
DbConnection
=
_dbContext
.
Database
.
GetDbConnection
();
var
transaction
=
_dbContext
.
Database
.
CurrentTransaction
;
var
dbContextTransaction
=
_dbContext
.
Database
.
CurrentTransaction
;
if
(
transaction
==
null
)
var
dbTrans
=
dbContextTransaction
?.
GetDbTransaction
();
//DbTransaction is dispose in original
if
(
dbTrans
?.
Connection
==
null
)
{
{
IsCapOpenedTrans
=
true
;
IsCapOpenedTrans
=
true
;
transaction
=
_dbContext
.
Database
.
BeginTransaction
(
IsolationLevel
.
ReadCommitted
);
dbContextTransaction
?.
Dispose
();
dbContextTransaction
=
_dbContext
.
Database
.
BeginTransaction
(
IsolationLevel
.
ReadCommitted
);
dbTrans
=
dbContextTransaction
.
GetDbTransaction
();
}
}
DbTranasaction
=
transaction
.
GetDbTransaction
()
;
DbTranasaction
=
dbTrans
;
}
}
protected
override
void
Execute
(
IDbConnection
dbConnection
,
IDbTransaction
dbTransaction
,
CapPublishedMessage
message
)
protected
override
void
Execute
(
IDbConnection
dbConnection
,
IDbTransaction
dbTransaction
,
CapPublishedMessage
message
)
...
...
src/DotNetCore.CAP.SqlServer/CapPublisher.cs
View file @
a9e0743f
using
System
;
using
System
;
using
System.Data
;
using
System.Data
;
using
System.Data.SqlClient
;
using
System.Threading.Tasks
;
using
System.Threading.Tasks
;
using
Dapper
;
using
Dapper
;
using
DotNetCore.CAP.Abstractions
;
using
DotNetCore.CAP.Abstractions
;
...
@@ -34,13 +35,17 @@ namespace DotNetCore.CAP.SqlServer
...
@@ -34,13 +35,17 @@ namespace DotNetCore.CAP.SqlServer
protected
override
void
PrepareConnectionForEF
()
protected
override
void
PrepareConnectionForEF
()
{
{
DbConnection
=
_dbContext
.
Database
.
GetDbConnection
();
DbConnection
=
_dbContext
.
Database
.
GetDbConnection
();
var
transaction
=
_dbContext
.
Database
.
CurrentTransaction
;
var
dbContextTransaction
=
_dbContext
.
Database
.
CurrentTransaction
;
if
(
transaction
==
null
)
var
dbTrans
=
dbContextTransaction
?.
GetDbTransaction
();
//DbTransaction is dispose in original
if
(
dbTrans
?.
Connection
==
null
)
{
{
IsCapOpenedTrans
=
true
;
IsCapOpenedTrans
=
true
;
transaction
=
_dbContext
.
Database
.
BeginTransaction
(
IsolationLevel
.
ReadCommitted
);
dbContextTransaction
?.
Dispose
();
dbContextTransaction
=
_dbContext
.
Database
.
BeginTransaction
(
IsolationLevel
.
ReadCommitted
);
dbTrans
=
dbContextTransaction
.
GetDbTransaction
();
}
}
DbTranasaction
=
transaction
.
GetDbTransaction
()
;
DbTranasaction
=
dbTrans
;
}
}
protected
override
void
Execute
(
IDbConnection
dbConnection
,
IDbTransaction
dbTransaction
,
CapPublishedMessage
message
)
protected
override
void
Execute
(
IDbConnection
dbConnection
,
IDbTransaction
dbTransaction
,
CapPublishedMessage
message
)
...
@@ -53,7 +58,6 @@ namespace DotNetCore.CAP.SqlServer
...
@@ -53,7 +58,6 @@ namespace DotNetCore.CAP.SqlServer
protected
override
async
Task
ExecuteAsync
(
IDbConnection
dbConnection
,
IDbTransaction
dbTransaction
,
CapPublishedMessage
message
)
protected
override
async
Task
ExecuteAsync
(
IDbConnection
dbConnection
,
IDbTransaction
dbTransaction
,
CapPublishedMessage
message
)
{
{
await
dbConnection
.
ExecuteAsync
(
PrepareSql
(),
message
,
dbTransaction
);
await
dbConnection
.
ExecuteAsync
(
PrepareSql
(),
message
,
dbTransaction
);
_logger
.
LogInformation
(
"Published Message has been persisted in the database. name:"
+
message
.
ToString
());
_logger
.
LogInformation
(
"Published Message has been persisted in the database. name:"
+
message
.
ToString
());
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment