Revert "为所有数据库 CodeFirst 中的 LocalExecuteScalar 增加 AOP"

hyzx86 · hyzx86 · commit 0b4124202e28 · 2023-04-04T16:33:24.000+08:00
This reverts commit aa13fc4.
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerCodeFirstTest.cs
@@ -612,8 +612,8 @@ class 测试中文表
         [Fact]
         public void AddUniques()
         {
-            g.sqlserver.CodeFirst.SyncStructure<AddUniquesInfo>();
             var sql = g.sqlserver.CodeFirst.GetComparisonDDLStatements<AddUniquesInfo>();
+            g.sqlserver.CodeFirst.SyncStructure<AddUniquesInfo>();
             g.sqlserver.CodeFirst.SyncStructure(typeof(AddUniquesInfo), "AddUniquesInfo1");
         }
         [Table(Name = "AddUniquesInfo", OldName = "AddUniquesInfo2")]
diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs
@@ -480,9 +480,7 @@ object LocalExecuteScalar(string db, string sql)
                     using (var cmd = conn.Value.CreateCommand())
                     {
                         cmd.CommandText = sql;
-                        cmd.CommandType = CommandType.Text; 
-                        var before = new Aop.CommandBeforeEventArgs(cmd);
-                        this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
+                        cmd.CommandType = CommandType.Text;
                         return cmd.ExecuteScalar();
                     }
                 }
diff --git a/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlCodeFirst.cs b/Providers/FreeSql.Provider.Custom/MySql/CustomMySqlCodeFirst.cs
@@ -78,7 +78,7 @@ protected override string GetComparisonDDLStatements(params TypeAndName[] object
         {
             Object<DbConnection> conn = null;
             string database = null;
-
+            
             try
             {
                 conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5));
@@ -382,8 +382,6 @@ object LocalExecuteScalar(string db, string sql)
                     {
                         cmd.CommandText = sql;
                         cmd.CommandType = CommandType.Text;
-                        var before = new Aop.CommandBeforeEventArgs(cmd);
-                        this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
                         return cmd.ExecuteScalar();
                     }
                 }
diff --git a/Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerCodeFirst.cs b/Providers/FreeSql.Provider.Custom/SqlServer/CustomSqlServerCodeFirst.cs
@@ -474,8 +474,6 @@ object LocalExecuteScalar(string db, string sql)
                     {
                         cmd.CommandText = sql;
                         cmd.CommandType = CommandType.Text;
-                        var before = new Aop.CommandBeforeEventArgs(cmd);
-                        this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
                         return cmd.ExecuteScalar();
                     }
                 }
diff --git a/Providers/FreeSql.Provider.GBase/GBaseCodeFirst.cs b/Providers/FreeSql.Provider.GBase/GBaseCodeFirst.cs
@@ -186,9 +186,7 @@ object LocalExecuteScalar(string db, string sql)
                     using (var cmd = conn.Value.CreateCommand())
                     {
                         cmd.CommandText = sql;
-                        cmd.CommandType = CommandType.Text; 
-                        var before = new Aop.CommandBeforeEventArgs(cmd);
-                        this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
+                        cmd.CommandType = CommandType.Text;
                         return cmd.ExecuteScalar();
                     }
                 }
diff --git a/Providers/FreeSql.Provider.MySql/MySqlCodeFirst.cs b/Providers/FreeSql.Provider.MySql/MySqlCodeFirst.cs
@@ -393,8 +393,6 @@ object LocalExecuteScalar(string db, string sql)
                     {
                         cmd.CommandText = sql;
                         cmd.CommandType = CommandType.Text;
-                        var before = new Aop.CommandBeforeEventArgs(cmd);
-                        this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
                         return cmd.ExecuteScalar();
                     }
                 }
diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlCodeFirst.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlCodeFirst.cs
@@ -383,8 +383,6 @@ object LocalExecuteScalar(string db, string sql)
                     {
                         cmd.CommandText = sql;
                         cmd.CommandType = CommandType.Text;
-                        var before = new Aop.CommandBeforeEventArgs(cmd);
-                        this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
                         return cmd.ExecuteScalar();
                     }
                 }
diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerCodeFirst.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerCodeFirst.cs
@@ -475,8 +475,6 @@ object LocalExecuteScalar(string db, string sql)
                     {
                         cmd.CommandText = sql;
                         cmd.CommandType = CommandType.Text;
-                        var before = new Aop.CommandBeforeEventArgs(cmd);
-                        this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
                         return cmd.ExecuteScalar();
                     }
                 }
diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerCodeFirst.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerCodeFirst.cs
@@ -477,8 +477,6 @@ object LocalExecuteScalar(string db, string sql)
                     {
                         cmd.CommandText = sql;
                         cmd.CommandType = CommandType.Text;
-                        var before = new Aop.CommandBeforeEventArgs(cmd);
-                        this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);
                         return cmd.ExecuteScalar();
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -612,8 +612,8 @@ class 测试中文表`
`612`	`612`	`[Fact]`
`613`	`613`	`public void AddUniques()`
`614`	`614`	`{`
`615`		`- g.sqlserver.CodeFirst.SyncStructure<AddUniquesInfo>();`
`616`	`615`	`var sql = g.sqlserver.CodeFirst.GetComparisonDDLStatements<AddUniquesInfo>();`
	`616`	`+ g.sqlserver.CodeFirst.SyncStructure<AddUniquesInfo>();`
`617`	`617`	`g.sqlserver.CodeFirst.SyncStructure(typeof(AddUniquesInfo), "AddUniquesInfo1");`
`618`	`618`	`}`
`619`	`619`	`[Table(Name = "AddUniquesInfo", OldName = "AddUniquesInfo2")]`
Original file line number	Diff line number	Diff line change
`@@ -480,9 +480,7 @@ object LocalExecuteScalar(string db, string sql)`
`480`	`480`	`using (var cmd = conn.Value.CreateCommand())`
`481`	`481`	`{`
`482`	`482`	`cmd.CommandText = sql;`
`483`		`- cmd.CommandType = CommandType.Text;`
`484`		`- var before = new Aop.CommandBeforeEventArgs(cmd);`
`485`		`- this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);`
	`483`	`+ cmd.CommandType = CommandType.Text;`
`486`	`484`	`return cmd.ExecuteScalar();`
`487`	`485`	`}`
`488`	`486`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ protected override string GetComparisonDDLStatements(params TypeAndName[] object`
`78`	`78`	`{`
`79`	`79`	`Object<DbConnection> conn = null;`
`80`	`80`	`string database = null;`
`81`		`-`
	`81`	`+`
`82`	`82`	`try`
`83`	`83`	`{`
`84`	`84`	`conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5));`
`@@ -382,8 +382,6 @@ object LocalExecuteScalar(string db, string sql)`
`382`	`382`	`{`
`383`	`383`	`cmd.CommandText = sql;`
`384`	`384`	`cmd.CommandType = CommandType.Text;`
`385`		`- var before = new Aop.CommandBeforeEventArgs(cmd);`
`386`		`- this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);`
`387`	`385`	`return cmd.ExecuteScalar();`
`388`	`386`	`}`
`389`	`387`	`}`
Original file line number	Diff line number	Diff line change
`@@ -474,8 +474,6 @@ object LocalExecuteScalar(string db, string sql)`
`474`	`474`	`{`
`475`	`475`	`cmd.CommandText = sql;`
`476`	`476`	`cmd.CommandType = CommandType.Text;`
`477`		`- var before = new Aop.CommandBeforeEventArgs(cmd);`
`478`		`- this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);`
`479`	`477`	`return cmd.ExecuteScalar();`
`480`	`478`	`}`
`481`	`479`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,9 +186,7 @@ object LocalExecuteScalar(string db, string sql)`
`186`	`186`	`using (var cmd = conn.Value.CreateCommand())`
`187`	`187`	`{`
`188`	`188`	`cmd.CommandText = sql;`
`189`		`- cmd.CommandType = CommandType.Text;`
`190`		`- var before = new Aop.CommandBeforeEventArgs(cmd);`
`191`		`- this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);`
	`189`	`+ cmd.CommandType = CommandType.Text;`
`192`	`190`	`return cmd.ExecuteScalar();`
`193`	`191`	`}`
`194`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -393,8 +393,6 @@ object LocalExecuteScalar(string db, string sql)`
`393`	`393`	`{`
`394`	`394`	`cmd.CommandText = sql;`
`395`	`395`	`cmd.CommandType = CommandType.Text;`
`396`		`- var before = new Aop.CommandBeforeEventArgs(cmd);`
`397`		`- this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);`
`398`	`396`	`return cmd.ExecuteScalar();`
`399`	`397`	`}`
`400`	`398`	`}`
Original file line number	Diff line number	Diff line change
`@@ -383,8 +383,6 @@ object LocalExecuteScalar(string db, string sql)`
`383`	`383`	`{`
`384`	`384`	`cmd.CommandText = sql;`
`385`	`385`	`cmd.CommandType = CommandType.Text;`
`386`		`- var before = new Aop.CommandBeforeEventArgs(cmd);`
`387`		`- this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);`
`388`	`386`	`return cmd.ExecuteScalar();`
`389`	`387`	`}`
`390`	`388`	`}`
Original file line number	Diff line number	Diff line change
`@@ -475,8 +475,6 @@ object LocalExecuteScalar(string db, string sql)`
`475`	`475`	`{`
`476`	`476`	`cmd.CommandText = sql;`
`477`	`477`	`cmd.CommandType = CommandType.Text;`
`478`		`- var before = new Aop.CommandBeforeEventArgs(cmd);`
`479`		`- this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);`
`480`	`478`	`return cmd.ExecuteScalar();`
`481`	`479`	`}`
`482`	`480`	`}`
Original file line number	Diff line number	Diff line change
`@@ -477,8 +477,6 @@ object LocalExecuteScalar(string db, string sql)`
`477`	`477`	`{`
`478`	`478`	`cmd.CommandText = sql;`
`479`	`479`	`cmd.CommandType = CommandType.Text;`
`480`		`- var before = new Aop.CommandBeforeEventArgs(cmd);`
`481`		`- this._orm?.Aop.CommandBeforeHandler?.Invoke(this._orm, before);`
`482`	`480`	`return cmd.ExecuteScalar();`
`483`	`481`	`}`
`484`	`482`	`}`