From ca550b4be1aa8a45cb556d0b0121277a9ed2373d Mon Sep 17 00:00:00 2001
From: skx <610262374@qq.com>
Date: Sun, 8 Dec 2019 15:51:12 +0800
Subject: [PATCH] optimization Sqllite dispose file occupied
---
Src/Asp.Net/SqlServerTest/Config.cs | 6 ++---
Src/Asp.Net/SqlServerTest/Demo/Demo7_Ado.cs | 26 +++++++++++++++----
Src/Asp.Net/SqlServerTest/Program.cs | 2 +-
.../Abstract/AdoProvider/AdoProvider.cs | 7 +++++
4 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/Src/Asp.Net/SqlServerTest/Config.cs b/Src/Asp.Net/SqlServerTest/Config.cs
index bf6bea4e6..3a8194a1b 100644
--- a/Src/Asp.Net/SqlServerTest/Config.cs
+++ b/Src/Asp.Net/SqlServerTest/Config.cs
@@ -16,16 +16,16 @@ namespace OrmTest
/// Account have permission to create database
/// 用有建库权限的数据库账号
///
- public static string ConnectionString = "server=.;uid=sa;pwd=@jhl85661501;database=SQLSUGAR4XTEST";
+ public static string ConnectionString = "server=.;uid=sa;pwd=haosql;database=SQLSUGAR4XTEST";
///
/// Account have permission to create database
/// 用有建库权限的数据库账号
///
- public static string ConnectionString2 = "server=.;uid=sa;pwd=@jhl85661501;database=SQLSUGAR4XTEST2";
+ public static string ConnectionString2 = "server=.;uid=sa;pwd=haosql;database=SQLSUGAR4XTEST2";
///
/// Account have permission to create database
/// 用有建库权限的数据库账号
///
- public static string ConnectionString3 = "server=.;uid=sa;pwd=@jhl85661501;database=SQLSUGAR4XTEST3";
+ public static string ConnectionString3 = "server=.;uid=sa;pwd=haosql;database=SQLSUGAR4XTEST3";
}
}
diff --git a/Src/Asp.Net/SqlServerTest/Demo/Demo7_Ado.cs b/Src/Asp.Net/SqlServerTest/Demo/Demo7_Ado.cs
index a4a7ba2db..9a7c48d12 100644
--- a/Src/Asp.Net/SqlServerTest/Demo/Demo7_Ado.cs
+++ b/Src/Asp.Net/SqlServerTest/Demo/Demo7_Ado.cs
@@ -38,12 +38,28 @@ namespace OrmTest
//sql
var dt2 = db.Ado.GetDataTable("select * from [order] where @id>0 or name=@name", new { id = 1, name = "2" });
- //Stored Procedure
- //var dt3 = db.Ado.UseStoredProcedure().GetDataTable("sp_school", new { name = "张三", age = 0 });
- //var nameP = new SugarParameter("@name", "张三");
- //var ageP = new SugarParameter("@age", null, true);//isOutput=true
- //var dt4 = db.Ado.UseStoredProcedure().GetDataTable("sp_school", nameP, ageP);
+ //create sp
+ db.Ado.ExecuteCommand(@"
+ if object_id('up_user') is not null
+ drop proc up_user;");
+ db.Ado.ExecuteCommand(@"
+ create proc up_user
+ @id int,
+ @name varchar(10) ='' output
+ as
+
+ begin
+ set @name='abc'
+ select @id as id
+ end
+ ");
+ //get output
+ var dt3 = db.Ado.UseStoredProcedure().GetDataTable("up_user", new { name = "张三", id = 0 });
+ var IdP = new SugarParameter("@id", 1);
+ var NameP = new SugarParameter("@name", null, true);//isOutput=true
+ var dt4 = db.Ado.UseStoredProcedure().GetDataTable("up_user", IdP, NameP);
+ var outputValue = NameP.Value;
//There are many methods to under db.ado
diff --git a/Src/Asp.Net/SqlServerTest/Program.cs b/Src/Asp.Net/SqlServerTest/Program.cs
index da2a24612..2b5b12699 100644
--- a/Src/Asp.Net/SqlServerTest/Program.cs
+++ b/Src/Asp.Net/SqlServerTest/Program.cs
@@ -34,7 +34,7 @@ namespace OrmTest
DemoG_SimpleClient.Init();
//Unit test
- //NewUnitTest.Init();
+ NewUnitTest.Init();
//Rest Data
NewUnitTest.RestData();
diff --git a/Src/Asp.Net/SqlSugar/Abstract/AdoProvider/AdoProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/AdoProvider/AdoProvider.cs
index 2bedc5e6f..d9da10b8a 100644
--- a/Src/Asp.Net/SqlSugar/Abstract/AdoProvider/AdoProvider.cs
+++ b/Src/Asp.Net/SqlSugar/Abstract/AdoProvider/AdoProvider.cs
@@ -275,6 +275,7 @@ namespace SqlSugar
if (this.IsClearParameters)
sqlCommand.Parameters.Clear();
ExecuteAfter(sql, parameters);
+ sqlCommand.Dispose();
return count;
}
catch (Exception ex)
@@ -310,6 +311,7 @@ namespace SqlSugar
sqlCommand.Parameters.Clear();
ExecuteAfter(sql, parameters);
SetConnectionEnd(sql);
+ sqlCommand.Dispose();
return sqlDataReader;
}
catch (Exception ex)
@@ -339,6 +341,7 @@ namespace SqlSugar
if (this.IsClearParameters)
sqlCommand.Parameters.Clear();
ExecuteAfter(sql, parameters);
+ sqlCommand.Dispose();
return ds;
}
catch (Exception ex)
@@ -371,6 +374,7 @@ namespace SqlSugar
if (this.IsClearParameters)
sqlCommand.Parameters.Clear();
ExecuteAfter(sql, parameters);
+ sqlCommand.Dispose();
return scalar;
}
catch (Exception ex)
@@ -404,6 +408,7 @@ namespace SqlSugar
if (this.IsClearParameters)
sqlCommand.Parameters.Clear();
ExecuteAfter(sql, parameters);
+ sqlCommand.Dispose();
return count;
}
catch (Exception ex)
@@ -440,6 +445,7 @@ namespace SqlSugar
sqlCommand.Parameters.Clear();
ExecuteAfter(sql, parameters);
SetConnectionEnd(sql);
+ sqlCommand.Dispose();
return sqlDataReader;
}
catch (Exception ex)
@@ -468,6 +474,7 @@ namespace SqlSugar
if (this.IsClearParameters)
sqlCommand.Parameters.Clear();
ExecuteAfter(sql, parameters);
+ sqlCommand.Dispose();
return scalar;
}
catch (Exception ex)