tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-19 20:38:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

## v0.3.25

Browse Source 
- 修复 全局过滤器一个赋值低级错误；
- 增加 IFreeSql<TMark> 空接口，现实多个 IFreeSql 注入使用，使用泛型标识区分；
This commit is contained in:
2881099
2019-03-23 02:11:18 +08:00
parent 07d0de8093
commit bf72bf423c
17 changed files with 71 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FreeSql/FreeSql.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>0.3.24</Version>
<Version>0.3.25</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>YeXiangQin</Authors>
<Description>FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle and Sqlite.</Description>

15
FreeSql/FreeSqlBuilder.cs
View File

@ -124,14 +124,15 @@ namespace FreeSql {
return this;
}
public IFreeSql Build() {
IFreeSql ret = null;
public IFreeSql Build() => Build<IFreeSql>();
public IFreeSql<TMark> Build<TMark>() {
IFreeSql<TMark> ret = null;
switch(_dataType) {
case DataType.MySql: ret = new MySql.MySqlProvider(_cache, _logger, _masterConnectionString, _slaveConnectionString); break;
case DataType.SqlServer: ret = new SqlServer.SqlServerProvider(_cache, _logger, _masterConnectionString, _slaveConnectionString); break;
case DataType.PostgreSQL: ret = new PostgreSQL.PostgreSQLProvider(_cache, _logger, _masterConnectionString, _slaveConnectionString); break;
case DataType.Oracle: ret = new Oracle.OracleProvider(_cache, _logger, _masterConnectionString, _slaveConnectionString); break;
case DataType.Sqlite: ret = new Sqlite.SqliteProvider(_cache, _logger, _masterConnectionString, _slaveConnectionString); break;
case DataType.MySql: ret = new MySql.MySqlProvider<TMark>(_cache, _logger, _masterConnectionString, _slaveConnectionString); break;
case DataType.SqlServer: ret = new SqlServer.SqlServerProvider<TMark>(_cache, _logger, _masterConnectionString, _slaveConnectionString); break;
case DataType.PostgreSQL: ret = new PostgreSQL.PostgreSQLProvider<TMark>(_cache, _logger, _masterConnectionString, _slaveConnectionString); break;
case DataType.Oracle: ret = new Oracle.OracleProvider<TMark>(_cache, _logger, _masterConnectionString, _slaveConnectionString); break;
case DataType.Sqlite: ret = new Sqlite.SqliteProvider<TMark>(_cache, _logger, _masterConnectionString, _slaveConnectionString); break;
}
if (ret != null) {
ret.CodeFirst.IsAutoSyncStructure = _isAutoSyncStructure;

4
FreeSql/Interface/IFreeSql.cs
View File

@ -1,8 +1,8 @@
using FreeSql;
using System;
using System.Collections.Generic;
using System.Data;
using System.Text;
public interface IFreeSql<TMark> : IFreeSql { }
public interface IFreeSql {
/// <summary>

2
FreeSql/MySql/MySqlProvider.cs
View File

@ -10,7 +10,7 @@ using System.Data.Common;
namespace FreeSql.MySql {
class MySqlProvider : IFreeSql {
class MySqlProvider<TMark> : IFreeSql<TMark> {
static MySqlProvider() {
Utils.dicExecuteArrayRowReadClassOrTuple.Add(typeof(MygisPoint), true);

2
FreeSql/Oracle/OracleProvider.cs
View File

@ -10,7 +10,7 @@ using System.Data.Common;
namespace FreeSql.Oracle {
class OracleProvider : IFreeSql {
class OracleProvider<TMark> : IFreeSql<TMark> {
public ISelect<T1> Select<T1>() where T1 : class => new OracleSelect<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, null);
public ISelect<T1> Select<T1>(object dywhere) where T1 : class => new OracleSelect<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, dywhere);

2
FreeSql/PostgreSQL/PostgreSQLProvider.cs
View File

@ -16,7 +16,7 @@ using System.Net.NetworkInformation;
namespace FreeSql.PostgreSQL {
class PostgreSQLProvider : IFreeSql {
class PostgreSQLProvider<TMark> : IFreeSql<TMark> {
static PostgreSQLProvider() {
Utils.dicExecuteArrayRowReadClassOrTuple.Add(typeof(BitArray), true);

2
FreeSql/SqlServer/SqlServerProvider.cs
View File

@ -9,7 +9,7 @@ using System.Collections.Generic;
namespace FreeSql.SqlServer {
class SqlServerProvider : IFreeSql {
class SqlServerProvider<TMark> : IFreeSql<TMark> {
public ISelect<T1> Select<T1>() where T1 : class => new SqlServerSelect<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, null);
public ISelect<T1> Select<T1>(object dywhere) where T1 : class => new SqlServerSelect<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, dywhere);

2
FreeSql/Sqlite/SqliteProvider.cs
View File

@ -10,7 +10,7 @@ using System.Data.Common;
namespace FreeSql.Sqlite {
class SqliteProvider : IFreeSql {
class SqliteProvider<TMark> : IFreeSql<TMark> {
public ISelect<T1> Select<T1>() where T1 : class => new SqliteSelect<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, null);
public ISelect<T1> Select<T1>(object dywhere) where T1 : class => new SqliteSelect<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, dywhere);