Update .net core version

This commit is contained in:
sunkaixuan 2022-06-07 14:32:00 +08:00
parent 193ac3169d
commit 8e7ae2a359
4 changed files with 21 additions and 2 deletions

View File

@ -2421,7 +2421,14 @@ namespace SqlSugar
if (this.QueryBuilder.AsTables != null && this.QueryBuilder.AsTables.Count==1) if (this.QueryBuilder.AsTables != null && this.QueryBuilder.AsTables.Count==1)
{ {
var tableinfo = this.QueryBuilder.AsTables.First(); var tableinfo = this.QueryBuilder.AsTables.First();
this.QueryBuilder.AsTables[tableinfo.Key] =" (SELECT * FROM " +this.QueryBuilder.AsTables.First().Value+")"; if (this.Context.CurrentConnectionConfig?.MoreSettings?.IsWithNoLockQuery == true)
{
this.QueryBuilder.AsTables[tableinfo.Key] = " (SELECT * FROM " + this.QueryBuilder.AsTables.First().Value + $" {SqlWith.NoLock} )";
}
else
{
this.QueryBuilder.AsTables[tableinfo.Key] = " (SELECT * FROM " + this.QueryBuilder.AsTables.First().Value + ")";
}
this.QueryBuilder.SelectValue = this.QueryBuilder.TableShortName +".*"; this.QueryBuilder.SelectValue = this.QueryBuilder.TableShortName +".*";
} }
} }

View File

@ -676,7 +676,10 @@ namespace SqlSugar
} }
if (this.TableWithString.HasValue() && this.TableWithString != SqlWith.Null) if (this.TableWithString.HasValue() && this.TableWithString != SqlWith.Null)
{ {
result += TableWithString + UtilConstants.Space; if (!result.TrimStart().StartsWith("("))
{
result += TableWithString + UtilConstants.Space;
}
} }
if (!this.IsSingle()) if (!this.IsSingle())
{ {

View File

@ -203,6 +203,11 @@ namespace SqlSugar
sqlParameter.Value = parameter.Value; sqlParameter.Value = parameter.Value;
sqlParameter.DbType = System.Data.DbType.DateTime; sqlParameter.DbType = System.Data.DbType.DateTime;
} }
else if (parameter.DbType == System.Data.DbType.Date)
{
sqlParameter.Value = parameter.Value;
sqlParameter.DbType = System.Data.DbType.Date;
}
else if (parameter.DbType == System.Data.DbType.AnsiStringFixedLength) else if (parameter.DbType == System.Data.DbType.AnsiStringFixedLength)
{ {
sqlParameter.DbType = System.Data.DbType.AnsiStringFixedLength; sqlParameter.DbType = System.Data.DbType.AnsiStringFixedLength;

View File

@ -119,6 +119,10 @@ namespace SqlSugar
{ {
sqlParameter.NpgsqlDbType = NpgsqlDbType.Integer | NpgsqlDbType.Array; sqlParameter.NpgsqlDbType = NpgsqlDbType.Integer | NpgsqlDbType.Array;
} }
else if (parameter.DbType.IsIn(System.Data.DbType.Int16))
{
sqlParameter.NpgsqlDbType = NpgsqlDbType.Smallint | NpgsqlDbType.Array;
}
else if (parameter.DbType.IsIn(System.Data.DbType.Int64)) else if (parameter.DbType.IsIn(System.Data.DbType.Int64))
{ {
sqlParameter.NpgsqlDbType = NpgsqlDbType.Bigint | NpgsqlDbType.Array; sqlParameter.NpgsqlDbType = NpgsqlDbType.Bigint | NpgsqlDbType.Array;