mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-04-05 17:37:58 +08:00
Update TDengine
This commit is contained in:
parent
267c550818
commit
d6cb644a07
@ -6,7 +6,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="TDengine.Ado.Data" Version="1.6.6" />
|
<PackageReference Include="TDengine.Ado.Data" Version="1.6.7" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -229,21 +229,21 @@ namespace SqlSugar.TDengine
|
|||||||
{
|
{
|
||||||
var parameter = model.Args[0];
|
var parameter = model.Args[0];
|
||||||
var parameter2 = model.Args[1];
|
var parameter2 = model.Args[1];
|
||||||
return string.Format(" ({0} like concat('%',{1},'%')) ", parameter.MemberName, parameter2.MemberName );
|
return string.Format(" ({0} like {1} ) ", parameter.MemberName, ("%"+parameter2.MemberValue+"%").ToSqlValue() );
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string StartsWith(MethodCallExpressionModel model)
|
public override string StartsWith(MethodCallExpressionModel model)
|
||||||
{
|
{
|
||||||
var parameter = model.Args[0];
|
var parameter = model.Args[0];
|
||||||
var parameter2 = model.Args[1];
|
var parameter2 = model.Args[1];
|
||||||
return string.Format(" ({0} like concat({1},'%')) ", parameter.MemberName, parameter2.MemberName);
|
return string.Format(" ({0} like {1} ) ", parameter.MemberName, ("%" + parameter2.MemberValue ).ToSqlValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string EndsWith(MethodCallExpressionModel model)
|
public override string EndsWith(MethodCallExpressionModel model)
|
||||||
{
|
{
|
||||||
var parameter = model.Args[0];
|
var parameter = model.Args[0];
|
||||||
var parameter2 = model.Args[1];
|
var parameter2 = model.Args[1];
|
||||||
return string.Format(" ({0} like concat('%',{1}))", parameter.MemberName,parameter2.MemberName);
|
return string.Format("({0} like {1} ) ", parameter.MemberName, ( parameter2.MemberValue + "%").ToSqlValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string DateIsSameDay(MethodCallExpressionModel model)
|
public override string DateIsSameDay(MethodCallExpressionModel model)
|
||||||
|
@ -41,7 +41,7 @@ namespace OrmTest
|
|||||||
|
|
||||||
|
|
||||||
//查询子表
|
//查询子表
|
||||||
var dt = db.Ado.GetDataTable("SHOW DATABASES");
|
var dt = db.Ado.GetDataTable("select * from MyTable02 ");
|
||||||
|
|
||||||
|
|
||||||
//插入子表
|
//插入子表
|
||||||
@ -60,14 +60,25 @@ namespace OrmTest
|
|||||||
db.Insertable(new List<MyTable02>() {
|
db.Insertable(new List<MyTable02>() {
|
||||||
new MyTable02()
|
new MyTable02()
|
||||||
{
|
{
|
||||||
ts = DateTime.Now,
|
ts = DateTime.Now.AddDays(-1),
|
||||||
current = Convert.ToSingle(1.1),
|
current = Convert.ToSingle(1.1),
|
||||||
groupId = 1,
|
groupId = 1,
|
||||||
isdelete = true,
|
isdelete = false,
|
||||||
name = "haha",
|
name = "测试1",
|
||||||
location = "aa",
|
location = "false",
|
||||||
phase = Convert.ToSingle(1.1),
|
phase = Convert.ToSingle(1.1),
|
||||||
voltage = 11
|
voltage = 222
|
||||||
|
},
|
||||||
|
new MyTable02()
|
||||||
|
{
|
||||||
|
ts = DateTime.Now.AddDays(-2),
|
||||||
|
current = Convert.ToSingle(1.1),
|
||||||
|
groupId = 1,
|
||||||
|
isdelete = false,
|
||||||
|
name = "测试2",
|
||||||
|
location = "false",
|
||||||
|
phase = Convert.ToSingle(1.1),
|
||||||
|
voltage = 222
|
||||||
},
|
},
|
||||||
new MyTable02()
|
new MyTable02()
|
||||||
{
|
{
|
||||||
@ -75,21 +86,33 @@ namespace OrmTest
|
|||||||
current = Convert.ToSingle(1.1),
|
current = Convert.ToSingle(1.1),
|
||||||
groupId = 1,
|
groupId = 1,
|
||||||
isdelete = true,
|
isdelete = true,
|
||||||
name = "haha",
|
name = "测试3",
|
||||||
location = "aa",
|
location = "true",
|
||||||
phase = Convert.ToSingle(1.1),
|
phase = Convert.ToSingle(1.1),
|
||||||
voltage = 11
|
voltage = 111
|
||||||
}
|
}
|
||||||
}).ExecuteCommand();
|
}).ExecuteCommand();
|
||||||
|
|
||||||
|
|
||||||
//查询子表(主表字段也能查出来)
|
//查询子表(主表字段也能查出来)
|
||||||
var list = db.Queryable<MyTable02>().ToList();
|
var list = db.Queryable<MyTable02>().OrderBy(it=>it.ts).ToList();
|
||||||
|
|
||||||
|
//条件查询
|
||||||
|
var list2 = db.Queryable<MyTable02>().Where(it=>it.voltage==111).ToList();
|
||||||
|
|
||||||
|
|
||||||
|
//模糊查询
|
||||||
|
var list3 = db.Queryable<MyTable02>().Where(it => it.name.Contains("a")).ToList();
|
||||||
|
|
||||||
|
|
||||||
|
//分页
|
||||||
|
var list4 = db.Queryable<MyTable02>().Where(it => it.voltage == 111)
|
||||||
|
.ToPageList(1,2);
|
||||||
|
|
||||||
//删除子表
|
//删除子表
|
||||||
var ts = list.First().ts;
|
var ts = list.First().ts;
|
||||||
var count=db.Deleteable<MyTable02>().Where(it=>it.ts==ts).ExecuteCommand();
|
var de = DateTime.Now.AddYears(-1);
|
||||||
|
var count=db.Deleteable<MyTable02>().Where(it=>it.ts>de).ExecuteCommand();
|
||||||
}
|
}
|
||||||
|
|
||||||
public class MyTable02
|
public class MyTable02
|
||||||
|
Loading…
Reference in New Issue
Block a user