Skip to content

Commit aa13fc4

Browse files
committed
为所有数据库 CodeFirst 中的 LocalExecuteScalar 增加 AOP
1 parent 181fb90 commit aa13fc4

File tree

10 files changed

+38
-4
lines changed

10 files changed

+38
-4
lines changed

FreeSql.DbContext/FreeSql.DbContext.xml

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerCodeFirstTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,8 +612,8 @@ class 测试中文表
612612
[Fact]
613613
public void AddUniques()
614614
{
615-
var sql = g.sqlserver.CodeFirst.GetComparisonDDLStatements<AddUniquesInfo>();
616615
g.sqlserver.CodeFirst.SyncStructure<AddUniquesInfo>();
616+
var sql = g.sqlserver.CodeFirst.GetComparisonDDLStatements<AddUniquesInfo>();
617617
g.sqlserver.CodeFirst.SyncStructure(typeof(AddUniquesInfo), "AddUniquesInfo1");
618618
}
619619
[Table(Name = "AddUniquesInfo", OldName = "AddUniquesInfo2")]

Providers/FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,9 @@ object LocalExecuteScalar(string db, string sql)
480480
using (var cmd = conn.Value.CreateCommand())
481481
{
482482
cmd.CommandText = sql;
483-
cmd.CommandType = CommandType.Text;
483+
cmd.CommandType = CommandType.Text;
484+
var before = new Aop.CommandBeforeEventArgs(cmd);
485+
this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
484486
return cmd.ExecuteScalar();
485487
}
486488
}

Providers/FreeSql.Provider.Custom/MySql/CustomMySqlCodeFirst.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ protected override string GetComparisonDDLStatements(params TypeAndName[] object
7878
{
7979
Object<DbConnection> conn = null;
8080
string database = null;
81-
81+
8282
try
8383
{
8484
conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5));
@@ -382,6 +382,8 @@ object LocalExecuteScalar(string db, string sql)
382382
{
383383
cmd.CommandText = sql;
384384
cmd.CommandType = CommandType.Text;
385+
var before = new Aop.CommandBeforeEventArgs(cmd);
386+
this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
385387
return cmd.ExecuteScalar();
386388
}
387389
}

Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerCodeFirst.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,8 @@ object LocalExecuteScalar(string db, string sql)
474474
{
475475
cmd.CommandText = sql;
476476
cmd.CommandType = CommandType.Text;
477+
var before = new Aop.CommandBeforeEventArgs(cmd);
478+
this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
477479
return cmd.ExecuteScalar();
478480
}
479481
}

Providers/FreeSql.Provider.GBase/GBaseCodeFirst.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,9 @@ object LocalExecuteScalar(string db, string sql)
186186
using (var cmd = conn.Value.CreateCommand())
187187
{
188188
cmd.CommandText = sql;
189-
cmd.CommandType = CommandType.Text;
189+
cmd.CommandType = CommandType.Text;
190+
var before = new Aop.CommandBeforeEventArgs(cmd);
191+
this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
190192
return cmd.ExecuteScalar();
191193
}
192194
}

Providers/FreeSql.Provider.MySql/MySqlCodeFirst.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,8 @@ object LocalExecuteScalar(string db, string sql)
393393
{
394394
cmd.CommandText = sql;
395395
cmd.CommandType = CommandType.Text;
396+
var before = new Aop.CommandBeforeEventArgs(cmd);
397+
this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
396398
return cmd.ExecuteScalar();
397399
}
398400
}

Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlCodeFirst.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,8 @@ object LocalExecuteScalar(string db, string sql)
383383
{
384384
cmd.CommandText = sql;
385385
cmd.CommandType = CommandType.Text;
386+
var before = new Aop.CommandBeforeEventArgs(cmd);
387+
this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
386388
return cmd.ExecuteScalar();
387389
}
388390
}

Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerCodeFirst.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,8 @@ object LocalExecuteScalar(string db, string sql)
475475
{
476476
cmd.CommandText = sql;
477477
cmd.CommandType = CommandType.Text;
478+
var before = new Aop.CommandBeforeEventArgs(cmd);
479+
this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
478480
return cmd.ExecuteScalar();
479481
}
480482
}

Providers/FreeSql.Provider.SqlServer/SqlServerCodeFirst.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,8 @@ object LocalExecuteScalar(string db, string sql)
477477
{
478478
cmd.CommandText = sql;
479479
cmd.CommandType = CommandType.Text;
480+
var before = new Aop.CommandBeforeEventArgs(cmd);
481+
this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
480482
return cmd.ExecuteScalar();
481483
}
482484
}

0 commit comments

Comments
 (0)