tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 10:42:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

update kingbaseES

Browse Source
This commit is contained in:
28810 2020-05-31 10:42:26 +08:00
parent 6f53658dde
commit 909fe9bc7a
8 changed files with 19 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Examples/repository_01/Controllers/SongController.cs
View File

@ -1,5 +1,6 @@
using FreeSql; using FreeSql;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using repository_01;
using restful.Entitys; using restful.Entitys;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -32,32 +33,24 @@ namespace restful.Controllers
public SongsController(IFreeSql fsql, public SongsController(IFreeSql fsql,
GuidRepository<Song> repos1,
GuidRepository<xxxx> repos2,
DefaultRepository<Song, int> repos11,
DefaultRepository<xxxx, int> repos21,
BaseRepository<Song> repos3, BaseRepository<Song, int> repos4, BaseRepository<Song> repos3, BaseRepository<Song, int> repos4,
IBaseRepository<Song> repos31, IBaseRepository<Song, int> repos41, IBaseRepository<Song> repos31, IBaseRepository<Song, int> repos41,
SongRepository reposSong SongRepository reposSong,
IBaseRepository<TestSoftDelete> reposTest
) )
{ {
_songRepository = repos4; Console.Write(reposTest.Select.ToSql());
_songRepository = repos4;
//test code //test code
var curd1 = fsql.GetRepository<Song, int>(); var curd1 = fsql.GetRepository<Song, int>();
var curd2 = fsql.GetRepository<Song, string>(); var curd2 = fsql.GetRepository<Song, string>();
var curd3 = fsql.GetRepository<Song, Guid>(); var curd3 = fsql.GetRepository<Song, Guid>();
var curd4 = fsql.GetGuidRepository<Song>(); var curd4 = fsql.GetGuidRepository<Song>();
Console.WriteLine(repos1.Select.ToSql());
Console.WriteLine(reposSong.Select.ToSql()); Console.WriteLine(reposSong.Select.ToSql());
Console.WriteLine(repos2.Select.ToSql());
Console.WriteLine(repos21.Select.ToSql());
using (reposSong.DataFilter.DisableAll()) using (reposSong.DataFilter.DisableAll())
{ {
Console.WriteLine(reposSong.Select.ToSql()); Console.WriteLine(reposSong.Select.ToSql());

8
Examples/repository_01/Startup.cs
View File

@ -84,4 +84,12 @@ namespace repository_01
{ {
bool IsDeleted { get; set; } bool IsDeleted { get; set; }
} }
public class TestSoftDelete : ISoftDelete
{
[Column(IsIdentity = true)]
public int Id { get; set; }
public string Title { get; set; }
public bool IsDeleted { get; set; }
}
} }

1
FreeSql.DbContext/DbSet/DbSet.cs
View File

@ -276,6 +276,7 @@ namespace FreeSql
case DataType.OdbcSqlServer: case DataType.OdbcSqlServer:
case DataType.PostgreSQL: case DataType.PostgreSQL:
case DataType.OdbcPostgreSQL: case DataType.OdbcPostgreSQL:
case DataType.OdbcKingbaseES:
return true; return true;
default: default:
if (_tableIdentitys.Length == 1 && _table.Primarys.Length == 1) if (_tableIdentitys.Length == 1 && _table.Primarys.Length == 1)

2
FreeSql.DbContext/DbSet/DbSetAsync.cs
View File

@ -41,6 +41,7 @@ namespace FreeSql
case DataType.OdbcSqlServer: case DataType.OdbcSqlServer:
case DataType.PostgreSQL: case DataType.PostgreSQL:
case DataType.OdbcPostgreSQL: case DataType.OdbcPostgreSQL:
case DataType.OdbcKingbaseES:
if (_tableIdentitys.Length == 1 && _table.Primarys.Length == 1) if (_tableIdentitys.Length == 1 && _table.Primarys.Length == 1)
{ {
await DbContextFlushCommandAsync(); await DbContextFlushCommandAsync();
@ -102,6 +103,7 @@ namespace FreeSql
case DataType.OdbcSqlServer: case DataType.OdbcSqlServer:
case DataType.PostgreSQL: case DataType.PostgreSQL:
case DataType.OdbcPostgreSQL: case DataType.OdbcPostgreSQL:
case DataType.OdbcKingbaseES:
await DbContextFlushCommandAsync(); await DbContextFlushCommandAsync();
var rets = await this.OrmInsert(data).ExecuteInsertedAsync(); var rets = await this.OrmInsert(data).ExecuteInsertedAsync();
if (rets.Count != data.Count()) throw new Exception($"特别错误：批量添加失败，{_db.OrmOriginal.Ado.DataType} 的返回数据，与添加的数目不匹配"); if (rets.Count != data.Count()) throw new Exception($"特别错误：批量添加失败，{_db.OrmOriginal.Ado.DataType} 的返回数据，与添加的数目不匹配");

2
FreeSql.DbContext/DbSet/DbSetSync.cs
View File

@ -40,6 +40,7 @@ namespace FreeSql
case DataType.OdbcSqlServer: case DataType.OdbcSqlServer:
case DataType.PostgreSQL: case DataType.PostgreSQL:
case DataType.OdbcPostgreSQL: case DataType.OdbcPostgreSQL:
case DataType.OdbcKingbaseES:
if (_tableIdentitys.Length == 1) if (_tableIdentitys.Length == 1)
{ {
DbContextFlushCommand(); DbContextFlushCommand();
@ -105,6 +106,7 @@ namespace FreeSql
case DataType.OdbcSqlServer: case DataType.OdbcSqlServer:
case DataType.PostgreSQL: case DataType.PostgreSQL:
case DataType.OdbcPostgreSQL: case DataType.OdbcPostgreSQL:
case DataType.OdbcKingbaseES:
DbContextFlushCommand(); DbContextFlushCommand();
var rets = this.OrmInsert(data).ExecuteInserted(); var rets = this.OrmInsert(data).ExecuteInserted();
if (rets.Count != data.Count()) throw new Exception($"特别错误：批量添加失败，{_db.OrmOriginal.Ado.DataType} 的返回数据，与添加的数目不匹配"); if (rets.Count != data.Count()) throw new Exception($"特别错误：批量添加失败，{_db.OrmOriginal.Ado.DataType} 的返回数据，与添加的数目不匹配");

16
FreeSql.DbContext/FreeSql.DbContext.xml
View File

@ -125,13 +125,6 @@
清空状态数据 清空状态数据
</summary> </summary>
</member> </member>
<member name="M:FreeSql.DbSet`1.RemoveAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}})">
<summary>
根据 lambda 条件删除数据
</summary>
<param name="predicate"></param>
<returns></returns>
</member>
<member name="M:FreeSql.DbSet`1.Add(`0)"> <member name="M:FreeSql.DbSet`1.Add(`0)">
<summary> <summary>
添加 添加
@ -486,14 +479,5 @@
<param name="that"></param> <param name="that"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
<summary>
批量注入 Repository，可以参考代码自行调整
</summary>
<param name="services"></param>
<param name="globalDataFilter"></param>
<param name="assemblies"></param>
<returns></returns>
</member>
</members> </members>
</doc> </doc>

143
FreeSql/FreeSql.xml
View File

@ -2411,137 +2411,6 @@
<param name="parms"></param> <param name="parms"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{System.Data.Common.DbDataReader,System.Threading.Tasks.Task},System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】
</summary>
<param name="readerHander"></param>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{System.Data.Common.DbDataReader,System.Threading.Tasks.Task},System.String,System.Object)">
<summary>
查询，ExecuteReaderAsync(dr => {}, "select * from user where age > ?age", new { age = 25 })
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
查询
</summary>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.String,System.Object)">
<summary>
查询，ExecuteArrayAsync("select * from user where age > ?age", new { age = 25 })
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
查询
</summary>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.String,System.Object)">
<summary>
查询，ExecuteDataSetAsync("select * from user where age > ?age; select 2", new { age = 25 })
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
查询
</summary>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.String,System.Object)">
<summary>
查询，ExecuteDataTableAsync("select * from user where age > ?age", new { age = 25 })
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
在【主库】执行
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.String,System.Object)">
<summary>
在【主库】执行，ExecuteNonQueryAsync("delete from user where age > ?age", new { age = 25 })
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
在【主库】执行
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.String,System.Object)">
<summary>
在【主库】执行，ExecuteScalarAsync("select 1 from user where age > ?age", new { age = 25 })
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``1(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > ?age", new SqlParameter { ParameterName = "age", Value = 25 })
</summary>
<typeparam name="T"></typeparam>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``1(System.String,System.Object)">
<summary>
执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > ?age", new { age = 25 })
</summary>
<typeparam name="T"></typeparam>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``2(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > ?age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 })
</summary>
<typeparam name="T1"></typeparam>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``2(System.String,System.Object)">
<summary>
执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > ?age; select * from address", new { age = 25 })
</summary>
<typeparam name="T1"></typeparam>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="E:FreeSql.IAop.ParseExpression"> <member name="E:FreeSql.IAop.ParseExpression">
<summary> <summary>
可自定义解析表达式 可自定义解析表达式
@ -3144,12 +3013,6 @@
<param name="timeout">超时</param> <param name="timeout">超时</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.GetAsync">
<summary>
获取资源
</summary>
<returns></returns>
</member>
<member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.Return(FreeSql.Internal.ObjectPool.Object{`0},System.Boolean)"> <member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.Return(FreeSql.Internal.ObjectPool.Object{`0},System.Boolean)">
<summary> <summary>
使用完毕后，归还资源 使用完毕后，归还资源
@ -3220,12 +3083,6 @@
</summary> </summary>
<param name="obj">资源对象</param> <param name="obj">资源对象</param>
</member> </member>
<member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnGetAsync(FreeSql.Internal.ObjectPool.Object{`0})">
<summary>
从对象池获取对象成功的时候触发，通过该方法统计或初始化对象
</summary>
<param name="obj">资源对象</param>
</member>
<member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnReturn(FreeSql.Internal.ObjectPool.Object{`0})"> <member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnReturn(FreeSql.Internal.ObjectPool.Object{`0})">
<summary> <summary>
归还对象给对象池的时候触发 归还对象给对象池的时候触发

1
FreeSql/Internal/UtilsExpressionTree.cs
View File

@ -242,6 +242,7 @@ namespace FreeSql.Internal
break; break;
case DataType.PostgreSQL: case DataType.PostgreSQL:
case DataType.OdbcPostgreSQL: case DataType.OdbcPostgreSQL:
case DataType.OdbcKingbaseES:
if (strlen < 0) colattr.DbType = "TEXT"; if (strlen < 0) colattr.DbType = "TEXT";
else colattr.DbType = Regex.Replace(colattr.DbType, charPatten, $"$1({strlen})"); else colattr.DbType = Regex.Replace(colattr.DbType, charPatten, $"$1({strlen})");
break; break;