lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-10-07 15:14:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: lsm:bb2e53bc4f96f0aa9fb4feece20d106adb144b0d
Branches Tags
lsm:master
lsm:5.1.4.148 lsm:5.1.4.141 lsm:ORM
...
compare: lsm:482fe429b93265f5fe5ac991f7354d26733ca390
Branches Tags
lsm:master
lsm:5.1.4.148 lsm:5.1.4.141 lsm:ORM

5 Commits
bb2e53bc4f ... 482fe429b9

Author SHA1 Message Date
阿妮亚
482fe429b9 !93 1.this?.Context?.Case 不等于判断 
Merge pull request !93 from 杜子腾/master
 2025-09-09 12:46:42 +00:00
guoshun.du
d4eb924900 1.this?.Context?.Case 不等于判断 
2.OceanBaseForOracle和TDSQLForODBC重写Case
 2025-09-09 20:40:57 +08:00
阿妮亚
5431701ec6 !90 OceanBaseForOracle和TDSQLForODBC问题修复 
Merge pull request !90 from 杜子腾/master
 2025-09-09 11:33:46 +00:00
guoshun.du
81eb7a5a3f 1.ExpressionContextCase增加Num属性，用于传递跳过的数据数量。 
2.OcaenBaseForOracle 重写 GetLimit，使其支持子查询。
3.TDSQLForPGODBC 重写 GetLimit，使其支持子查询。
4.getMyInt和getMyIntNull，获取数据方式改成GetDecimal，只有OcaenBaseForOracle 使用这两个方法，这是为了支持OcaenBaseForOracle 驱动2.0.9以上，请更新驱动到2.0.9以上
 2025-09-09 19:24:19 +08:00
sunkaixuan
96a670465c Update exp to sql 2025-09-09 18:46:30 +08:00
6 changed files with 36 additions and 3 deletions
Expand all files Collapse all files

11
Src/Asp.NetCore2/SqlSugar.OceanBaseForOracle/OceanBase/SqlBuilder/OceanBaseForOracleExpressionContext.cs
View File

@@ -16,6 +16,7 @@ namespace SqlSugar.OceanBaseForOracle
public OceanBaseForOracleExpressionContext()
{
base.DbMehtods = new OceanBaseForOracleMethod();
base.Case = new ExpressionContextCase();
}
public override string SqlParameterKeyWord
{
@@ -72,6 +73,16 @@ namespace SqlSugar.OceanBaseForOracle
}
}
}
public override string GetLimit()
{
int num = 1;
if (this.Case?.Num > 1)
{
num = this.Case.Num;
}
return (this.Case?.HasWhere == true ? "AND" : "WHERE") + " ROWNUM=" + num;
}
}
public partial class OceanBaseForOracleMethod : DefaultDbMethod, IDbMethods
{

11
Src/Asp.NetCore2/SqlSugar.TDSQLForPGODBC/TDSQLForPG/SqlBuilder/TDSQLForPGODBCExpressionContext.cs
View File

@@ -8,6 +8,7 @@ namespace SqlSugar.TDSQLForPGODBC
public TDSQLForPGODBCExpressionContext()
{
base.DbMehtods = new TDSQLForPGODBCMethod();
base.Case = new ExpressionContextCase();
}
public override string SqlTranslationLeft
{
@@ -130,6 +131,16 @@ namespace SqlSugar.TDSQLForPGODBC
});
}
}
public override string GetLimit()
{
int num = 1;
if (this.Case.Num > 1)
{
num = this.Case.Num;
}
return "limit " + num;
}
}
public class TDSQLForPGODBCMethod : DefaultDbMethod, IDbMethods
{

4
Src/Asp.NetCore2/SqlSugar/Abstract/DbBindProvider/IDataRecordExtensions.cs
View File

@@ -151,7 +151,7 @@ namespace SqlSugar
}
if (dr.GetDataTypeName(i) == "NUMBER")
{
return Convert.ToInt32(dr.GetDouble(i));
return Convert.ToInt32(dr.GetDecimal(i));
}
var result = dr.GetInt32(i);
return result;
@@ -160,7 +160,7 @@ namespace SqlSugar
{
if (dr.GetDataTypeName(i) == "NUMBER")
{
return Convert.ToInt32(dr.GetDouble(i));
return Convert.ToInt32(dr.GetDecimal(i));
}
var result = dr.GetInt32(i);
return result;

4
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Common/ExpressionContextCase.cs
View File

@@ -4,10 +4,12 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SqlSugar
namespace SqlSugar
{
public class ExpressionContextCase
{
public bool IsDateString { get; set; }
public bool HasWhere { get; set; }
public int Num { get; set; } = 1;
}
}

5
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Subquery/Items/SubTake.cs
View File

@@ -82,6 +82,11 @@ namespace SqlSugar
}
else if (this.Context.GetLimit() != null)
{
if (this?.Context?.Case != null)
{
this.Context.Case.HasWhere = this.HasWhere;
this.Context.Case.Num = num;
}
return this.Context.GetLimit();
}
else

4
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Subquery/Items/SubTop.cs
View File

@@ -67,6 +67,10 @@ namespace SqlSugar
}
else if (this.Context.GetLimit()!=null)
{
if (this?.Context?.Case != null)
{
this.Context.Case.HasWhere = this.HasWhere;
}
return this.Context.GetLimit();
}
else