v0.10.7, - 调整 Insert<T1>(IEnumerable<T1> source) 参数类型改成了 List;

This commit is contained in:
28810
2019-10-06 12:32:32 +08:00
parent 78fded3f8e
commit 2b72c849d9
31 changed files with 186 additions and 28 deletions

View File

@ -77,8 +77,8 @@ namespace FreeSql.Tests.Odbc.SqlServer
var item = g.sqlserver.Insert<Topic>(new Topic { Title = "xxxx", CreateTime = DateTime.Now }).ExecuteInserted();
Assert.Equal(item[0].Id, delete.Where(a => a.Id == item[0].Id).ExecuteDeleted()[0].Id);
var items = Enumerable.Range(0, 301).Select(a => new Topic { Title = "xxxx" + a, CreateTime = DateTime.Now });
var itemsInserted = g.sqlserver.Insert<Topic>(items).ExecuteInserted();
var items = Enumerable.Range(0, 301).Select(a => new Topic { Title = "xxxx" + a, CreateTime = DateTime.Now }).ToArray();
var itemsInserted = g.sqlserver.Insert(items).ExecuteInserted();
Assert.Equal(items.First().Title, itemsInserted[0].Title);
Assert.Equal(itemsInserted[0].Id, delete.Where(a => a.Id == itemsInserted[0].Id).ExecuteDeleted()[0].Id);

View File

@ -199,6 +199,36 @@
创建日期
</summary>
</member>
<member name="T:SaleIDO.Entity.Storeage.AdjustPriceOrder">
<summary>
调价单
</summary>
</member>
<member name="T:SaleIDO.Entity.Storeage.AdjustPriceDetail">
<summary>
调价单产品明细
</summary>
</member>
<member name="P:SaleIDO.Entity.Storeage.AdjustPriceDetail.OldLabelPrice">
<summary>
原标签价
</summary>
</member>
<member name="P:SaleIDO.Entity.Storeage.AdjustPriceDetail.NewMarketCostPrice">
<summary>
新的市场成本价
</summary>
</member>
<member name="P:SaleIDO.Entity.Storeage.AdjustPriceDetail.NewLabelPriceRate">
<summary>
新的标签价倍率
</summary>
</member>
<member name="P:SaleIDO.Entity.Storeage.AdjustPriceDetail.NewLabelPrice">
<summary>
新标签价
</summary>
</member>
<member name="T:Zeus.Utility.Entity.EntityBase`1">
<summary>
实体类基类

View File

@ -0,0 +1,86 @@
using FreeSql.DataAnnotations;
using System;
namespace SaleIDO.Entity.Storeage
{
public class BaseEntity
{
[Column(IsIdentity = true, IsPrimary = true)]
public int Id { get; set; }
}
/// <summary>
/// 调价单
/// </summary>
[Table(Name = "jxc_AdjustPriceOrder")]
public class AdjustPriceOrder : BaseEntity
{
public AdjustPriceOrder()
{
OrderStatus = 0;
}
public string OrderSn { get; set; }
public DateTime AdjustTime { get; set; }
public string Handler { get; set; }
public string StoreCode { get; set; }
public int GoodsNum { get; set; }
public string Remark { get; set; }
public DateTime? CheckTime { get; set; }
public string CheckMan { get; set; }
public string CheckRemark { get; set; }
public int OrderStatus { get; set; }
}
/// <summary>
/// 调价单产品明细
/// </summary>
[Table(Name = "jxc_AdjustPriceDetail")]
public class AdjustPriceDetail : BaseEntity
{
public string OrderSn { get; set; }
public string Barcode { get; set; }
public string GoodsName { get; set; }
public decimal GoodsWeight { get; set; }
public decimal CostPrice { get; set; }
public decimal MarketCostPrice { get; set; }
/// <summary>
/// 原标签价
/// </summary>
public decimal OldLabelPrice { get; set; }
/// <summary>
/// 新的市场成本价
/// </summary>
public decimal NewMarketCostPrice { get; set; }
/// <summary>
/// 新的标签价倍率
/// </summary>
public decimal NewLabelPriceRate { get; set; }
/// <summary>
/// 新标签价
/// </summary>
public decimal NewLabelPrice { get; set; }
public string Remark { get; set; }
}
}

View File

@ -85,7 +85,7 @@ namespace FreeSql.Tests.SqlServer
var item = _sqlserverFixture.SqlServer.Insert<Topic>(new Topic { Title = "xxxx", CreateTime = DateTime.Now }).ExecuteInserted();
Assert.Equal(item[0].Id, delete.Where(a => a.Id == item[0].Id).ExecuteDeleted()[0].Id);
var items = Enumerable.Range(0, 301).Select(a => new Topic { Title = "xxxx" + a, CreateTime = DateTime.Now });
var items = Enumerable.Range(0, 301).Select(a => new Topic { Title = "xxxx" + a, CreateTime = DateTime.Now }).ToArray();
var itemsInserted = _sqlserverFixture.SqlServer.Insert<Topic>(items).ExecuteInserted();
Assert.Equal(items.First().Title, itemsInserted[0].Title);

View File

@ -1,5 +1,6 @@
using FreeSql.DataAnnotations;
using FreeSql.Tests.DataContext.SqlServer;
using SaleIDO.Entity.Storeage;
using System;
using System.Collections.Generic;
using System.Linq;
@ -101,6 +102,41 @@ namespace FreeSql.Tests.SqlServer
//items = Enumerable.Range(0, 9989).Select(a => new Topic { Title = "newtitle" + a, CreateTime = DateTime.Now }).ToList();
//Assert.Equal(9989, _sqlserverFixture.SqlServer.Insert<Topic>(items).ExecuteAffrows());
//var bttype = new TestBetchInsertType { title = "testbttitle1" };
//bttype.id = (int)_sqlserverFixture.SqlServer.Insert(bttype).ExecuteIdentity();
//Assert.True(bttype.id > 0);
//var bttopic = Enumerable.Range(0, 10000).Select(a => new TestBetchInsertTopic { TypeId = bttype.id, Text = $"testtopic{a}" }).ToArray();
//Assert.Equal(bttopic.Length, _sqlserverFixture.SqlServer.Insert<TestBetchInsertTopic>(bttopic).ExecuteAffrows());
//_sqlserverFixture.SqlServer.Transaction(() =>
//{
// bttype = new TestBetchInsertType { title = "transaction_testbttitle2" };
// bttype.id = (int)_sqlserverFixture.SqlServer.Insert(bttype).ExecuteIdentity();
// Assert.True(bttype.id > 0);
// bttopic = Enumerable.Range(0, 10000).Select(a => new TestBetchInsertTopic { TypeId = bttype.id, Text = $"transaction_testtopic{a}" }).ToArray();
// Assert.Equal(bttopic.Length, _sqlserverFixture.SqlServer.Insert<TestBetchInsertTopic>(bttopic).ExecuteAffrows());
//});
_sqlserverFixture.SqlServer.Transaction(() =>
{
var order = new AdjustPriceOrder { };
order.Id = (int)_sqlserverFixture.SqlServer.Insert(order).NoneParameter().ExecuteIdentity();
Assert.True(order.Id > 0);
var detail = Enumerable.Range(0, 10000).Select(a => new AdjustPriceDetail { Remark = $"transaction_testdetail{a}" }).ToArray();
Assert.Equal(detail.Length, _sqlserverFixture.SqlServer.Insert<AdjustPriceDetail>(detail).NoneParameter().ExecuteAffrows());
});
}
class TestBetchInsertType {
[Column(IsIdentity = true)]
public int id { get; set; }
public string title { get; set; }
}
class TestBetchInsertTopic
{
public Guid id { get; set; }
public int TypeId { get; set; }
public string Text { get; set; }
}
[Fact]
public void ExecuteIdentity()

View File

@ -407,6 +407,12 @@ namespace FreeSql.Tests
[Fact]
public void Test1()
{
var testlistinsert = new List<AuthorTest>();
g.sqlite.Insert(testlistinsert).ExecuteAffrows();
var gkjdjd = g.sqlite.Select<AuthorTest>().Where(a => a.Post.AsSelect().Count() > 0).ToList();
var testrunsql1 = g.mysql.Select<TaskBuild>().Where(a => a.OptionsEntity04 > DateTime.Now.AddDays(0).ToString("yyyyMMdd").TryTo<int>()).ToSql();