- 补充 IDbFirst GetTableByDatabase 返回 uk/fk/index 名称，以便迁移；

28810 · 28810 · commit 5bb90a974b69 · 2019-04-26T18:10:51.000+08:00
diff --git a/FreeSql.Tests/UnitTest1.cs b/FreeSql.Tests/UnitTest1.cs
@@ -8,6 +8,7 @@
 using NpgsqlTypes;
 using Npgsql.LegacyPostgis;
 using System.Linq.Expressions;
+using System.Threading.Tasks;
 
 namespace FreeSql.Tests {
 	public class UnitTest1 {
@@ -51,8 +52,51 @@ class ServiceRequestNew {
 			public string srvReqstCntt { get; set; }
 		}
 
+		public class TestEntity : EntityBase<int> {
+			public int Test { get; set; }
+			public string Title { get; set; }
+			public override Task Persistent(IRepositoryUnitOfWork uof) {
+				uof.GetGuidRepository<TestEntity>().Insert(this);
+				return Task.CompletedTask;
+			}
+			public override Task Persistent() {
+				var res = FreeSqlDb.Insert(this);
+				res.ExecuteInserted();
+				return Task.CompletedTask;
+			}
+		}
+		public abstract class EntityBase<TKey> : DomainInfrastructure {
+			[Column(IsPrimary = true, IsIdentity = true)]
+			public TKey Id { get; set; }
+			public Guid CompanyId { get; set; }
+			[Column(IsVersion = true)]
+			public int Version { get; set; }
+		}
+
+		public abstract class DomainInfrastructure {
+			[Column(IsIgnore = true)]
+			public IFreeSql FreeSqlDb {
+				get {
+					return g.sqlite;
+				}
+			}
+
+
+			public abstract Task Persistent(IRepositoryUnitOfWork uof);
+			public abstract Task Persistent();
+		}
+
 		[Fact]
 		public void Test1() {
+
+			var testddd = new TestEntity {
+				Test = 22,
+				Title = "xxx"
+			};
+			//testddd.Persistent().Wait();
+			g.sqlite.GetRepository<TestEntity, int>().Insert(testddd);
+
+
 			var testpid1 = g.mysql.Insert<TestTypeInfo>().AppendData(new TestTypeInfo { Name = "Name" + DateTime.Now.ToString("yyyyMMddHHmmss") }).ExecuteIdentity();
 			g.mysql.Insert<TestInfo>().AppendData(new TestInfo { Title = "Title" + DateTime.Now.ToString("yyyyMMddHHmmss"), CreateTime = DateTime.Now, TypeGuid = (int)testpid1 }).ExecuteAffrows();
 
diff --git a/FreeSql/DataAnnotations/ColumnAttribute.cs b/FreeSql/DataAnnotations/ColumnAttribute.cs
@@ -38,6 +38,10 @@ public class ColumnAttribute : Attribute {
 		/// </summary>
 		public bool IsVersion { get => _IsVersion ?? false; set => _IsVersion = value; }
 
+		/// <summary>
+		/// 唯一键，多个属性指定相同的标识，代表联合键
+		/// </summary>
+		public string Unique { get; set; }
 		/// <summary>
 		/// 数据库默认值
 		/// </summary>
diff --git a/FreeSql/DataAnnotations/ColumnFluent.cs b/FreeSql/DataAnnotations/ColumnFluent.cs
@@ -65,6 +65,15 @@ public ColumnFluent IsVersion(bool value) {
 			return this;
 		}
 		/// <summary>
+		/// 唯一键，多个属性指定相同的标识，代表联合键
+		/// </summary>
+		/// <param name="value">标识</param>
+		/// <returns></returns>
+		public ColumnFluent Unique(string value) {
+			_column.Unique = value;
+			return this;
+		}
+		/// <summary>
 		/// 类型映射，比如：可将 enum 属性映射成 typeof(string)
 		/// </summary>
 		/// <param name="type"></param>
diff --git a/FreeSql/DatabaseModel/DBTableInfo.cs b/FreeSql/DatabaseModel/DBTableInfo.cs
@@ -37,15 +37,19 @@ public class DbTableInfo {
 		/// <summary>
 		/// 唯一键/组合
 		/// </summary>
-		public List<List<DbColumnInfo>> Uniques { get; internal set; } = new List<List<DbColumnInfo>>();
+		public Dictionary<string, List<DbColumnInfo>> UniquesDict { get; internal set; } = new Dictionary<string, List<DbColumnInfo>>();
 		/// <summary>
 		/// 索引/组合
 		/// </summary>
-		public List<List<DbColumnInfo>> Indexes { get; internal set; } = new List<List<DbColumnInfo>>();
+		public Dictionary<string, List<DbColumnInfo>> IndexesDict { get; internal set; } = new Dictionary<string, List<DbColumnInfo>>();
 		/// <summary>
 		/// 外键
 		/// </summary>
-		public List<DbForeignInfo> Foreigns { get; internal set; } = new List<DbForeignInfo>();
+		public Dictionary<string, DbForeignInfo> ForeignsDict { get; internal set; } = new Dictionary<string, DbForeignInfo>();
+
+		public IEnumerable<List<DbColumnInfo>> Uniques => UniquesDict.Values;
+		public IEnumerable<List<DbColumnInfo>> Indexes => IndexesDict.Values;
+		public IEnumerable<DbForeignInfo> Foreigns => ForeignsDict.Values;
 	}
 
 	public enum DbTableType {
diff --git a/FreeSql/Extensions/EntityUtilExtensions.cs b/FreeSql/Extensions/EntityUtilExtensions.cs
@@ -264,14 +264,15 @@ public static void MapEntityValue(this IFreeSql orm, Type entityType, object ent
 					Expression.Assign(var2Parm, Expression.TypeAs(parm2, t))
 				});
 				foreach (var prop in _table.Properties.Values) {
+					if (_table.ColumnsByCsIgnore.ContainsKey(prop.Name)) continue;
 					if (_table.ColumnsByCs.ContainsKey(prop.Name)) {
 						exps.Add(
 							Expression.Assign(
 								Expression.MakeMemberAccess(var2Parm, prop),
 								Expression.MakeMemberAccess(var1Parm, prop)
 							)
 						);
-					} else {
+					} else if (prop.GetSetMethod() != null) {
 						exps.Add(
 							Expression.Assign(
 								Expression.MakeMemberAccess(var2Parm, prop),
diff --git a/FreeSql/Internal/Model/TableInfo.cs b/FreeSql/Internal/Model/TableInfo.cs
@@ -13,6 +13,7 @@ public class TableInfo {
 		public Dictionary<string, ColumnInfo> ColumnsByCs { get; set; } = new Dictionary<string, ColumnInfo>(StringComparer.CurrentCultureIgnoreCase);
 		public Dictionary<string, ColumnInfo> ColumnsByCsIgnore { get; set; } = new Dictionary<string, ColumnInfo>(StringComparer.CurrentCultureIgnoreCase);
 		public ColumnInfo[] Primarys { get; set; }
+		public Dictionary<string, List<ColumnInfo>> Uniques { get; set; }
 		public string CsName { get; set; }
 		public string DbName { get; set; }
 		public string DbOldName { get; set; }
diff --git a/FreeSql/Internal/UtilsExpressionTree.cs b/FreeSql/Internal/UtilsExpressionTree.cs
@@ -77,7 +77,7 @@ internal static TableInfo GetTableByEntity(Type entity, CommonUtils common) {
 						IsIgnore = false,
 						MapType = p.PropertyType
 					};
-				if (colattr._IsNullable == null) colattr._IsNullable = tp.Value.isnullable;
+				if (colattr._IsNullable == null) colattr._IsNullable = tp?.isnullable;
 				if (string.IsNullOrEmpty(colattr.DbType)) colattr.DbType = tp?.dbtypeFull ?? "varchar(255)";
 				colattr.DbType = colattr.DbType.ToUpper();
 
@@ -164,11 +164,21 @@ internal static TableInfo GetTableByEntity(Type entity, CommonUtils common) {
 									trycol.Attribute.IsPrimary = true;
 								}
 							}
+							foreach(var dbuk in dbtb.UniquesDict) {
+								foreach (var dbcol in dbuk.Value) {
+									if (trytb.Columns.TryGetValue(dbcol.Name, out var trycol) && trycol.Attribute.MapType == dbcol.CsType ||
+									trytb.ColumnsByCs.TryGetValue(dbcol.Name, out trycol) && trycol.Attribute.MapType == dbcol.CsType) {
+										trycol.Attribute.Unique = dbuk.Key;
+									}
+								}
+							}
 						}
 					}
 				} catch { }
 				trytb.Primarys = trytb.Columns.Values.Where(a => a.Attribute.IsPrimary == true).ToArray();
 			}
+			trytb.Uniques = trytb.Columns.Values.Where(a => !string.IsNullOrEmpty(a.Attribute.Unique))
+				.ToDictionary(a => a.Attribute.Unique, a => trytb.Columns.Values.Where(b => b.Attribute.Unique == a.Attribute.Unique).ToList());
 			tbc.AddOrUpdate(entity, trytb, (oldkey, oldval) => trytb);
 
 			#region 查找导航属性的关系、virtual 属性延时加载，动态产生新的重写类
diff --git a/FreeSql/MySql/MySqlDbFirst.cs b/FreeSql/MySql/MySqlDbFirst.cs
@@ -239,9 +239,9 @@ where a.table_schema in ({1}) and a.table_name in ({0})
 select 
 concat(a.constraint_schema, '.', a.table_name) 'table_id',
 a.column_name,
-concat(a.constraint_schema, '/', a.table_name, '/', a.constraint_name) 'index_id',
+a.constraint_name 'index_id',
 1 'IsUnique',
-case when constraint_name = 'PRIMARY' then 1 else 0 end 'IsPrimaryKey',
+case when a.constraint_name = 'PRIMARY' then 1 else 0 end 'IsPrimaryKey',
 0 'IsClustered',
 0 'IsDesc'
 from information_schema.key_column_usage a
@@ -283,21 +283,21 @@ where a.constraint_schema in ({1}) and a.table_name in ({0}) and isnull(position
 				}
 			}
 			foreach (string table_id in indexColumns.Keys) {
-				foreach (var columns in indexColumns[table_id].Values)
-					loc2[table_id].Indexes.Add(columns);
+				foreach (var column in indexColumns[table_id])
+					loc2[table_id].IndexesDict.Add(column.Key, column.Value);
 			}
 			foreach (string table_id in uniqueColumns.Keys) {
-				foreach (var columns in uniqueColumns[table_id].Values) {
-					columns.Sort((c1, c2) => c1.Name.CompareTo(c2.Name));
-					loc2[table_id].Uniques.Add(columns);
+				foreach (var column in uniqueColumns[table_id]) {
+					column.Value.Sort((c1, c2) => c1.Name.CompareTo(c2.Name));
+					loc2[table_id].UniquesDict.Add(column.Key, column.Value);
 				}
 			}
 
 			sql = string.Format(@"
 select 
 concat(a.constraint_schema, '.', a.table_name) 'table_id',
 a.column_name,
-concat(a.constraint_schema, '/', a.constraint_name) 'FKId',
+a.constraint_name 'FKId',
 concat(a.referenced_table_schema, '.', a.referenced_table_name) 'ref_table_id',
 1 'IsForeignKey',
 a.referenced_column_name 'ref_column'
@@ -335,8 +335,8 @@ where a.constraint_schema in ({1}) and a.table_name in ({0}) and not isnull(posi
 				loc13.ReferencedColumns.Add(loc11);
 			}
 			foreach (var table_id in fkColumns.Keys)
-				foreach (var fk in fkColumns[table_id].Values)
-					loc2[table_id].Foreigns.Add(fk);
+				foreach (var fk in fkColumns[table_id])
+					loc2[table_id].ForeignsDict.Add(fk.Key, fk.Value);
 
 			foreach (var table_id in loc3.Keys) {
 				foreach (var loc5 in loc3[table_id].Values) {
@@ -346,8 +346,8 @@ where a.constraint_schema in ({1}) and a.table_name in ({0}) and not isnull(posi
 				}
 			}
 			foreach (var loc4 in loc2.Values) {
-				if (loc4.Primarys.Count == 0 && loc4.Uniques.Count > 0) {
-					foreach (var loc5 in loc4.Uniques[0]) {
+				if (loc4.Primarys.Count == 0 && loc4.UniquesDict.Count > 0) {
+					foreach (var loc5 in loc4.UniquesDict.First().Value) {
 						loc5.IsPrimary = true;
 						loc4.Primarys.Add(loc5);
 					}
@@ -356,8 +356,8 @@ where a.constraint_schema in ({1}) and a.table_name in ({0}) and not isnull(posi
 				loc4.Columns.Sort((c1, c2) => {
 					int compare = c2.IsPrimary.CompareTo(c1.IsPrimary);
 					if (compare == 0) {
-						bool b1 = loc4.Foreigns.Find(fk => fk.Columns.Find(c3 => c3.Name == c1.Name) != null) != null;
-						bool b2 = loc4.Foreigns.Find(fk => fk.Columns.Find(c3 => c3.Name == c2.Name) != null) != null;
+						bool b1 = loc4.ForeignsDict.Values.Where(fk => fk.Columns.Where(c3 => c3.Name == c1.Name).Any()).Any();
+						bool b2 = loc4.ForeignsDict.Values.Where(fk => fk.Columns.Where(c3 => c3.Name == c2.Name).Any()).Any();
 						compare = b2.CompareTo(b1);
 					}
 					if (compare == 0) compare = c1.Name.CompareTo(c2.Name);
@@ -370,16 +370,6 @@ where a.constraint_schema in ({1}) and a.table_name in ({0}) and not isnull(posi
 				if (ret == 0) ret = t1.Name.CompareTo(t2.Name);
 				return ret;
 			});
-			foreach(var loc4 in loc1) {
-				var dicUniques = new Dictionary<string, List<DbColumnInfo>>();
-				if (loc4.Primarys.Count > 0) dicUniques.Add(string.Join(",", loc4.Primarys.Select(a => a.Name)), loc4.Primarys);
-				foreach(var loc5 in loc4.Uniques) {
-					var dickey = string.Join(",", loc5.Select(a => a.Name));
-					if (dicUniques.ContainsKey(dickey)) continue;
-					dicUniques.Add(dickey, loc5);
-				}
-				loc4.Uniques = dicUniques.Values.ToList();
-			}
 
 			loc2.Clear();
 			loc3.Clear();
diff --git a/FreeSql/Oracle/OracleDbFirst.cs b/FreeSql/Oracle/OracleDbFirst.cs
@@ -251,7 +251,7 @@ where a.owner in ({1}) and a.table_name in ({0})
 select
 a.owner || '.' || a.table_name,
 c.column_name,
-a.owner || '/' || a.table_name || '/' || c.constraint_name,
+c.constraint_name,
 case when a.constraint_type = 'U' then 1 else 0 end,
 case when a.constraint_type = 'P' then 1 else 0 end,
 0,
@@ -302,21 +302,21 @@ and a.owner in ({1}) and a.table_name in ({0})
 				}
 			}
 			foreach (string table_id in indexColumns.Keys) {
-				foreach (var columns in indexColumns[table_id].Values)
-					loc2[table_id].Indexes.Add(columns);
+				foreach (var column in indexColumns[table_id])
+					loc2[table_id].IndexesDict.Add(column.Key, column.Value);
 			}
 			foreach (string table_id in uniqueColumns.Keys) {
-				foreach (var columns in uniqueColumns[table_id].Values) {
-					columns.Sort((c1, c2) => c1.Name.CompareTo(c2.Name));
-					loc2[table_id].Uniques.Add(columns);
+				foreach (var column in uniqueColumns[table_id]) {
+					column.Value.Sort((c1, c2) => c1.Name.CompareTo(c2.Name));
+					loc2[table_id].UniquesDict.Add(column.Key, column.Value);
 				}
 			}
 
 			sql = string.Format(@"
 select
 a.owner || '.' || a.table_name,
 c.column_name,
-a.owner || '/' || a.table_name || '/' || c.constraint_name,
+c.constraint_name,
 b.owner || '.' || b.table_name,
 1,
 d.column_name
@@ -379,8 +379,8 @@ and a.owner in ({1}) and a.table_name in ({0})
 				loc13.ReferencedColumns.Add(loc11);
 			}
 			foreach (var table_id in fkColumns.Keys)
-				foreach (var fk in fkColumns[table_id].Values)
-					loc2[table_id].Foreigns.Add(fk);
+				foreach (var fk in fkColumns[table_id])
+					loc2[table_id].ForeignsDict.Add(fk.Key, fk.Value);
 
 			foreach (var table_id in loc3.Keys) {
 				foreach (var loc5 in loc3[table_id].Values) {
@@ -390,8 +390,8 @@ and a.owner in ({1}) and a.table_name in ({0})
 				}
 			}
 			foreach (var loc4 in loc2.Values) {
-				if (loc4.Primarys.Count == 0 && loc4.Uniques.Count > 0) {
-					foreach (var loc5 in loc4.Uniques[0]) {
+				if (loc4.Primarys.Count == 0 && loc4.UniquesDict.Count > 0) {
+					foreach (var loc5 in loc4.UniquesDict.First().Value) {
 						loc5.IsPrimary = true;
 						loc4.Primarys.Add(loc5);
 					}
@@ -400,8 +400,8 @@ and a.owner in ({1}) and a.table_name in ({0})
 				loc4.Columns.Sort((c1, c2) => {
 					int compare = c2.IsPrimary.CompareTo(c1.IsPrimary);
 					if (compare == 0) {
-						bool b1 = loc4.Foreigns.Find(fk => fk.Columns.Find(c3 => c3.Name == c1.Name) != null) != null;
-						bool b2 = loc4.Foreigns.Find(fk => fk.Columns.Find(c3 => c3.Name == c2.Name) != null) != null;
+						bool b1 = loc4.ForeignsDict.Values.Where(fk => fk.Columns.Where(c3 => c3.Name == c1.Name).Any()).Any();
+						bool b2 = loc4.ForeignsDict.Values.Where(fk => fk.Columns.Where(c3 => c3.Name == c2.Name).Any()).Any();
 						compare = b2.CompareTo(b1);
 					}
 					if (compare == 0) compare = c1.Name.CompareTo(c2.Name);
@@ -414,16 +414,6 @@ and a.owner in ({1}) and a.table_name in ({0})
 				if (ret == 0) ret = t1.Name.CompareTo(t2.Name);
 				return ret;
 			});
-			foreach (var loc4 in loc1) {
-				var dicUniques = new Dictionary<string, List<DbColumnInfo>>();
-				if (loc4.Primarys.Count > 0) dicUniques.Add(string.Join(",", loc4.Primarys.Select(a => a.Name)), loc4.Primarys);
-				foreach (var loc5 in loc4.Uniques) {
-					var dickey = string.Join(",", loc5.Select(a => a.Name));
-					if (dicUniques.ContainsKey(dickey)) continue;
-					dicUniques.Add(dickey, loc5);
-				}
-				loc4.Uniques = dicUniques.Values.ToList();
-			}
 
 			loc2.Clear();
 			loc3.Clear();
diff --git a/FreeSql/PostgreSQL/PostgreSQLDbFirst.cs b/FreeSql/PostgreSQL/PostgreSQLDbFirst.cs
diff --git a/FreeSql/SqlServer/SqlServerDbFirst.cs b/FreeSql/SqlServer/SqlServerDbFirst.cs

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ internal static TableInfo GetTableByEntity(Type entity, CommonUtils common) {`
`77`	`77`	`IsIgnore = false,`
`78`	`78`	`MapType = p.PropertyType`
`79`	`79`	`};`
`80`		`- if (colattr._IsNullable == null) colattr._IsNullable = tp.Value.isnullable;`
	`80`	`+ if (colattr._IsNullable == null) colattr._IsNullable = tp?.isnullable;`
`81`	`81`	`if (string.IsNullOrEmpty(colattr.DbType)) colattr.DbType = tp?.dbtypeFull ?? "varchar(255)";`
`82`	`82`	`colattr.DbType = colattr.DbType.ToUpper();`
`83`	`83`
`@@ -164,11 +164,21 @@ internal static TableInfo GetTableByEntity(Type entity, CommonUtils common) {`
`164`	`164`	`trycol.Attribute.IsPrimary = true;`
`165`	`165`	`}`
`166`	`166`	`}`
	`167`	`+ foreach(var dbuk in dbtb.UniquesDict) {`
	`168`	`+ foreach (var dbcol in dbuk.Value) {`
	`169`	`+ if (trytb.Columns.TryGetValue(dbcol.Name, out var trycol) && trycol.Attribute.MapType == dbcol.CsType \|\|`
	`170`	`+ trytb.ColumnsByCs.TryGetValue(dbcol.Name, out trycol) && trycol.Attribute.MapType == dbcol.CsType) {`
	`171`	`+ trycol.Attribute.Unique = dbuk.Key;`
	`172`	`+ }`
	`173`	`+ }`
	`174`	`+ }`
`167`	`175`	`}`
`168`	`176`	`}`
`169`	`177`	`} catch { }`
`170`	`178`	`trytb.Primarys = trytb.Columns.Values.Where(a => a.Attribute.IsPrimary == true).ToArray();`
`171`	`179`	`}`
	`180`	`+ trytb.Uniques = trytb.Columns.Values.Where(a => !string.IsNullOrEmpty(a.Attribute.Unique))`
	`181`	`+ .ToDictionary(a => a.Attribute.Unique, a => trytb.Columns.Values.Where(b => b.Attribute.Unique == a.Attribute.Unique).ToList());`
`172`	`182`	`tbc.AddOrUpdate(entity, trytb, (oldkey, oldval) => trytb);`
`173`	`183`
`174`	`184`	`#region 查找导航属性的关系、virtual 属性延时加载，动态产生新的重写类`