From 357494a28f21c077b2895a9ed5d197c5d6301d35 Mon Sep 17 00:00:00 2001 From: 28810 <28810@YEXIANGQIN> Date: Tue, 18 Dec 2018 20:54:30 +0800 Subject: [PATCH] update --- Docs/delete.md | 14 +- Docs/insert.md | 6 +- Docs/select.md | 155 ++++++++++++++++++++ Docs/update.md | 10 +- FreeSql.Tests/MySql/Curd/MySqlDeleteTest.cs | 2 +- FreeSql/FreeSql.csproj | 4 + readme.md | 78 ++++++++++ 7 files changed, 256 insertions(+), 13 deletions(-) diff --git a/Docs/delete.md b/Docs/delete.md index c12c71c0..31c40d99 100644 --- a/Docs/delete.md +++ b/Docs/delete.md @@ -13,8 +13,10 @@ ### 测试代码 ```csharp -var mysql = new MySql("Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=3"); -IDelete delete => mysql.Delete(); +IFreeSql fsql = new FreeSql.FreeSqlBuilder() + .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10") + .Build(); +IDelete delete => fsql.Delete(); [Table(Name = "tb_topic")] class Topic { @@ -40,16 +42,16 @@ dywhere 支持 * new { id = 1 } ```csharp -var t1 = mysql.Delete(new[] { 1, 2 }).ToSql(); +var t1 = fsql.Delete(new[] { 1, 2 }).ToSql(); //DELETE FROM `tb_topic` WHERE (`Id` = 1 OR `Id` = 2) -var t2 = mysql.Delete(new Topic { Id = 1, Title = "test" }).ToSql(); +var t2 = fsql.Delete(new Topic { Id = 1, Title = "test" }).ToSql(); //DELETE FROM `tb_topic` WHERE (`Id` = 1) -var t3 = mysql.Delete(new[] { new Topic { Id = 1, Title = "test" }, new Topic { Id = 2, Title = "test" } }).ToSql(); +var t3 = fsql.Delete(new[] { new Topic { Id = 1, Title = "test" }, new Topic { Id = 2, Title = "test" } }).ToSql(); //DELETE FROM `tb_topic` WHERE (`Id` = 1 OR `Id` = 2) -var t4 = mysql.Delete(new { id = 1 }).ToSql(); +var t4 = fsql.Delete(new { id = 1 }).ToSql(); //DELETE FROM `tb_topic` WHERE (`Id` = 1) ``` diff --git a/Docs/insert.md b/Docs/insert.md index fc8fff86..c84c5e02 100644 --- a/Docs/insert.md +++ b/Docs/insert.md @@ -17,8 +17,10 @@ ### 测试代码 ```csharp -var mysql = new MySql("Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=3"); -IInsert insert => mysql.Insert(); +IFreeSql fsql = new FreeSql.FreeSqlBuilder() + .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10") + .Build(); +IInsert insert => fsql.Insert(); [Table(Name = "tb_topic")] class Topic { diff --git a/Docs/select.md b/Docs/select.md index 49ca66d4..3416813e 100644 --- a/Docs/select.md +++ b/Docs/select.md @@ -46,3 +46,158 @@ | As | \ | string alias = "a" | 指定别名 | | Master | \ | | 指定从主库查询（默认查询从库） | | Caching | \ | int seconds, string key = null | 缓存查询结果 | + +## 测试代码 + +```csharp +IFreeSql fsql = new FreeSql.FreeSqlBuilder() + .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10") + .Build(); +ISelect select => fsql.Select(); + +[Table(Name = "tb_topic")] +class Topic { + [Column(IsIdentity = true, IsPrimary = true)] + public int Id { get; set; } + public int Clicks { get; set; } + public int TestTypeInfoGuid { get; set; } + public TestTypeInfo Type { get; set; } + public string Title { get; set; } + public DateTime CreateTime { get; set; } +} +class TestTypeInfo { + public int Guid { get; set; } + public int ParentId { get; set; } + public TestTypeParentInfo Parent { get; set; } + public string Name { get; set; } +} +class TestTypeParentInfo { + public int Id { get; set; } + public string Name { get; set; } + + public List Types { get; set; } +} +``` + +# Where + +### 单表 +```csharp +var sql = select.Where(a => a.Id == 10).ToSql(); +///SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 FROM `tb_topic` a WHERE (a.`Id` = 10) + +sql = select.Where(a => a.Id == 10 && a.Id > 10 || a.Clicks > 100).ToSql(); +///SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 FROM `tb_topic` a WHERE (a.`Id` = 10 AND a.`Id` > 10 OR a.`Clicks` > 100) +``` + +### 多表，使用导航属性 +```csharp +sql = select.Where(a => a.Type.Name == "typeTitle" && a.Type.Guid == a.TestTypeInfoGuid).ToSql(); +///SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 FROM `tb_topic` a, `TestTypeInfo` a__Type WHERE (a__Type.`Name` = 'typeTitle' AND a__Type.`Guid` = a.`TestTypeInfoGuid`) + +sql = select.Where(a => a.Type.Parent.Name == "tparent").ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 FROM `tb_topic` a, `TestTypeInfo` a__Type, `TestTypeParentInfo` a__Type__Parent WHERE (a__Type__Parent.`Name` = 'tparent') +``` + +### 多表，没有导航属性 +```csharp +sql = select.Where((a, b) => b.Guid == a.TestTypeInfoGuid && b.Name == "typeTitle").ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, b.`Guid` as4, b.`ParentId` as5, b.`Name` as6, a.`Title` as7, a.`CreateTime` as8 FROM `tb_topic` a, `TestTypeInfo` b WHERE (b.`Guid` = a.`TestTypeInfoGuid` AND b.`Name` = 'typeTitle') + +sql = select.Where((a, b, c) => c.Name == "tparent").ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 FROM `tb_topic` a, `TestTypeParentInfo` c WHERE (c.`Name` = 'tparent') +``` + +### 多表，任意查 +```csharp +sql = select.From((s, b, c) => s + .Where(a => a.Id == 10 && c.Name == "xxx") + .Where(a => b.ParentId == 20)).ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, b.`Guid` as4, b.`ParentId` as5, b.`Name` as6, a.`Title` as7, a.`CreateTime` as8 FROM `tb_topic` a, `TestTypeParentInfo` c, `TestTypeInfo` b WHERE (a.`Id` = 10 AND c.`Name` = 'xxx') AND (b.`ParentId` = 20) +``` + +### 原生SQL +```csharp +sql = select.Where("a.clicks > 100 && a.id = ?id", new { id = 10 }).ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 FROM `tb_topic` a WHERE (a.clicks > 100 && a.id = ?id) +``` + +> 以上条件查询，支持 WhereIf + +# 联表 + +### 使用导航属性联表 +```csharp +sql = select.LeftJoin(a => a.Type.Guid == a.TestTypeInfoGuid).ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 FROM `tb_topic` a LEFT JOIN `TestTypeInfo` a__Type ON a__Type.`Guid` = a.`TestTypeInfoGuid` + +sql = select + .LeftJoin(a => a.Type.Guid == a.TestTypeInfoGuid) + .LeftJoin(a => a.Type.Parent.Id == a.Type.ParentId).ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 FROM `tb_topic` a LEFT JOIN `TestTypeInfo` a__Type ON a__Type.`Guid` = a.`TestTypeInfoGuid` LEFT JOIN `TestTypeParentInfo` a__Type__Parent ON a__Type__Parent.`Id` = a__Type.`ParentId` +``` + +### 没有导航属性联表 +```csharp +sql = select.LeftJoin((a, b) => b.Guid == a.TestTypeInfoGuid).ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, b.`Guid` as4, b.`ParentId` as5, b.`Name` as6, a.`Title` as7, a.`CreateTime` as8 FROM `tb_topic` a LEFT JOIN `TestTypeInfo` b ON b.`Guid` = a.`TestTypeInfoGuid` + +sql = select + .LeftJoin((a, b) => b.Guid == a.TestTypeInfoGuid) + .LeftJoin((a, c) => c.Id == a.Type.ParentId).ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, b.`Guid` as4, b.`ParentId` as5, b.`Name` as6, a.`Title` as7, a.`CreateTime` as8 FROM `tb_topic` a LEFT JOIN `TestTypeInfo` b ON b.`Guid` = a.`TestTypeInfoGuid` LEFT JOIN `TestTypeParentInfo` c ON c.`Id` = b.`ParentId` +``` + +### 联表任意查 +```csharp +sql = select.From((s, b, c) => s + .LeftJoin(a => a.TestTypeInfoGuid == b.Guid) + .LeftJoin(a => b.ParentId == c.Id)).ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, b.`Guid` as4, b.`ParentId` as5, b.`Name` as6, a.`Title` as7, a.`CreateTime` as8 FROM `tb_topic` a LEFT JOIN `TestTypeInfo` b ON a.`TestTypeInfoGuid` = b.`Guid` LEFT JOIN `TestTypeParentInfo` c ON b.`ParentId` = c.`Id` +``` + +### 原生SQL联表 +```csharp +sql = select.LeftJoin("TestTypeInfo b on b.Guid = a.TestTypeInfoGuid and b.Name = ?bname", new { bname = "xxx" }).ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 FROM `tb_topic` a LEFT JOIN TestTypeInfo b on b.Guid = a.TestTypeInfoGuid and b.Name = ?bname +``` + +# 查询数据 + +### 返回 List +```csharp +List t1 = select.Where(a => a.Id > 0).Skip(100).Limit(200).ToList(); +``` + +### 返回 List + 导航属性的数据 +```csharp +List t5 = select.LeftJoin((a, b) => a.TypeGuid == b.Guid && b.Name == "111").ToList(); +//此时会返回普通字段 + 导航对象 Type 的数据 +``` + +### 指定字段返回 +```csharp +//返回一个字段 +List t2 = select.Where(a => a.Id > 0).Skip(100).Limit(200).ToList(a => a.Id); + +//返回匿名类 +List<匿名类> t3 = select.Where(a => a.Id > 0).Skip(100).Limit(200).ToList(a => new { a.Id, a.Title }); + +//返回元组 +List<(int, string)> t4 = select.Where(a => a.Id > 0).Skip(100).Limit(200).ToList<(int, string)>("id, title"); +``` + +### 执行SQL返回数据 +```csharp +class xxx { + public int Id { get; set; } + public string Path { get; set; } + public string Title2 { get; set; } +} + +List t3 = fsql.Ado.Query("select * from song"); +List<(int, string ,string)> t4 = fsql.Ado.Query<(int, string, string)>("select * from song"); +List t5 = fsql.Ado.Query("select * from song"); +``` + +# 更多文档整理中。。。 \ No newline at end of file diff --git a/Docs/update.md b/Docs/update.md index 7ba27d50..dfe3bf0a 100644 --- a/Docs/update.md +++ b/Docs/update.md @@ -32,8 +32,10 @@ class Topic { public DateTime CreateTime { get; set; } } -var mysql = new MySql("Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=3"); -IUpdate update => mysql.Update(); +IFreeSql fsql = new FreeSql.FreeSqlBuilder() + .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10") + .Build(); +IUpdate update => fsql.Update(); ``` ### 动态条件 @@ -50,13 +52,13 @@ dywhere 支持 ### 更新指定列 ```csharp -var t1 = mysql.Update(1).Set(a => a.CreateTime, DateTime.Now).ToSql(); +var t1 = fsql.Update(1).Set(a => a.CreateTime, DateTime.Now).ToSql(); //UPDATE `tb_topic` SET `CreateTime` = '2018-12-08 00:04:59' WHERE (`Id` = 1) ``` ### 更新指定列，累加 ```csharp -var t2 = mysql.Update(1).Set(a => a.Clicks + 1).ToSql(); +var t2 = fsql.Update(1).Set(a => a.Clicks + 1).ToSql(); //UPDATE `tb_topic` SET `Clicks` = ifnull(`Clicks`,0) + 1 WHERE (`Id` = 1) ``` diff --git a/FreeSql.Tests/MySql/Curd/MySqlDeleteTest.cs b/FreeSql.Tests/MySql/Curd/MySqlDeleteTest.cs index 33b4c443..528be337 100644 --- a/FreeSql.Tests/MySql/Curd/MySqlDeleteTest.cs +++ b/FreeSql.Tests/MySql/Curd/MySqlDeleteTest.cs @@ -66,7 +66,7 @@ namespace FreeSql.Tests.MySql { [Fact] public void ExecuteDeleted() { - Assert.Throws(() => delete.Where(a => a.Id > 0).ExecuteDeleted()); + delete.Where(a => a.Id > 0).ExecuteDeleted(); } } } diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj index e4e0aab1..369b5818 100644 --- a/FreeSql/FreeSql.csproj +++ b/FreeSql/FreeSql.csproj @@ -2,6 +2,10 @@ netstandard2.0 + 0.0.0.1 + 0.0.1 + 0.0.0.0 + true diff --git a/readme.md b/readme.md index 8ae33212..d10da12b 100644 --- a/readme.md +++ b/readme.md @@ -8,3 +8,81 @@ * [CodeFirst 快速开发](Docs/codefirst.md) * [DbFirst 快速开发](Docs/dbfirst.md) * [DbFirst 生成器](Docs/generator.md) + +# 查询数据 + +### 返回 List +```csharp +List t1 = select.Where(a => a.Id > 0).Skip(100).Limit(200).ToList(); +``` + +### 返回 List + 导航属性的数据 +```csharp +List t5 = select.LeftJoin((a, b) => a.TypeGuid == b.Guid && b.Name == "111").ToList(); +//此时会返回普通字段 + 导航对象 Type 的数据 +``` + +### 指定字段返回 +```csharp +//返回一个字段 +List t2 = select.Where(a => a.Id > 0).Skip(100).Limit(200).ToList(a => a.Id); + +//返回匿名类 +List<匿名类> t3 = select.Where(a => a.Id > 0).Skip(100).Limit(200).ToList(a => new { a.Id, a.Title }); + +//返回元组 +List<(int, string)> t4 = select.Where(a => a.Id > 0).Skip(100).Limit(200).ToList<(int, string)>("id, title"); +``` + +### 执行SQL返回数据 +```csharp +class xxx { + public int Id { get; set; } + public string Path { get; set; } + public string Title2 { get; set; } +} + +List t3 = fsql.Ado.Query("select * from song"); +List<(int, string ,string)> t4 = fsql.Ado.Query<(int, string, string)>("select * from song"); +List t5 = fsql.Ado.Query("select * from song"); +``` + +# 联表 + +### 使用导航属性联表 +```csharp +sql = select.LeftJoin(a => a.Type.Guid == a.TestTypeInfoGuid).ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 FROM `tb_topic` a LEFT JOIN `TestTypeInfo` a__Type ON a__Type.`Guid` = a.`TestTypeInfoGuid` + +sql = select + .LeftJoin(a => a.Type.Guid == a.TestTypeInfoGuid) + .LeftJoin(a => a.Type.Parent.Id == a.Type.ParentId).ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 FROM `tb_topic` a LEFT JOIN `TestTypeInfo` a__Type ON a__Type.`Guid` = a.`TestTypeInfoGuid` LEFT JOIN `TestTypeParentInfo` a__Type__Parent ON a__Type__Parent.`Id` = a__Type.`ParentId` +``` + +### 没有导航属性联表 +```csharp +sql = select.LeftJoin((a, b) => b.Guid == a.TestTypeInfoGuid).ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, b.`Guid` as4, b.`ParentId` as5, b.`Name` as6, a.`Title` as7, a.`CreateTime` as8 FROM `tb_topic` a LEFT JOIN `TestTypeInfo` b ON b.`Guid` = a.`TestTypeInfoGuid` + +sql = select + .LeftJoin((a, b) => b.Guid == a.TestTypeInfoGuid) + .LeftJoin((a, c) => c.Id == a.Type.ParentId).ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, b.`Guid` as4, b.`ParentId` as5, b.`Name` as6, a.`Title` as7, a.`CreateTime` as8 FROM `tb_topic` a LEFT JOIN `TestTypeInfo` b ON b.`Guid` = a.`TestTypeInfoGuid` LEFT JOIN `TestTypeParentInfo` c ON c.`Id` = b.`ParentId` +``` + +### 联表任意查 +```csharp +sql = select.From((s, b, c) => s + .LeftJoin(a => a.TestTypeInfoGuid == b.Guid) + .LeftJoin(a => b.ParentId == c.Id)).ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, b.`Guid` as4, b.`ParentId` as5, b.`Name` as6, a.`Title` as7, a.`CreateTime` as8 FROM `tb_topic` a LEFT JOIN `TestTypeInfo` b ON a.`TestTypeInfoGuid` = b.`Guid` LEFT JOIN `TestTypeParentInfo` c ON b.`ParentId` = c.`Id` +``` + +### 原生SQL联表 +```csharp +sql = select.LeftJoin("TestTypeInfo b on b.Guid = a.TestTypeInfoGuid and b.Name = ?bname", new { bname = "xxx" }).ToSql(); +//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 FROM `tb_topic` a LEFT JOIN TestTypeInfo b on b.Guid = a.TestTypeInfoGuid and b.Name = ?bname +``` + +# 更多文档整理中。。。 \ No newline at end of file