Проверка имен колонок в правилах сортировки

Author: Mr-Rm

src/OneScript.StandardLibrary/Collections/ValueTable/ValueTable.cs

@@ -17,6 +17,7 @@ This Source Code Form is subject to the terms of the
 using ScriptEngine.Machine.Contexts;
 using System;
 using System.Collections.Generic;
+using System.Data.Common;
 using System.Linq;
 
 namespace OneScript.StandardLibrary.Collections.ValueTable
@@ -648,15 +649,19 @@ private List<ValueTableSortRule> GetSortRules(string Columns)
                 if (description.Length == 0)
                     throw ColumnException.WrongColumnName();
                 if (description.Length > 2)
-                    throw RuntimeException.InvalidNthArgumentValue(1);
-
-                var Desc = new ValueTableSortRule
+                    throw RuntimeException.InvalidNthArgumentValue(1);
+
+                var sortColumn = this.Columns.FindColumnByName(description[0]);
+                if (sortColumn == null)
+                    throw ColumnException.WrongColumnName(description[0]);
+
+                var rule = new ValueTableSortRule
                 {
-                    Column = this.Columns.FindColumnByName(description[0]),
+                    Column = sortColumn,
                     direction = (description.Length > 1 && description[1].BilingualEquals("УБЫВ", "DESC")) ? -1 : 1
                 };
 
-                Rules.Add(Desc);
+                Rules.Add(rule);
             }
 
             return Rules;