diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index 743835e4..5a0c8bd0 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -130,13 +130,6 @@ 清空状态数据 - - - 根据 lambda 条件删除数据 - - - - 添加 @@ -532,14 +525,5 @@ - - - 批量注入 Repository,可以参考代码自行调整 - - - - - - diff --git a/FreeSql.Tests/FreeSql.Tests/Dameng/DamengCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests/Dameng/DamengCodeFirstTest.cs index de3a6c69..a53525b3 100644 --- a/FreeSql.Tests/FreeSql.Tests/Dameng/DamengCodeFirstTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/Dameng/DamengCodeFirstTest.cs @@ -3,6 +3,7 @@ using Newtonsoft.Json; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using System.Data; using System.Linq; using System.Text; using Xunit; @@ -11,6 +12,45 @@ namespace FreeSql.Tests.Dameng { public class DamengCodeFirstTest { + [Fact] + public void StringLength36() + { + using (var conn = g.dameng.Ado.MasterPool.Get()) + { + var cmd = conn.Value.CreateCommand(); + cmd.CommandText = @"SELECT a.""ID"", a.""CREATORID"" +FROM ""TS_SL361"" a +WHERE (a.""ID"" = 1) AND ROWNUM < 2"; + using (var dr = cmd.ExecuteReader()) + { + if (dr.Read()) + { + var id1 = dr.GetInt64(0); + var creatorId1 = dr.GetString(1); + + var id = dr.GetValue(0); + //var creatorId = dr.GetValue(1); // + } + } + } + + //var repo = g.dameng.GetRepository(); + + //var item1 = new TS_SL361 { CreatorId = "xxx '123 " }; + //repo.Insert(item1); + //var item2 = repo.Get(item1.Id); + + //Assert.Equal(item1.CreatorId, item2.CreatorId); + } + class TS_SL361 + { + [Column(IsIdentity = true)] + public long Id { get; set; } + [Column(StringLength = 36)] + public string CreatorId { get; set; } + } + + [Fact] public void Text_StringLength_1() { diff --git a/FreeSql.Tests/FreeSql.Tests/Oracle/OracleCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests/Oracle/OracleCodeFirstTest.cs index bdf17b8d..8faf37e7 100644 --- a/FreeSql.Tests/FreeSql.Tests/Oracle/OracleCodeFirstTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/Oracle/OracleCodeFirstTest.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using System.Security.Cryptography.X509Certificates; using System.Text; using Xunit; @@ -12,6 +13,25 @@ namespace FreeSql.Tests.Oracle { public class OracleCodeFirstTest { + [Fact] + public void StringLength36() + { + var repo = g.oracle.GetRepository(); + + var item1 = new TS_SL361 { CreatorId = "xxx '123 " }; + repo.Insert(item1); + var item2 = repo.Get(item1.Id); + + Assert.Equal(item1.CreatorId, item2.CreatorId); + } + class TS_SL361 + { + [Column(IsIdentity = true)] + public long Id { get; set; } + [Column(StringLength = 36)] + public string CreatorId { get; set; } + } + [Fact] public void NClob_StringLength_1() { diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml index 4f53ec7b..1426df9f 100644 --- a/FreeSql/FreeSql.xml +++ b/FreeSql/FreeSql.xml @@ -2613,145 +2613,6 @@ - - - 查询,若使用读写分离,查询【从库】条件cmdText.StartsWith("SELECT "),否则查询【主库】 - - - - - - - - - 查询,ExecuteReaderAsync(dr => {}, "select * from user where age > ?age", new { age = 25 }) - 提示:parms 参数还可以传 Dictionary<string, object> - - - - - - - 查询 - - - - - - - 查询,ExecuteArrayAsync("select * from user where age > ?age", new { age = 25 }) - 提示:parms 参数还可以传 Dictionary<string, object> - - - - - - - - 查询 - - - - - - - 查询,ExecuteDataSetAsync("select * from user where age > ?age; select 2", new { age = 25 }) - 提示:parms 参数还可以传 Dictionary<string, object> - - - - - - - - 查询 - - - - - - - 查询,ExecuteDataTableAsync("select * from user where age > ?age", new { age = 25 }) - 提示:parms 参数还可以传 Dictionary<string, object> - - - - - - - - 在【主库】执行 - - - - - - - - 在【主库】执行,ExecuteNonQueryAsync("delete from user where age > ?age", new { age = 25 }) - 提示:parms 参数还可以传 Dictionary<string, object> - - - - - - - - 在【主库】执行 - - - - - - - - 在【主库】执行,ExecuteScalarAsync("select 1 from user where age > ?age", new { age = 25 }) - 提示:parms 参数还可以传 Dictionary<string, object> - - - - - - - - 执行SQL返回对象集合,QueryAsync<User>("select * from user where age > ?age", new SqlParameter { ParameterName = "age", Value = 25 }) - - - - - - - - - - 执行SQL返回对象集合,QueryAsync<User>("select * from user where age > ?age", new { age = 25 }) - 提示:parms 参数还可以传 Dictionary<string, object> - - - - - - - - - 执行SQL返回对象集合,Query<User>("select * from user where age > ?age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 }) - - - - - - - - - - 执行SQL返回对象集合,Query<User, Address>("select * from user where age > ?age; select * from address", new { age = 25 }) - 提示:parms 参数还可以传 Dictionary<string, object> - - - - - - 可自定义解析表达式 @@ -3488,12 +3349,6 @@ 超时 - - - 获取资源 - - - 使用完毕后,归还资源 @@ -3564,12 +3419,6 @@ 资源对象 - - - 从对象池获取对象成功的时候触发,通过该方法统计或初始化对象 - - 资源对象 - 归还对象给对象池的时候触发