lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-04-05 17:37:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update odbc

Browse Source
This commit is contained in:
sunkaixuan 2024-06-29 18:55:11 +08:00
parent 4194de5d64
commit 121b1eb497
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Src/Asp.NetCore2/SqlSugar.OdbcCore/GBase/SqlBuilder/GBaseQueryBuilder.cs
View File

@ -61,8 +61,20 @@ namespace SqlSugar.Odbc
this.OrderByValue = null;
}
if (this.OrderByValue == "ORDER BY ") this.OrderByValue += GetSelectValue.Split(',')[0];
if (this.Context.CurrentConnectionConfig?.MoreSettings?.DatabaseModel == DbType.SqlServer)
if (OdbcConfig.IsCompatibleWithOldDatabaseVersion&&this.Context.CurrentConnectionConfig?.MoreSettings?.DatabaseModel == DbType.SqlServer)
{
//SqlServer2008
var orderby = GetOrderByString;
if (string.IsNullOrEmpty(orderby))
{
orderby = "ORDER BY GETDATE()";
}
var rowNumberString = string.Format(",ROW_NUMBER() OVER({0}) AS RowIndex ", orderby);
result = string.Format("SELECT * FROM ( SELECT {0}{7} FROM {1} {2} {3} {4} ) t WHERE t.RowIndex BETWEEN {5} AND {6}", GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, null, Skip.ObjToInt() + 1, Skip.ObjToInt() + Take.ObjToInt(),rowNumberString);
}
else if (this.Context.CurrentConnectionConfig?.MoreSettings?.DatabaseModel == DbType.SqlServer)
{
//SqlServer2012+
var orderby = GetOrderByString;
if (string.IsNullOrEmpty(orderby))
{

1
Src/Asp.NetCore2/SqlSugar.OdbcCore/OdbcConfig.cs
View File

@ -8,5 +8,6 @@ namespace SqlSugar.Odbc
{
public static string SqlTranslationLeft ="";
public static string SqlTranslationRight="";
public static bool IsCompatibleWithOldDatabaseVersion = false;
}
}