mirror of
				https://github.com/nsnail/FreeSql.git
				synced 2025-11-04 17:20:49 +08:00 
			
		
		
		
	- 增加 低代码 ZoreEntity 迁移 API;
This commit is contained in:
		
							
								
								
									
										68
									
								
								Examples/zore_entity/JObjectExtensions.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										68
									
								
								Examples/zore_entity/JObjectExtensions.cs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,68 @@
 | 
			
		||||
using Newtonsoft.Json.Linq;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Text;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
 | 
			
		||||
public static class JObjectExtensions
 | 
			
		||||
{
 | 
			
		||||
	/// <summary>
 | 
			
		||||
	/// 将JObject转化成字典
 | 
			
		||||
	/// </summary>
 | 
			
		||||
	/// <param name="json"></param>
 | 
			
		||||
	/// <returns></returns>
 | 
			
		||||
	public static Dictionary<string, object> ToDictionary(this JToken json)
 | 
			
		||||
	{
 | 
			
		||||
		var propertyValuePairs = json.ToObject<Dictionary<string, object>>();
 | 
			
		||||
		ProcessJObjectProperties(propertyValuePairs);
 | 
			
		||||
		ProcessJArrayProperties(propertyValuePairs);
 | 
			
		||||
		return propertyValuePairs;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	private static void ProcessJObjectProperties(Dictionary<string, object> propertyValuePairs)
 | 
			
		||||
	{
 | 
			
		||||
		var objectPropertyNames = (from property in propertyValuePairs
 | 
			
		||||
								   let propertyName = property.Key
 | 
			
		||||
								   let value = property.Value
 | 
			
		||||
								   where value is JObject
 | 
			
		||||
								   select propertyName).ToList();
 | 
			
		||||
 | 
			
		||||
		objectPropertyNames.ForEach(propertyName => propertyValuePairs[propertyName] = ToDictionary((JObject)propertyValuePairs[propertyName]));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	private static void ProcessJArrayProperties(Dictionary<string, object> propertyValuePairs)
 | 
			
		||||
	{
 | 
			
		||||
		var arrayPropertyNames = (from property in propertyValuePairs
 | 
			
		||||
								  let propertyName = property.Key
 | 
			
		||||
								  let value = property.Value
 | 
			
		||||
								  where value is JArray
 | 
			
		||||
								  select propertyName).ToList();
 | 
			
		||||
 | 
			
		||||
		arrayPropertyNames.ForEach(propertyName => propertyValuePairs[propertyName] = ToArray((JArray)propertyValuePairs[propertyName]));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/// <summary>
 | 
			
		||||
	/// 
 | 
			
		||||
	/// </summary>
 | 
			
		||||
	/// <param name="array"></param>
 | 
			
		||||
	/// <returns></returns>
 | 
			
		||||
	public static object[] ToArray(this JArray array)
 | 
			
		||||
	{
 | 
			
		||||
		return array.ToObject<object[]>().Select(ProcessArrayEntry).ToArray();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	private static object ProcessArrayEntry(object value)
 | 
			
		||||
	{
 | 
			
		||||
		if (value is JObject)
 | 
			
		||||
		{
 | 
			
		||||
			return ToDictionary((JObject)value);
 | 
			
		||||
		}
 | 
			
		||||
		if (value is JArray)
 | 
			
		||||
		{
 | 
			
		||||
			return ToArray((JArray)value);
 | 
			
		||||
		}
 | 
			
		||||
		return value;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										297
									
								
								Examples/zore_entity/Program.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										297
									
								
								Examples/zore_entity/Program.cs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,297 @@
 | 
			
		||||
 | 
			
		||||
using FreeSql;
 | 
			
		||||
using FreeSql.DataAnnotations;
 | 
			
		||||
using FreeSql.Extensions.ZoreEntity;
 | 
			
		||||
using FreeSql.Internal.Model;
 | 
			
		||||
using Newtonsoft.Json;
 | 
			
		||||
using Newtonsoft.Json.Linq;
 | 
			
		||||
using System.Data;
 | 
			
		||||
using System.Text.Json;
 | 
			
		||||
 | 
			
		||||
using (var fsql = new FreeSqlBuilder()
 | 
			
		||||
	.UseConnectionString(DataType.Sqlite, "data source=111.db")
 | 
			
		||||
	.UseAutoSyncStructure(true)
 | 
			
		||||
	.UseNoneCommandParameter(true)
 | 
			
		||||
	.UseMonitorCommand(cmd => Console.WriteLine(cmd.CommandText + "\r\n"))
 | 
			
		||||
	.Build())
 | 
			
		||||
{
 | 
			
		||||
	var json = JsonConvert.SerializeObject(Helper.GetTestDesc());
 | 
			
		||||
 | 
			
		||||
	var dyctx = new ZoreDbContext(fsql, JsonConvert.DeserializeObject<TableDescriptor[]>(@"
 | 
			
		||||
[
 | 
			
		||||
	{
 | 
			
		||||
		""Name"":""User"",
 | 
			
		||||
		""Comment"":""用户表"",
 | 
			
		||||
		""Columns"": [
 | 
			
		||||
			{""Name"":""Id"",""IsPrimary"":true,""IsIdentity"":true,""MapType"":""System.Int32""},
 | 
			
		||||
			{""Name"":""Name"",""MapType"":""System.String""}
 | 
			
		||||
		],
 | 
			
		||||
		""Navigates"":[
 | 
			
		||||
			{""Name"":""Ext"",""Type"":""OneToOne"",""RelTable"":""UserExt""},
 | 
			
		||||
			{""Name"":""Claims"",""Type"":""OneToMany"",""RelTable"":""UserClaim"",""Bind"":""UserId""},
 | 
			
		||||
			{""Name"":""Roles"",""Type"":""ManyToMany"",""RelTable"":""Role"",""ManyToMany"":""UserRole""}
 | 
			
		||||
		],
 | 
			
		||||
		""Indexes"":[]
 | 
			
		||||
	},
 | 
			
		||||
	{
 | 
			
		||||
		""Name"":""UserExt"",
 | 
			
		||||
		""Comment"":""用户扩展信息表"",
 | 
			
		||||
		""Columns"":[
 | 
			
		||||
			{""Name"":""UserId"",""IsPrimary"":true,""MapType"":""System.Int32""},
 | 
			
		||||
		],
 | 
			
		||||
		""Navigates"":[
 | 
			
		||||
			{""Name"":""Remarks"",""Type"":""OneToMany"",""RelTable"":""UserExtRemarks"",""Bind"":""UserId""},
 | 
			
		||||
		],
 | 
			
		||||
	},
 | 
			
		||||
	{
 | 
			
		||||
		""Name"":""UserExtRemarks"",
 | 
			
		||||
		""Comment"":""用户扩展信息表-子表"",
 | 
			
		||||
		""Columns"":[
 | 
			
		||||
			{""Name"":""RemarkId"",""IsPrimary"":true,""MapType"":""System.Guid""},
 | 
			
		||||
			{""Name"":""UserId"",""MapType"":""System.Int32""},
 | 
			
		||||
			{""Name"":""Remark"",""MapType"":""System.String""},
 | 
			
		||||
		],
 | 
			
		||||
	},
 | 
			
		||||
	{
 | 
			
		||||
		""Name"":""UserClaim"",
 | 
			
		||||
		""Comment"":""一对多测试表"",
 | 
			
		||||
		""Columns"":[
 | 
			
		||||
			{""Name"":""Id"",""IsPrimary"":true,""IsIdentity"":true,""MapType"":""System.Int32""},
 | 
			
		||||
			{""Name"":""UserId"",""MapType"":""System.Int32""},
 | 
			
		||||
			{""Name"":""ClaimName"",""MapType"":""System.String""},
 | 
			
		||||
		],
 | 
			
		||||
	},
 | 
			
		||||
	{
 | 
			
		||||
		""Name"":""Role"",
 | 
			
		||||
		""Comment"":""权限表"",
 | 
			
		||||
		""Columns"":[
 | 
			
		||||
			{""Name"":""Id"",""IsPrimary"":true,""IsIdentity"":true,""MapType"":""System.Int32""},
 | 
			
		||||
			{""Name"":""Name"",""MapType"":""System.String""}
 | 
			
		||||
		],
 | 
			
		||||
		""Navigates"":[
 | 
			
		||||
			{""Name"":""Users"",""Type"":""ManyToMany"",""RelTable"":""User"",""ManyToMany"":""UserRole""}
 | 
			
		||||
		],
 | 
			
		||||
		""Indexes"":[]
 | 
			
		||||
	},
 | 
			
		||||
	{
 | 
			
		||||
		""Name"":""UserRole"",
 | 
			
		||||
		""Comment"":""多对多中间表"",
 | 
			
		||||
		""Columns"":[
 | 
			
		||||
			{""Name"":""UserId"",""IsPrimary"":true,""MapType"":""System.Int32""},
 | 
			
		||||
			{""Name"":""RoleId"",""IsPrimary"":true,""MapType"":""System.Int32""}
 | 
			
		||||
		],
 | 
			
		||||
		""Navigates"":[
 | 
			
		||||
			{""Name"":""User"",""Type"":""ManyToOne"",""RelTable"":""User"",""Bind"":""UserId""},
 | 
			
		||||
			{""Name"":""Role"",""Type"":""ManyToOne"",""RelTable"":""Role"",""Bind"":""RoleId""}
 | 
			
		||||
		]
 | 
			
		||||
	}
 | 
			
		||||
]
 | 
			
		||||
"));
 | 
			
		||||
 | 
			
		||||
	var dyrt3 = dyctx.SelectNoTracking("User")
 | 
			
		||||
	.Include("Ext.Remarks", then => then.Where("remark", "like", "error"))
 | 
			
		||||
	.Include("Roles", then => then.Include("Users", 
 | 
			
		||||
		then => then.Include("Ext.Remarks")))
 | 
			
		||||
	.ToList();
 | 
			
		||||
 | 
			
		||||
	var dyrt2 = dyctx.SelectNoTracking("User")
 | 
			
		||||
		.LeftJoin("UserExt", "UserId", "User.Id")
 | 
			
		||||
		.LeftJoin("UserExt", "UserId", "User.Id")
 | 
			
		||||
		//.IncludeAll()
 | 
			
		||||
		.WhereExists(q => q.From("UserClaim")
 | 
			
		||||
			.WhereColumns("userid", "=", "user.id")
 | 
			
		||||
			.WhereExists(q2 => q2.From("User")
 | 
			
		||||
				.WhereColumns("id", "=", "UserClaim.userid")))
 | 
			
		||||
		.ToList();
 | 
			
		||||
 | 
			
		||||
	var dyrt1 = dyctx.Select.ToList();
 | 
			
		||||
	dyctx.Delete(dyrt1);
 | 
			
		||||
 | 
			
		||||
	var itemJson = JsonConvert.SerializeObject(new Dictionary<string, object>
 | 
			
		||||
	{
 | 
			
		||||
		["Name"] = "user1",
 | 
			
		||||
		["Ext"] = new Dictionary<string, object>
 | 
			
		||||
		{
 | 
			
		||||
		},
 | 
			
		||||
		["Claims"] = new List<Dictionary<string, object>>
 | 
			
		||||
			{
 | 
			
		||||
				new Dictionary<string, object>
 | 
			
		||||
				{
 | 
			
		||||
					["ClaimName"] = "claim1"
 | 
			
		||||
				},
 | 
			
		||||
				new Dictionary<string, object>
 | 
			
		||||
				{
 | 
			
		||||
					["ClaimName"] = "claim2"
 | 
			
		||||
				},
 | 
			
		||||
				new Dictionary<string, object>
 | 
			
		||||
				{
 | 
			
		||||
					["ClaimName"] = "claim3"
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
 | 
			
		||||
		["Roles"] = new List<Dictionary<string, object>>
 | 
			
		||||
			{
 | 
			
		||||
				new Dictionary<string, object>
 | 
			
		||||
				{
 | 
			
		||||
					["Name"] = "role1"
 | 
			
		||||
				},
 | 
			
		||||
				new Dictionary<string, object>
 | 
			
		||||
				{
 | 
			
		||||
					["Name"] = "role2"
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	var item = JsonConvert.DeserializeObject<Dictionary<string, object>>(@"
 | 
			
		||||
{
 | 
			
		||||
""Name"":""user1"",
 | 
			
		||||
""Ext"":{
 | 
			
		||||
	""Remarks"":[{""Remark"":""remark1""},{""Remark"":""remark2""}]
 | 
			
		||||
},
 | 
			
		||||
""Claims"":[{""ClaimName"":""claim1""},{""ClaimName"":""claim2""},{""ClaimName"":""claim3""}],
 | 
			
		||||
""Roles"":[{""Name"":""role1""},{""Name"":""role2""}]
 | 
			
		||||
}");
 | 
			
		||||
 | 
			
		||||
	var item2 = System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, object>>(@"
 | 
			
		||||
{
 | 
			
		||||
""Name"":""user1"",
 | 
			
		||||
""Ext"":{
 | 
			
		||||
	""Remarks"":[{""Remark"":""remark1""},{""Remark"":""remark2""}]
 | 
			
		||||
},
 | 
			
		||||
""Claims"":[{""ClaimName"":""claim1""},{""ClaimName"":""claim2""},{""ClaimName"":""claim3""}],
 | 
			
		||||
""Roles"":[{""Name"":""role1""},{""Name"":""role2""}]
 | 
			
		||||
}");
 | 
			
		||||
	dyctx.Insert(item2);
 | 
			
		||||
 | 
			
		||||
	var item3 = JsonConvert.DeserializeObject<Dictionary<string, object>>(@"
 | 
			
		||||
{
 | 
			
		||||
""Id"":1,
 | 
			
		||||
""Name"":""user1111"",
 | 
			
		||||
""Ext"":{},
 | 
			
		||||
""Claims"":[{""Id"":1,""ClaimName"":""claim1111""},{""Id"":""3"",""ClaimName"":""claim3222222""},{""ClaimName"":""claim0000""}],
 | 
			
		||||
""Roles"":[{""Name"":""role111100001""},{""Id"":2,""Name"":""role2""}]
 | 
			
		||||
}");
 | 
			
		||||
	item3["Id"] = item2["Id"];
 | 
			
		||||
	dyctx.Update(item3);
 | 
			
		||||
	dyctx.Delete(item3);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
	Task.Run(async () =>
 | 
			
		||||
	{
 | 
			
		||||
		var users = await fsql.Select<User>().IncludeMany(a => a.Roles).ToListAsync();
 | 
			
		||||
	}).Wait();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
[Table(DisableSyncStructure = true)]
 | 
			
		||||
class userdto
 | 
			
		||||
{
 | 
			
		||||
	public int Id { get; set; }
 | 
			
		||||
	public bool? isdeleted { get; set; }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
class User
 | 
			
		||||
{
 | 
			
		||||
	[Column(IsIdentity = true)]
 | 
			
		||||
	public int Id { get; set; } //Id、UserId、User_id
 | 
			
		||||
	public string Name { get; set; }
 | 
			
		||||
	public UserExt Ext { get; set; }
 | 
			
		||||
 | 
			
		||||
	[Navigate(nameof(UserClaim.UserId))]
 | 
			
		||||
	public List<UserClaim> Claims { get; set; }
 | 
			
		||||
	public List<Role> Roles { get; set; }
 | 
			
		||||
}
 | 
			
		||||
class UserExt
 | 
			
		||||
{
 | 
			
		||||
	public int UserId { get; set; }
 | 
			
		||||
	public User User { get; set; }
 | 
			
		||||
}
 | 
			
		||||
class UserClaim
 | 
			
		||||
{
 | 
			
		||||
	[Column(IsIdentity = true)]
 | 
			
		||||
	public int Id { get; set; }
 | 
			
		||||
	public int UserId { get; set; }
 | 
			
		||||
	public string ClaimName { get; set; }
 | 
			
		||||
}
 | 
			
		||||
class Role
 | 
			
		||||
{
 | 
			
		||||
	[Column(IsIdentity = true)]
 | 
			
		||||
	public int Id { get; set; }
 | 
			
		||||
	public string Name { get; set; }
 | 
			
		||||
 | 
			
		||||
	public List<User> Users { get; set; }
 | 
			
		||||
}
 | 
			
		||||
class UserRole
 | 
			
		||||
{
 | 
			
		||||
	public int UserId { get; set; }
 | 
			
		||||
	public User User { get; set; }
 | 
			
		||||
 | 
			
		||||
	public int RoleId { get; set; }
 | 
			
		||||
	public Role Role { get; set; }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static class Helper
 | 
			
		||||
{
 | 
			
		||||
	public static TableDescriptor[] GetTestDesc()
 | 
			
		||||
	{
 | 
			
		||||
		return new[]
 | 
			
		||||
		{
 | 
			
		||||
			new TableDescriptor
 | 
			
		||||
			{
 | 
			
		||||
				 Name = "User",
 | 
			
		||||
				 Columns =
 | 
			
		||||
				 {
 | 
			
		||||
					new TableDescriptor.ColumnDescriptor{ Name = "Id", MapType = typeof(int), IsPrimary = true, IsIdentity = true },
 | 
			
		||||
					new TableDescriptor.ColumnDescriptor{ Name = "Name", MapType = typeof(string), StringLength = 100 },
 | 
			
		||||
				 },
 | 
			
		||||
				 Navigates =
 | 
			
		||||
				 {
 | 
			
		||||
					new TableDescriptor.NavigateDescriptor { Name = "Ext", RelTable = "UserExt", Type = TableDescriptor.NavigateType.OneToOne },
 | 
			
		||||
					new TableDescriptor.NavigateDescriptor { Name = "Roles", RelTable = "Role", Type = TableDescriptor.NavigateType.ManyToMany, ManyToMany = "UserRole" },
 | 
			
		||||
				 }
 | 
			
		||||
			},
 | 
			
		||||
			new TableDescriptor
 | 
			
		||||
			{
 | 
			
		||||
				Name = "UserExt",
 | 
			
		||||
				 Columns =
 | 
			
		||||
				 {
 | 
			
		||||
					new TableDescriptor.ColumnDescriptor{ Name = "UserId", MapType = typeof(int), IsPrimary = true },
 | 
			
		||||
					new TableDescriptor.ColumnDescriptor{ Name = "Name", MapType = typeof(string), StringLength = 100 },
 | 
			
		||||
				 },
 | 
			
		||||
				 Navigates =
 | 
			
		||||
				 {
 | 
			
		||||
					new TableDescriptor.NavigateDescriptor { Name = "User", RelTable = "User", Type = TableDescriptor.NavigateType.OneToOne },
 | 
			
		||||
				 }
 | 
			
		||||
			},
 | 
			
		||||
			new TableDescriptor
 | 
			
		||||
			{
 | 
			
		||||
				 Name = "Role",
 | 
			
		||||
				 Columns =
 | 
			
		||||
				 {
 | 
			
		||||
					new TableDescriptor.ColumnDescriptor{ Name = "Id", MapType = typeof(int), IsPrimary = true, IsIdentity = true },
 | 
			
		||||
					new TableDescriptor.ColumnDescriptor{ Name = "Name", MapType = typeof(string), StringLength = 50 },
 | 
			
		||||
				 },
 | 
			
		||||
				 Navigates =
 | 
			
		||||
				 {
 | 
			
		||||
					new TableDescriptor.NavigateDescriptor { Name = "Users", RelTable = "User", Type = TableDescriptor.NavigateType.ManyToMany, ManyToMany = "UserRole" },
 | 
			
		||||
				 }
 | 
			
		||||
			},
 | 
			
		||||
			new TableDescriptor
 | 
			
		||||
			{
 | 
			
		||||
				Name = "UserRole",
 | 
			
		||||
				 Columns =
 | 
			
		||||
				 {
 | 
			
		||||
					new TableDescriptor.ColumnDescriptor{ Name = "UserId", MapType = typeof(int), IsPrimary = true },
 | 
			
		||||
					new TableDescriptor.ColumnDescriptor{ Name = "RoleId", MapType = typeof(int), IsPrimary = true },
 | 
			
		||||
				 },
 | 
			
		||||
				 Navigates =
 | 
			
		||||
				 {
 | 
			
		||||
					new TableDescriptor.NavigateDescriptor { Name = "User", RelTable = "User", Type = TableDescriptor.NavigateType.ManyToOne, Bind = "UserId" },
 | 
			
		||||
					new TableDescriptor.NavigateDescriptor { Name = "Role", RelTable = "Role", Type = TableDescriptor.NavigateType.ManyToOne, Bind = "RoleId" },
 | 
			
		||||
				 }
 | 
			
		||||
			},
 | 
			
		||||
		};
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										19
									
								
								Examples/zore_entity/zore_entity.csproj
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								Examples/zore_entity/zore_entity.csproj
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,19 @@
 | 
			
		||||
<Project Sdk="Microsoft.NET.Sdk">
 | 
			
		||||
 | 
			
		||||
	<PropertyGroup>
 | 
			
		||||
		<OutputType>Exe</OutputType>
 | 
			
		||||
		<TargetFramework>net8.0</TargetFramework>
 | 
			
		||||
		<ImplicitUsings>enable</ImplicitUsings>
 | 
			
		||||
		<Nullable>enable</Nullable>
 | 
			
		||||
	</PropertyGroup>
 | 
			
		||||
 | 
			
		||||
	<ItemGroup>
 | 
			
		||||
		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 | 
			
		||||
	</ItemGroup>
 | 
			
		||||
 | 
			
		||||
	<ItemGroup>
 | 
			
		||||
	  <ProjectReference Include="..\..\Extensions\FreeSql.Extensions.ZoreEntity\FreeSql.Extensions.ZoreEntity.csproj" />
 | 
			
		||||
	  <ProjectReference Include="..\..\Providers\FreeSql.Provider.Sqlite\FreeSql.Provider.Sqlite.csproj" />
 | 
			
		||||
	</ItemGroup>
 | 
			
		||||
 | 
			
		||||
</Project>
 | 
			
		||||
		Reference in New Issue
	
	Block a user