Sorted properties from custom context (#57)

* Sorted properties from custom context Fixed typo in ConnectionDialog label * Added ordering of columns
linq2db · Nov 21, 2021 · ecb7a4a · ecb7a4a
1 parent b5adac6
commit ecb7a4a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Source/ConnectionDialog.xaml b/Source/ConnectionDialog.xaml
@@ -48,7 +48,7 @@
 					<Label Padding="0,3,0,3" DockPanel.Dock="Right">
 						<Hyperlink Click="ChooseType">Choose...</Hyperlink>
 					</Label>
-					<Label Padding="1,3,1,3">Full name of custome type</Label>
+					<Label Padding="1,3,1,3">Full name of custom type</Label>
 				</DockPanel>
 				<TextBox Grid.Row="3" Text="{Binding CustomTypeName}" />
 

diff --git a/Source/SchemaGenerator.cs b/Source/SchemaGenerator.cs
@@ -49,11 +49,12 @@ public TableInfo(PropertyInfo propertyInfo)
 		}
 
 		public IEnumerable<ExplorerItem> GetSchema()
-		{
+		{ 
 			var tables = _customType.GetProperties()
 				.Where(p =>
 					p.GetCustomAttributeLike<ObsoleteAttribute>() == null &&
 					p.PropertyType.MaybeChildOf(typeof(IQueryable<>)))
+				.OrderBy(p => p.Name)
 				.Select(p => new TableInfo(p))
 				.ToList();
 
@@ -123,9 +124,13 @@ ExplorerItem GetTable(ExplorerIcon icon, TableInfo table)
 				from ma in table.TypeAccessor.Members
 				let aa = ma.MemberInfo.GetCustomAttributeLike<AssociationAttribute>()
 				where aa == null
-				let ca = ma.MemberInfo.GetCustomAttributeLike<ColumnAttribute>()
+				let ca = ma.MemberInfo.GetCustomAttributeLike<ColumnAttribute>() as ColumnAttribute
 				let id = ma.MemberInfo.GetCustomAttributeLike<IdentityAttribute>()
-				let pk = ma.MemberInfo.GetCustomAttributeLike<PrimaryKeyAttribute>()
+				let pk = ma.MemberInfo.GetCustomAttributeLike<PrimaryKeyAttribute>() 
+				orderby 
+					ca == null ? 1 : ca.Order >= 0 ? 0 : 2,
+					ca?.Order,
+					ma.Name
 				where
 					ca != null && ca.IsColumn ||
 					pk != null ||