Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 734b90f

Browse files
committed
Handle resolving concrete types from IHasDbConnection/DbCommand in .NET 4.5 async builds
1 parent 0fcded1 commit 734b90f

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

src/ServiceStack.OrmLite.MySql/MySqlDialectProvider.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,19 @@ public string GetColumnDefinition(FieldDefinition fieldDef)
228228

229229
protected MySqlConnection Unwrap(IDbConnection db)
230230
{
231+
var hasDb = db as IHasDbConnection;
232+
if (hasDb != null)
233+
return (MySqlConnection)hasDb.DbConnection;
234+
231235
return (MySqlConnection)db.ToDbConnection();
232236
}
233237

234238
protected MySqlCommand Unwrap(IDbCommand cmd)
235239
{
240+
var hasCmd = cmd as IHasDbCommand;
241+
if (hasCmd != null)
242+
return (MySqlCommand)hasCmd.DbCommand;
243+
236244
return (MySqlCommand)cmd.ToDbCommand();
237245
}
238246

src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,11 +465,19 @@ public override string GetLoadChildrenSubSelect<From>(ModelDefinition modelDef,
465465

466466
protected SqlConnection Unwrap(IDbConnection db)
467467
{
468+
var hasDb = db as IHasDbConnection;
469+
if (hasDb != null)
470+
return (SqlConnection)hasDb.DbConnection;
471+
468472
return (SqlConnection)db.ToDbConnection();
469473
}
470474

471475
protected SqlCommand Unwrap(IDbCommand cmd)
472476
{
477+
var hasCmd = cmd as IHasDbCommand;
478+
if (hasCmd != null)
479+
return (SqlCommand)hasCmd.DbCommand;
480+
473481
return (SqlCommand) cmd.ToDbCommand();
474482
}
475483

0 commit comments

Comments
 (0)