v3.2.801-preview20230915 #1615

Directory.Build.props

@@ -11,7 +11,7 @@
 	<!--
 	经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
 	<PropertyGroup>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 	-->
 	

Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj

@@ -19,7 +19,7 @@
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
 		<LangVersion>latest</LangVersion>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Extensions/FreeSql.Generator/FreeSql.Generator.csproj

@@ -13,7 +13,7 @@
 		<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
 		<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

FreeSql.All/FreeSql.All.csproj

@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

FreeSql.DbContext/FreeSql.DbContext.csproj

@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

FreeSql.Repository/FreeSql.Repository.csproj

@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

FreeSql/FreeSql.csproj

@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

FreeSql/FreeSql.xml

@@ -1084,6 +1084,82 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder">
+            <summary>
+            动态创建实体类型
+            </summary>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.#ctor(IFreeSql,System.String,System.Attribute[])">
+            <summary>
+            配置Class
+            </summary>
+            <param name="className">类名</param>
+            <param name="attributes">类标记的特性[Table(Name = "xxx")] [Index(xxxx)]</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="isOverride">该属性是否重写父类属性</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Object,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="isOverride">该属性是否重写父类属性</param>
+            <param name="defaultValue">属性默认值</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Extend(System.Type)">
+            <summary>
+            配置父类
+            </summary>
+            <param name="superClass">父类类型</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.OverrideProperty(System.Reflection.Emit.TypeBuilder@,System.Reflection.Emit.MethodBuilder,FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.PropertyMethodEnum,System.String)">
+            <summary>
+            Override属性
+            </summary>
+            <param name="typeBuilder"></param>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Build">
+            <summary>
+            Emit动态创建出Class - Type
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToLower(System.String)">
+            <summary>
+            首字母小写
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToUpper(System.String)">
+            <summary>
+            首字母大写
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.Extensions.EntityUtil.EntityUtilExtensions.GetEntityKeyString(IFreeSql,System.Type,System.Object,System.Boolean,System.String)">
             <summary>
             获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 null
@@ -5748,6 +5824,28 @@
             请使用 fsql.InsertDict(dict) 方法插入字典数据
             </summary>
         </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.DynamicEntity(FreeSql.ICodeFirst,System.String,System.Attribute[])">
+            <summary>
+            动态构建Class Type
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateInstance(FreeSql.Internal.Model.TableInfo,System.Collections.Generic.Dictionary{System.String,System.Object})">
+            <summary>
+            根据字典，创建 table 对应的实体对象
+            </summary>
+            <param name="table"></param>
+            <param name="dict"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateDictionary(FreeSql.Internal.Model.TableInfo,System.Object)">
+            <summary>
+            根据实体对象，创建 table 对应的字典
+            </summary>
+            <param name="table"></param>
+            <param name="instance"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSqlGlobalExpressionCallExtensions.Between(System.DateTime,System.DateTime,System.DateTime)">
             <summary>
             C#： that >= between &amp;&amp; that &lt;= and<para></para>

FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs

@@ -694,7 +694,11 @@ namespace FreeSql.Internal.CommonProvider
         public TSelect OrderBy(bool condition, string sql, object parms = null)
         {
             if (condition == false) return this as TSelect;
-            if (string.IsNullOrEmpty(sql)) _orderby = null;
+            if (string.IsNullOrEmpty(sql))
+            {
+                _orderby = null;
+                return this as TSelect;
+            }
             var isnull = string.IsNullOrEmpty(_orderby);
             _orderby = string.Concat(isnull ? " \r\nORDER BY " : "", _orderby, isnull ? "" : ", ", sql);
             if (parms != null) _params.AddRange(_commonUtils.GetDbParamtersByObject(sql, parms));
@@ -1264,6 +1268,11 @@ namespace FreeSql.Internal.CommonProvider
                     _tables[a].Parameter = lambdaExp.Parameters[a];
             }
             var parser = new WithTempQueryParser(this, null, selector, ret._tables[0]);
+            if (this._select.StartsWith("WITH "))
+            {
+                ret._select = this._select;
+                this._select = "SELECT ";
+            }
             var sql = $"\r\n{this.ToSql(parser._insideSelectList[0].InsideField)}";
             ret.WithSql(sql);
             ret._diymemexpWithTempQuery = parser;

Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj

@@ -19,7 +19,7 @@
 		<SignAssembly>False</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.OracleOledb/FreeSql.Provider.OracleOledb.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.QuestDb/FreeSql.Provider.QuestDb.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<DelaySign>false</DelaySign>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.SqliteCore/FreeSql.Provider.SqliteCore.csproj

@@ -18,7 +18,7 @@
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
         <DelaySign>false</DelaySign>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
     </PropertyGroup>
 
     <ItemGroup>

Providers/FreeSql.Provider.Xugu/FreeSql.Provider.Xugu.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.801-preview20230911</Version>
+		<Version>3.2.801-preview20230915</Version>
 	</PropertyGroup>
 
 	<ItemGroup>