diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Lib/SqlSugar.dll b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Lib/SqlSugar.dll new file mode 100644 index 000000000..50141ebd9 Binary files /dev/null and b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Lib/SqlSugar.dll differ diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/DbBind/MySqlDbBind.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/DbBind/MySqlDbBind.cs deleted file mode 100644 index 38280740a..000000000 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/DbBind/MySqlDbBind.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace SqlSugar -{ - public class MySqlDbBind : DbBindProvider - { - public override List> MappingTypes - { - get - { - throw new NotImplementedException(); - } - } - } -} diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/DbType.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/DbType.cs deleted file mode 100644 index 661f67479..000000000 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/DbType.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace SqlSugar.Realization.MySql -{ - public partial class DbType - { - public const string MySql = "MySql"; - } -} diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/MySqlProvider.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/MySqlProvider.cs deleted file mode 100644 index 39ebf7e6a..000000000 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/MySqlProvider.cs +++ /dev/null @@ -1,95 +0,0 @@ -//using System; -//using System.Data; -//using System.Data.SqlClient; -//using MySql.Data.MySqlClient; - -//namespace SqlSugar -//{ -// public class MySqlProvider : AdoProvider -// { -// public MySqlProvider() {} -// public override IDbConnection Connection -// { -// get -// { -// if (base._DbConnection == null) -// { -// base._DbConnection = new MySqlConnection(base.Context.CurrentConnectionConfig.ConnectionString); -// } -// return base._DbConnection; -// } -// set -// { -// base._DbConnection = value; -// } -// } -// /// -// /// Only SqlServer -// /// -// /// -// public override void BeginTran(string transactionName) -// { -// throw new NotImplementedException(); -// } -// /// -// /// Only SqlServer -// /// -// /// -// /// -// public override void BeginTran(IsolationLevel iso, string transactionName) -// { -// throw new NotImplementedException(); -// } -// public override IDataAdapter GetAdapter() -// { -// return new MySqlDataAdapter(); -// } -// public override IDbCommand GetCommand(string sql, SugarParameter[] parameters) -// { -// MySqlCommand sqlCommand = new MySqlCommand(sql, (MySqlConnection)this.Connection); -// sqlCommand.CommandType = this.CommandType; -// sqlCommand.CommandTimeout = this.CommandTimeOut; -// if (this.Transaction != null) -// { -// sqlCommand.Transaction = (MySqlTransaction)this.Transaction; -// } -// if (parameters.IsValuable()) -// { -// IDataParameter[] ipars= ToIDbDataParameter(parameters); -// sqlCommand.Parameters.AddRange((SqlParameter[])ipars); -// } -// CheckConnection(); -// return sqlCommand; -// } -// public override void SetCommandToAdapter(IDataAdapter dataAdapter, IDbCommand command) -// { -// ((MySqlDataAdapter)dataAdapter).SelectCommand = (MySqlCommand)command; -// } -// /// -// /// if mysql return MySqlParameter[] pars -// /// if sqlerver return SqlParameter[] pars ... -// /// -// /// -// /// -// public override IDataParameter[] ToIDbDataParameter(params SugarParameter[] parameters) -// { -// if (parameters == null || parameters.Length == 0) return null; -// SqlParameter[] result = new SqlParameter[parameters.Length]; -// int i = 0; -// foreach (var paramter in parameters) -// { -// if (paramter.Value == null) paramter.Value = DBNull.Value; -// var p = new SqlParameter(); -// p.ParameterName = paramter.ParameterName; -// p.UdtTypeName = paramter.UdtTypeName; -// p.Size = paramter.Size; -// p.Value = paramter.Value; -// p.DbType = paramter.DbType; -// p.Direction = paramter.Direction; -// result[i] =p; -// ++i; -// } -// return result; -// } -// } -//} diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/Queryable/MySqlQueryable.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/Queryable/MySqlQueryable.cs deleted file mode 100644 index fc86019f8..000000000 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/Queryable/MySqlQueryable.cs +++ /dev/null @@ -1,35 +0,0 @@ -namespace SqlSugar -{ - public class MySqlQueryable:QueryableProvider - { - - } - public class MySqlQueryable : QueryableProvider - { - - } - public class MySqlQueryable : QueryableProvider - { - - } - public class MySqlQueryable : QueryableProvider - { - - } - public class MySqlQueryable : QueryableProvider - { - - } - public class MySqlQueryable : QueryableProvider - { - - } - public class MySqlQueryable : QueryableProvider - { - - } - public class MySqlQueryable : QueryableProvider - { - - } -} diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlBuilder.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlBuilder.cs deleted file mode 100644 index a78025bbf..000000000 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlBuilder.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using System.Linq; -using System.Text.RegularExpressions; - -namespace SqlSugar -{ - public class MySqlBuilder : SqlBuilderProvider - { - - public override string GetTranslationTableName(string name) - { - Check.ArgumentNullException(name, string.Format(ErrorMessage.ObjNotExist, "Table Name")); - var context = this.Context; - var mappingInfo = context - .MappingTables - .FirstOrDefault(it => it.EntityName.Equals(name, StringComparison.CurrentCultureIgnoreCase)); - return "`" + (mappingInfo == null ? name : mappingInfo.DbTableName) + "`"; - } - public override string GetTranslationColumnName(string entityName, string propertyName) - { - Check.ArgumentNullException(entityName, string.Format(ErrorMessage.ObjNotExist, "Table Name")); - Check.ArgumentNullException(propertyName, string.Format(ErrorMessage.ObjNotExist, "Column Name")); - var context = this.Context; - var mappingInfo = context - .MappingColumns - .FirstOrDefault(it => - it.EntityName.Equals(entityName, StringComparison.CurrentCultureIgnoreCase) && - it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase)); - return (mappingInfo == null ? "`" + propertyName + "`" : "`" + mappingInfo.DbColumnName + "`"); - } - - public override string GetTranslationColumnName(string propertyName) - { - return "`" + propertyName + "`"; - } - - public override string GetNoTranslationColumnName(string name) - { - return name == null ? string.Empty : Regex.Match(name, @"\`(.*?)\`").Groups[1].Value; - } - } -} diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlDeleteBuilder.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlDeleteBuilder.cs deleted file mode 100644 index 97189bcab..000000000 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlDeleteBuilder.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace SqlSugar -{ - public class MySqlDeleteBuilder : DeleteBuilder - { - - } -} diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlExpressionContext.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlExpressionContext.cs deleted file mode 100644 index db0004749..000000000 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlExpressionContext.cs +++ /dev/null @@ -1,16 +0,0 @@ -namespace SqlSugar -{ - public class MySqlExpressionContext : ExpressionContext, ILambdaExpressions - { - public SqlSugarClient Context { get; set; } - public MySqlExpressionContext() - { - base.DbMehtods = new MySqlMethod(); - } - - } - public class MySqlMethod : DefaultDbMethod, IDbMethods - { - - } -} diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlInsertBuilder.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlInsertBuilder.cs deleted file mode 100644 index aea9adaa9..000000000 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlInsertBuilder.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace SqlSugar -{ - public class MySqlInsertBuilder : InsertBuilder - { - } -} diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs deleted file mode 100644 index 1eea18d2e..000000000 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs +++ /dev/null @@ -1,86 +0,0 @@ -using System.Linq; -using System.Text; - -namespace SqlSugar -{ - public partial class MySqlQueryBuilder : QueryBuilder - { - #region Sql Template - public override string PageTempalte - { - get - { - /* - SELECT * FROM TABLE WHERE CONDITION ORDER BY ID DESC LIMIT 0,10 - */ - var template = "SELECT {0} FROM {1} {2} {3} {4} LIMIT {5},{6}"; - return template; - } - } - public override string DefaultOrderByTemplate - { - get - { - return "ORDER BY NOW() "; - } - } - - #endregion - - #region Common Methods - - public override string ToSqlString() - { - sql = new StringBuilder(); - sql.AppendFormat(SqlTemplate, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, (Skip != null || Take != null) ? null : GetOrderByString); - if (IsCount) { return sql.ToString(); } - if (Skip != null && Take == null) - { - if (this.OrderByValue == "ORDER BY ") this.OrderByValue += GetSelectValue.Split(',')[0]; - return string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, (Skip != null || Take != null) ? null : GetOrderByString, Skip.ObjToInt() + 1, long.MaxValue); - } - else if (Skip == null && Take != null) - { - if (this.OrderByValue == "ORDER BY ") this.OrderByValue += GetSelectValue.Split(',')[0]; - return string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, GetOrderByString, 1, Take.ObjToInt()); - } - else if (Skip != null && Take != null) - { - if (this.OrderByValue == "ORDER BY ") this.OrderByValue += GetSelectValue.Split(',')[0]; - return string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, GetOrderByString, Skip.ObjToInt() > 0 ? Skip.ObjToInt() + 1 : 0, Take); - } - else - { - return sql.ToString(); - } - - } - - #endregion - - #region Get SQL Partial - public override string GetSelectValue - { - get - { - if (this.IsCount) return "COUNT(1) AS `Count` "; - string reval = string.Empty; - if (this.SelectValue == null || this.SelectValue is string) - { - reval = GetSelectValueByString(); - } - else - { - reval = GetSelectValueByExpression(); - } - if (this.SelectType == ResolveExpressType.SelectMultiple) - { - this.SelectCacheKey = this.SelectCacheKey + string.Join("-", this.JoinQueryInfos.Select(it => it.TableName)); - } - return reval; - } - } - - #endregion - } -} diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlUpdateBuilder.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlUpdateBuilder.cs deleted file mode 100644 index a886c55f9..000000000 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlUpdateBuilder.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace SqlSugar -{ - public class MySqlUpdateBuilder : UpdateBuilder - { - } -} diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec index 9ddec9711..87636ea83 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec @@ -2,7 +2,7 @@ sqlSugarCore - 4.0.0.2 + 4.0.0.3 sunkaixuan Landa http://www.apache.org/licenses/LICENSE-2.0.html @@ -20,12 +20,11 @@ - - + - + \ No newline at end of file