mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-06-28 13:34:32 +08:00
Synchronized code
This commit is contained in:
parent
092fe98dff
commit
86a749ee9f
@ -8,6 +8,14 @@ namespace SqlSugar
|
|||||||
{
|
{
|
||||||
public override string GetDbTypeName(string csharpTypeName)
|
public override string GetDbTypeName(string csharpTypeName)
|
||||||
{
|
{
|
||||||
|
if (csharpTypeName?.StartsWith("ora")==true&& this.Context.CurrentConnectionConfig?.MoreSettings?.DatabaseModel == DbType.Vastbase)
|
||||||
|
{
|
||||||
|
csharpTypeName= csharpTypeName.Replace("ora", "");
|
||||||
|
}
|
||||||
|
else if (csharpTypeName?.StartsWith("mssql_") == true && this.Context.CurrentConnectionConfig?.MoreSettings?.DatabaseModel == DbType.Vastbase)
|
||||||
|
{
|
||||||
|
csharpTypeName = csharpTypeName.Replace("mssql_", "");
|
||||||
|
}
|
||||||
if (csharpTypeName == UtilConstants.ByteArrayType.Name)
|
if (csharpTypeName == UtilConstants.ByteArrayType.Name)
|
||||||
return "bytea";
|
return "bytea";
|
||||||
if (csharpTypeName.ToLower() == "int32")
|
if (csharpTypeName.ToLower() == "int32")
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
namespace SqlSugar
|
namespace SqlSugar
|
||||||
{
|
{
|
||||||
public class PostgreSQLExpressionContext : ExpressionContext, ILambdaExpressions
|
public partial class PostgreSQLExpressionContext : ExpressionContext, ILambdaExpressions
|
||||||
{
|
{
|
||||||
public SqlSugarProvider Context { get; set; }
|
public SqlSugarProvider Context { get; set; }
|
||||||
public PostgreSQLExpressionContext()
|
public PostgreSQLExpressionContext()
|
||||||
@ -244,6 +244,12 @@ namespace SqlSugar
|
|||||||
{
|
{
|
||||||
var parameter = model.Args[0];
|
var parameter = model.Args[0];
|
||||||
var parameter2 = model.Args[1];
|
var parameter2 = model.Args[1];
|
||||||
|
var parameter2Info = model.Parameters.FirstOrDefault(it => it.ParameterName.EqualCase(parameter2.MemberName + ""));
|
||||||
|
if (parameter2Info!=null&¶meter2.MemberName?.ToString()?.StartsWith("@MethodConst")==true)
|
||||||
|
{
|
||||||
|
parameter2Info.Value = parameter2.MemberValue+"%";
|
||||||
|
return string.Format(" ({0} like {1} ) ", parameter.MemberName, parameter2.MemberName);
|
||||||
|
}
|
||||||
return string.Format(" ({0} like concat({1},'%')) ", parameter.MemberName, parameter2.MemberName);
|
return string.Format(" ({0} like concat({1},'%')) ", parameter.MemberName, parameter2.MemberName);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -251,6 +257,12 @@ namespace SqlSugar
|
|||||||
{
|
{
|
||||||
var parameter = model.Args[0];
|
var parameter = model.Args[0];
|
||||||
var parameter2 = model.Args[1];
|
var parameter2 = model.Args[1];
|
||||||
|
var parameter2Info = model.Parameters.FirstOrDefault(it => it.ParameterName.EqualCase(parameter2.MemberName + ""));
|
||||||
|
if (parameter2Info != null && parameter2.MemberName?.ToString()?.StartsWith("@MethodConst") == true)
|
||||||
|
{
|
||||||
|
parameter2Info.Value = "%"+parameter2.MemberValue ;
|
||||||
|
return string.Format(" ({0} like {1} ) ", parameter.MemberName, parameter2.MemberName);
|
||||||
|
}
|
||||||
return string.Format(" ({0} like concat('%',{1}))", parameter.MemberName,parameter2.MemberName);
|
return string.Format(" ({0} like concat('%',{1}))", parameter.MemberName,parameter2.MemberName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -172,6 +172,10 @@ namespace SqlSugar
|
|||||||
dbType = "varchar";
|
dbType = "varchar";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(it?.PropertyType?.FullName == "NetTopologySuite.Geometries.Geometry")
|
||||||
|
{
|
||||||
|
return string.Format(" {0} ", base.GetDbColumn(it, FormatValue(it.Value, it.DbColumnName, i + (pageIndex - 1) * 100000, it)), dbType);
|
||||||
|
}
|
||||||
return string.Format("CAST({0} AS {1})", base.GetDbColumn(it,FormatValue(it.Value,it.DbColumnName,i+(pageIndex-1)*100000,it)), dbType);
|
return string.Format("CAST({0} AS {1})", base.GetDbColumn(it,FormatValue(it.Value,it.DbColumnName,i+(pageIndex-1)*100000,it)), dbType);
|
||||||
|
|
||||||
})) + ")");
|
})) + ")");
|
||||||
|
Loading…
Reference in New Issue
Block a user