mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-05-07 22:27:58 +08:00
Synchronization code
This commit is contained in:
parent
01b59e35e9
commit
35efe231e3
@ -52,7 +52,8 @@ namespace SqlSugar
|
|||||||
if (this.IsOffIdentity)
|
if (this.IsOffIdentity)
|
||||||
{
|
{
|
||||||
var tableName = this.GetTableNameString;
|
var tableName = this.GetTableNameString;
|
||||||
result = $"SET IDENTITY_INSERT {tableName} ON;" + result.TrimEnd(';') + $";SET IDENTITY_INSERT {tableName} OFF"; ;
|
result = $"SET IDENTITY_INSERT {tableName} ON;" + result.TrimEnd(';') + $";SET IDENTITY_INSERT {tableName} OFF";
|
||||||
|
result = result.Replace(";\r\n;", ";");
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
@ -36,7 +36,7 @@ namespace SqlSugar
|
|||||||
then true else false end as IsNullable
|
then true else false end as IsNullable
|
||||||
from (select * from sys_tables where UPPER(tablename) = UPPER('{{0}}') and lower(schemaname)='{GetSchema()}') ptables inner join sys_class pclass
|
from (select * from sys_tables where UPPER(tablename) = UPPER('{{0}}') and lower(schemaname)='{GetSchema()}') ptables inner join sys_class pclass
|
||||||
on ptables.tablename = pclass.relname inner join (SELECT *
|
on ptables.tablename = pclass.relname inner join (SELECT *
|
||||||
FROM information_schema.columns
|
FROM information_schema.columns where UPPER(table_schema)=UPPER('{GetSchema()}')
|
||||||
) pcolumn on pcolumn.table_name = ptables.tablename
|
) pcolumn on pcolumn.table_name = ptables.tablename
|
||||||
left join (
|
left join (
|
||||||
select sys_class.relname,sys_attribute.attname as colname from
|
select sys_class.relname,sys_attribute.attname as colname from
|
||||||
|
@ -13,11 +13,11 @@ namespace SqlSugar
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override ISugarQueryable<T> PartitionBy(string groupFileds)
|
//public override ISugarQueryable<T> PartitionBy(string groupFileds)
|
||||||
{
|
//{
|
||||||
this.GroupBy(groupFileds);
|
// this.QueryBuilder.
|
||||||
return this;
|
// return this;
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
public class KdbndpQueryable<T, T2> : QueryableProvider<T, T2>
|
public class KdbndpQueryable<T, T2> : QueryableProvider<T, T2>
|
||||||
{
|
{
|
||||||
|
@ -479,6 +479,10 @@ namespace SqlSugar
|
|||||||
return $"{model.Args[0].MemberName}::jsonb @> '[\"{model.Args[1].MemberValue}\"]'::jsonb ";
|
return $"{model.Args[0].MemberName}::jsonb @> '[\"{model.Args[1].MemberValue}\"]'::jsonb ";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public override string Format(MethodCallExpressionModel model)
|
||||||
|
{
|
||||||
|
return base.Format(model).Replace("concat(", "pg_catalog.concat(");
|
||||||
|
}
|
||||||
public override string JsonListObjectAny(MethodCallExpressionModel model)
|
public override string JsonListObjectAny(MethodCallExpressionModel model)
|
||||||
{
|
{
|
||||||
if (UtilMethods.IsNumber(model.Args[2].MemberValue.GetType().Name))
|
if (UtilMethods.IsNumber(model.Args[2].MemberValue.GetType().Name))
|
||||||
|
@ -7,6 +7,17 @@ namespace SqlSugar
|
|||||||
public partial class KdbndpQueryBuilder : QueryBuilder
|
public partial class KdbndpQueryBuilder : QueryBuilder
|
||||||
{
|
{
|
||||||
#region Sql Template
|
#region Sql Template
|
||||||
|
public override string SqlTemplate
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (this.PartitionByValue.HasValue())
|
||||||
|
{
|
||||||
|
return "SELECT {0}{" + UtilConstants.ReplaceKey + "} FROM {1}{2}{3}{4}";
|
||||||
|
}
|
||||||
|
return base.SqlTemplate;
|
||||||
|
}
|
||||||
|
}
|
||||||
public override string PageTempalte
|
public override string PageTempalte
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
@ -14,6 +25,10 @@ namespace SqlSugar
|
|||||||
/*
|
/*
|
||||||
SELECT * FROM TABLE WHERE CONDITION ORDER BY ID DESC LIMIT 10 offset 0
|
SELECT * FROM TABLE WHERE CONDITION ORDER BY ID DESC LIMIT 10 offset 0
|
||||||
*/
|
*/
|
||||||
|
if (this.PartitionByValue.HasValue())
|
||||||
|
{
|
||||||
|
return base.PageTempalte;
|
||||||
|
}
|
||||||
var template = "SELECT {0} FROM {1} {2} {3} {4} LIMIT {6} offset {5}";
|
var template = "SELECT {0} FROM {1} {2} {3} {4} LIMIT {6} offset {5}";
|
||||||
return template;
|
return template;
|
||||||
}
|
}
|
||||||
@ -35,6 +50,10 @@ namespace SqlSugar
|
|||||||
}
|
}
|
||||||
public override string ToSqlString()
|
public override string ToSqlString()
|
||||||
{
|
{
|
||||||
|
if (PartitionByValue.HasValue())
|
||||||
|
{
|
||||||
|
return base.ToSqlString();
|
||||||
|
}
|
||||||
base.AppendFilter();
|
base.AppendFilter();
|
||||||
string oldOrderValue = this.OrderByValue;
|
string oldOrderValue = this.OrderByValue;
|
||||||
var isNullOrderValue = Skip == 0 && Take == 1 && oldOrderValue == "ORDER BY NOW() ";
|
var isNullOrderValue = Skip == 0 && Take == 1 && oldOrderValue == "ORDER BY NOW() ";
|
||||||
|
@ -166,10 +166,10 @@ namespace SqlSugar
|
|||||||
{
|
{
|
||||||
var isFirst = whereString == null;
|
var isFirst = whereString == null;
|
||||||
whereString += (isFirst ? null : " AND ");
|
whereString += (isFirst ? null : " AND ");
|
||||||
whereString += item;
|
whereString += item.Replace(" \"",$" {Builder.GetTranslationColumnName(this.EntityInfo.DbTableName)}.\"");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (PrimaryKeys.HasValue())
|
if (PrimaryKeys.HasValue())
|
||||||
{
|
{
|
||||||
foreach (var item in PrimaryKeys)
|
foreach (var item in PrimaryKeys)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user