lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-09-19 18:22:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

-

Browse Source
This commit is contained in:
sunkaixuan
2019-01-21 12:50:13 +08:00
parent 1bbbc7f133
commit 13a1778dc0
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Asp.Net/SqlSugar/SqlSugar.nuspec
View File

@@ -2,7 +2,7 @@
<package > <package >
<metadata> <metadata>
<id>sqlSugar</id> <id>sqlSugar</id>
<version>4.9.8</version> <version>4.9.8.1</version>
<title>SqlSugar .Net Framework 4.0+ ORM </title> <title>SqlSugar .Net Framework 4.0+ ORM </title>
<authors>sun kaixuan</authors> <authors>sun kaixuan</authors>
<owners>landa</owners> <owners>landa</owners>

20
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
View File

@@ -146,7 +146,7 @@ namespace SqlSugar
/// <returns></returns> /// <returns></returns>
public ISugarQueryable<T> WhereClass<ClassType>(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new() public ISugarQueryable<T> WhereClass<ClassType>(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new()
{ {
return WhereClass(new List<ClassType>() { whereClass },ignoreDefaultValue); return WhereClass(new List<ClassType>() { whereClass }, ignoreDefaultValue);
} }
/// <summary> /// <summary>
/// if a property that is not empty is a condition /// if a property that is not empty is a condition
@@ -168,9 +168,9 @@ namespace SqlSugar
var value = column.PropertyInfo.GetValue(item, null); var value = column.PropertyInfo.GetValue(item, null);
WhereType WhereType = WhereType.And; WhereType WhereType = WhereType.And;
var isNotNull = ignoreDefaultValue == false&&value != null ; var isNotNull = ignoreDefaultValue == false && value != null;
var isNotNullAndDefault = ignoreDefaultValue&& value!=null && value.ObjToString() != UtilMethods.DefaultForType(column.PropertyInfo.PropertyType).ObjToString(); var isNotNullAndDefault = ignoreDefaultValue && value != null && value.ObjToString() != UtilMethods.DefaultForType(column.PropertyInfo.PropertyType).ObjToString();
if (isNotNull||isNotNullAndDefault) if (isNotNull || isNotNullAndDefault)
{ {
if (cons.ConditionalList == null) if (cons.ConditionalList == null)
{ {
@@ -271,7 +271,7 @@ namespace SqlSugar
Where(SqlBuilder.SqlFalse); Where(SqlBuilder.SqlFalse);
return this; return this;
} }
if (pkValues.Length == 1 && pkValues.First().GetType().FullName.IsCollectionsList()|| pkValues.First() is IEnumerable) if (pkValues.Length == 1 && pkValues.First().GetType().FullName.IsCollectionsList() || (pkValues.First() is IEnumerable && pkValues.First().GetType() != UtilConstants.StringType))
{ {
var newValues = new List<object>(); var newValues = new List<object>();
foreach (var item in pkValues.First() as IEnumerable) foreach (var item in pkValues.First() as IEnumerable)
@@ -2721,7 +2721,7 @@ namespace SqlSugar
/// </summary> /// </summary>
/// <param name="whereClass"></param> /// <param name="whereClass"></param>
/// <returns></returns> /// <returns></returns>
public new ISugarQueryable<T,T2, T3, T4, T5> WhereClass<ClassType>(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new() public new ISugarQueryable<T, T2, T3, T4, T5> WhereClass<ClassType>(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new()
{ {
base.WhereClass(whereClass, ignoreDefaultValue); base.WhereClass(whereClass, ignoreDefaultValue);
return this; return this;
@@ -2731,7 +2731,7 @@ namespace SqlSugar
/// </summary> /// </summary>
/// <param name="whereClassTypes"></param> /// <param name="whereClassTypes"></param>
/// <returns></returns> /// <returns></returns>
public new ISugarQueryable<T,T2, T3, T4, T5> WhereClass<ClassType>(List<ClassType> whereClassTypes, bool ignoreDefaultValue = false) where ClassType : class, new() public new ISugarQueryable<T, T2, T3, T4, T5> WhereClass<ClassType>(List<ClassType> whereClassTypes, bool ignoreDefaultValue = false) where ClassType : class, new()
{ {
base.WhereClass(whereClassTypes, ignoreDefaultValue); base.WhereClass(whereClassTypes, ignoreDefaultValue);
@@ -3074,7 +3074,7 @@ namespace SqlSugar
/// </summary> /// </summary>
/// <param name="whereClass"></param> /// <param name="whereClass"></param>
/// <returns></returns> /// <returns></returns>
public new ISugarQueryable<T, T2, T3, T4, T5,T6> WhereClass<ClassType>(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new() public new ISugarQueryable<T, T2, T3, T4, T5, T6> WhereClass<ClassType>(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new()
{ {
base.WhereClass(whereClass, ignoreDefaultValue); base.WhereClass(whereClass, ignoreDefaultValue);
return this; return this;
@@ -3457,7 +3457,7 @@ namespace SqlSugar
/// </summary> /// </summary>
/// <param name="whereClass"></param> /// <param name="whereClass"></param>
/// <returns></returns> /// <returns></returns>
public new ISugarQueryable<T, T2, T3, T4, T5, T6,T7> WhereClass<ClassType>(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new() public new ISugarQueryable<T, T2, T3, T4, T5, T6, T7> WhereClass<ClassType>(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new()
{ {
base.WhereClass(whereClass, ignoreDefaultValue); base.WhereClass(whereClass, ignoreDefaultValue);
return this; return this;
@@ -3467,7 +3467,7 @@ namespace SqlSugar
/// </summary> /// </summary>
/// <param name="whereClassTypes"></param> /// <param name="whereClassTypes"></param>
/// <returns></returns> /// <returns></returns>
public new ISugarQueryable<T, T2, T3, T4, T5, T6,T7> WhereClass<ClassType>(List<ClassType> whereClassTypes, bool ignoreDefaultValue = false) where ClassType : class, new() public new ISugarQueryable<T, T2, T3, T4, T5, T6, T7> WhereClass<ClassType>(List<ClassType> whereClassTypes, bool ignoreDefaultValue = false) where ClassType : class, new()
{ {
base.WhereClass(whereClassTypes, ignoreDefaultValue); base.WhereClass(whereClassTypes, ignoreDefaultValue);

BIN
Src/Asp.NetCore2/SqlSeverTest/SqliteTest/DataBase/SqlSugar4xTest.sqlite
View File

Binary file not shown.