## v0.9.17 (ODBC)

- 增加 FreeSql.Provider.Odbc，实现 Oracle/SqlServer/MySql 的 Odbc 访问提供； - 增加 FreeSqlBuilder.UseConnectionString 参数 providerType，可解决因包版本冲突时，可能无法反射获得 FreeSql.Provider 对应的类型，通常这个参数不需要设置； - 优化 MaxLength 特性，当指定为 -1 时 DbType 会分别映射类型 text/nvarchar(max)/nvarchar2(4000)；
2025-06-19 12:28:15 +08:00 · 2019-09-19 23:14:30 +08:00
parent 8d92ccd751
commit f434418b2c
123 changed files with 31796 additions and 112 deletions
--- a/FreeSql/DataType.cs
+++ b/FreeSql/DataType.cs
@ -4,5 +4,10 @@ using System.Text;

 namespace FreeSql
 {
-    public enum DataType { MySql, SqlServer, PostgreSQL, Oracle, Sqlite }
+    public enum DataType {
+
+        MySql, SqlServer, PostgreSQL, Oracle, Sqlite,
+
+        OdbcOracle, OdbcSqlServer, OdbcMySql
+    }
 }
--- a/FreeSql/FreeSql.csproj
+++ b/FreeSql/FreeSql.csproj
@ -2,7 +2,7 @@

 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
-		<Version>0.9.16</Version>
+		<Version>0.9.17</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>
--- a/FreeSql/FreeSql.xml
+++ b/FreeSql/FreeSql.xml
@ -467,12 +467,13 @@
            <param name="columnType"></param>
            <param name="setExp"></param>
        </member>
-        <member name="M:FreeSql.FreeSqlBuilder.UseConnectionString(FreeSql.DataType,System.String)">
+        <member name="M:FreeSql.FreeSqlBuilder.UseConnectionString(FreeSql.DataType,System.String,System.Type)">
            <summary>
            使用连接串
            </summary>
            <param name="dataType">数据库类型</param>
            <param name="connectionString">数据库连接串</param>
+            <param name="providerType">提供者的类型，一般不需要指定，如果一直提示“缺少 FreeSql 数据库实现包：FreeSql.Provider.MySql.dll，可前往 nuget 下载”的错误，说明反射获取不到类型，此时该参数可排上用场</param>
            <returns></returns>
        </member>
        <member name="M:FreeSql.FreeSqlBuilder.UseSlave(System.String[])">
--- a/FreeSql/FreeSqlBuilder.cs
+++ b/FreeSql/FreeSqlBuilder.cs
@ -21,17 +21,20 @@ namespace FreeSql
        StringConvertType _entityPropertyConvertType = StringConvertType.None;
        Action<DbCommand> _aopCommandExecuting = null;
        Action<DbCommand, string> _aopCommandExecuted = null;
+        Type _providerType = null;

        /// <summary>
        /// 使用连接串
        /// </summary>
        /// <param name="dataType">数据库类型</param>
        /// <param name="connectionString">数据库连接串</param>
+        /// <param name="providerType">提供者的类型，一般不需要指定，如果一直提示“缺少 FreeSql 数据库实现包：FreeSql.Provider.MySql.dll，可前往 nuget 下载”的错误，说明反射获取不到类型，此时该参数可排上用场</param>
        /// <returns></returns>
-        public FreeSqlBuilder UseConnectionString(DataType dataType, string connectionString)
+        public FreeSqlBuilder UseConnectionString(DataType dataType, string connectionString, Type providerType = null)
        {
            _dataType = dataType;
            _masterConnectionString = connectionString;
+            _providerType = providerType;
            return this;
        }
        /// <summary>
@ -135,31 +138,49 @@ namespace FreeSql
        {
            if (string.IsNullOrEmpty(_masterConnectionString)) throw new Exception("参数 masterConnectionString 不可为空，请检查 UseConnectionString");
            IFreeSql<TMark> ret = null;
-            Type type = null;
-            switch (_dataType)
+            var type = _providerType;
+            if (type?.IsGenericType == true) type = type.MakeGenericType(typeof(TMark));
+            if (type == null)
            {
-                case DataType.MySql:
-                    type = Type.GetType("FreeSql.MySql.MySqlProvider`1,FreeSql.Provider.MySql")?.MakeGenericType(typeof(TMark));
-                    if (type == null) type = Type.GetType("FreeSql.MySql.MySqlProvider`1,FreeSql.Provider.MySqlConnector")?.MakeGenericType(typeof(TMark));
-                    if (type == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.MySql.dll，可前往 nuget 下载");
-                    break;
-                case DataType.SqlServer:
-                    type = Type.GetType("FreeSql.SqlServer.SqlServerProvider`1,FreeSql.Provider.SqlServer")?.MakeGenericType(typeof(TMark));
-                    if (type == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.SqlServer.dll，可前往 nuget 下载");
-                    break;
-                case DataType.PostgreSQL:
-                    type = Type.GetType("FreeSql.PostgreSQL.PostgreSQLProvider`1,FreeSql.Provider.PostgreSQL")?.MakeGenericType(typeof(TMark));
-                    if (type == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.PostgreSQL.dll，可前往 nuget 下载");
-                    break;
-                case DataType.Oracle:
-                    type = Type.GetType("FreeSql.Oracle.OracleProvider`1,FreeSql.Provider.Oracle")?.MakeGenericType(typeof(TMark));
-                    if (type == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.Oracle.dll，可前往 nuget 下载");
-                    break;
-                case DataType.Sqlite:
-                    type = Type.GetType("FreeSql.Sqlite.SqliteProvider`1,FreeSql.Provider.Sqlite")?.MakeGenericType(typeof(TMark));
-                    if (type == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.Sqlite.dll，可前往 nuget 下载");
-                    break;
-                default: throw new Exception("未指定 UseConnectionString");
+                switch (_dataType)
+                {
+                    case DataType.MySql:
+                        type = Type.GetType("FreeSql.MySql.MySqlProvider`1,FreeSql.Provider.MySql")?.MakeGenericType(typeof(TMark));
+                        if (type == null) type = Type.GetType("FreeSql.MySql.MySqlProvider`1,FreeSql.Provider.MySqlConnector")?.MakeGenericType(typeof(TMark));
+                        if (type == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.MySql.dll，可前往 nuget 下载");
+                        break;
+                    case DataType.SqlServer:
+                        type = Type.GetType("FreeSql.SqlServer.SqlServerProvider`1,FreeSql.Provider.SqlServer")?.MakeGenericType(typeof(TMark));
+                        if (type == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.SqlServer.dll，可前往 nuget 下载");
+                        break;
+                    case DataType.PostgreSQL:
+                        type = Type.GetType("FreeSql.PostgreSQL.PostgreSQLProvider`1,FreeSql.Provider.PostgreSQL")?.MakeGenericType(typeof(TMark));
+                        if (type == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.PostgreSQL.dll，可前往 nuget 下载");
+                        break;
+                    case DataType.Oracle:
+                        type = Type.GetType("FreeSql.Oracle.OracleProvider`1,FreeSql.Provider.Oracle")?.MakeGenericType(typeof(TMark));
+                        if (type == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.Oracle.dll，可前往 nuget 下载");
+                        break;
+                    case DataType.Sqlite:
+                        type = Type.GetType("FreeSql.Sqlite.SqliteProvider`1,FreeSql.Provider.Sqlite")?.MakeGenericType(typeof(TMark));
+                        if (type == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.Sqlite.dll，可前往 nuget 下载");
+                        break;
+
+                    case DataType.OdbcOracle:
+                        type = Type.GetType("FreeSql.Odbc.Oracle.OdbcOracleProvider`1,FreeSql.Provider.Odbc")?.MakeGenericType(typeof(TMark));
+                        if (type == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.Odbc.dll，可前往 nuget 下载");
+                        break;
+                    case DataType.OdbcSqlServer:
+                        type = Type.GetType("FreeSql.Odbc.SqlServer.OdbcSqlServerProvider`1,FreeSql.Provider.Odbc")?.MakeGenericType(typeof(TMark));
+                        if (type == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.Odbc.dll，可前往 nuget 下载");
+                        break;
+                    case DataType.OdbcMySql:
+                        type = Type.GetType("FreeSql.Odbc.MySql.OdbcMySqlProvider`1,FreeSql.Provider.Odbc")?.MakeGenericType(typeof(TMark));
+                        if (type == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.Odbc.dll，可前往 nuget 下载");
+                        break;
+
+                    default: throw new Exception("未指定 UseConnectionString");
+                }
            }
            ret = Activator.CreateInstance(type, new object[] { _masterConnectionString, _slaveConnectionString }) as IFreeSql<TMark>;
            if (ret != null)
@ -230,25 +251,28 @@ namespace FreeSql
                    if (maxlenAttr != null)
                    {
                        var lenProp = maxlenAttr.GetType().GetProperties().Where(a => a.PropertyType.IsNumberType()).FirstOrDefault();
-                        if (lenProp != null && int.TryParse(string.Concat(lenProp.GetValue(maxlenAttr, null)), out var tryval) && tryval > 0)
+                        if (lenProp != null && int.TryParse(string.Concat(lenProp.GetValue(maxlenAttr, null)), out var tryval))
                        {
-                            switch (ret.Ado.DataType)
+                            if (tryval != 0)
                            {
-                                case DataType.MySql:
-                                    e.ModifyResult.DbType = $"varchar({tryval})";
-                                    break;
-                                case DataType.SqlServer:
-                                    e.ModifyResult.DbType = $"nvarchar({tryval})";
-                                    break;
-                                case DataType.PostgreSQL:
-                                    e.ModifyResult.DbType = $"varchar({tryval})";
-                                    break;
-                                case DataType.Oracle:
-                                    e.ModifyResult.DbType = $"nvarchar2({tryval})";
-                                    break;
-                                case DataType.Sqlite:
-                                    e.ModifyResult.DbType = $"nvarchar({tryval})";
-                                    break;
+                                switch (ret.Ado.DataType)
+                                {
+                                    case DataType.MySql:
+                                        e.ModifyResult.DbType = tryval > 0 ? $"varchar({tryval})" : "text";
+                                        break;
+                                    case DataType.SqlServer:
+                                        e.ModifyResult.DbType = tryval > 0 ? $"nvarchar({tryval})" : "nvarchar(max)";
+                                        break;
+                                    case DataType.PostgreSQL:
+                                        e.ModifyResult.DbType = tryval > 0 ? $"varchar({tryval})" : "text";
+                                        break;
+                                    case DataType.Oracle:
+                                        e.ModifyResult.DbType = tryval > 0 ? $"nvarchar2({tryval})" : "nvarchar2(4000)";
+                                        break;
+                                    case DataType.Sqlite:
+                                        e.ModifyResult.DbType = tryval > 0 ? $"nvarchar({tryval})" : "text";
+                                        break;
+                                }
                            }
                        }
                    }
--- a/FreeSql/Internal/CommonProvider/CodeFirstProvider.cs
+++ b/FreeSql/Internal/CommonProvider/CodeFirstProvider.cs
@ -31,7 +31,7 @@ namespace FreeSql.Internal.CommonProvider
        public bool IsSyncStructureToLower { get; set; } = false;
        public bool IsSyncStructureToUpper { get; set; } = false;
        public bool IsConfigEntityFromDbFirst { get; set; } = false;
-        public bool IsNoneCommandParameter { get; set; } = false;
+        public virtual bool IsNoneCommandParameter { get; set; } = false;
        public bool IsLazyLoading { get; set; } = false;

        public abstract (int type, string dbtype, string dbtypeFull, bool? isnullable, object defaultValue)? GetDbInfo(Type type);
@ -50,7 +50,7 @@ namespace FreeSql.Internal.CommonProvider
        public bool SyncStructure(params Type[] entityTypes)
        {
            if (entityTypes == null) return false;
-            var syncTypes = entityTypes.Where(a => dicSyced.ContainsKey(a) == false && GetTableByEntity(a)?.DisableSyncStructure == false).ToArray();
+            var syncTypes = entityTypes.Where(a => dicSyced.ContainsKey(a) == false && GetTableByEntity(a)?.DisableSyncStructure == false).ToArray().Distinct().ToArray();
            if (syncTypes.Any() == false) return false;
            var before = new Aop.SyncStructureBeforeEventArgs(entityTypes);
            _orm.Aop.SyncStructureBefore?.Invoke(this, before);
@ -66,7 +66,7 @@ namespace FreeSql.Internal.CommonProvider
                        foreach (var syncType in syncTypes) dicSyced.TryAdd(syncType, true);
                        return true;
                    }
-                    var affrows = _orm.Ado.ExecuteNonQuery(CommandType.Text, ddl);
+                    var affrows = ExecuteDDLStatements(ddl);
                    foreach (var syncType in syncTypes) dicSyced.TryAdd(syncType, true);
                    return true;
                }
@ -82,5 +82,7 @@ namespace FreeSql.Internal.CommonProvider
                _orm.Aop.SyncStructureAfter?.Invoke(this, after);
            }
        }
+
+        public virtual int ExecuteDDLStatements(string ddl) => _orm.Ado.ExecuteNonQuery(CommandType.Text, ddl);
    }
 }
--- a/FreeSql/Internal/UtilsExpressionTree.cs
+++ b/FreeSql/Internal/UtilsExpressionTree.cs
@ -76,7 +76,7 @@ namespace FreeSql.Internal
                var setMethod = trytb.Type.GetMethod($"set_{p.Name}");
                var colattr = common.GetEntityColumnAttribute(entity, p);
                var tp = common.CodeFirst.GetDbInfo(colattr?.MapType ?? p.PropertyType);
-                if (setMethod == null) // 属性没有 set自动忽略
+                if (setMethod == null || (tp == null && p.PropertyType.IsValueType)) // 属性没有 set自动忽略
                {
                    if (colattr == null) colattr = new ColumnAttribute { IsIgnore = true };
                    else colattr.IsIgnore = true;
@ -976,7 +976,7 @@ namespace FreeSql.Internal
            var ps = type.GetProperties();
            foreach (var p in ps)
            {
-                if (sql.IndexOf($"{paramPrefix}{p.Name}", StringComparison.CurrentCultureIgnoreCase) == -1) continue;
+                if (string.IsNullOrEmpty(paramPrefix) == false && sql.IndexOf($"{paramPrefix}{p.Name}", StringComparison.CurrentCultureIgnoreCase) == -1) continue;
                var pvalue = p.GetValue(obj);
                if (p.PropertyType == ttype) ret.Add((T)Convert.ChangeType(pvalue, ttype));
                else ret.Add(constructorParamter(p.Name, p.PropertyType, pvalue));