for #2084, fix order by for sql server

sharding-core/sharding-core-parse/sharding-core-parse-sqlserver/src/main/antlr4/imports/sqlserver/BaseRule.g4

@@ -231,9 +231,9 @@ subquery
     ;
 
 orderByClause
-    : ORDER BY orderByExpr (COMMA_ orderByExpr)*
+    : ORDER BY orderByItem (COMMA_ orderByItem)*
     ;
-    
+
 orderByItem
     : (columnName | numberLiterals | expr) (ASC | DESC)?
     ;
@@ -270,10 +270,6 @@ partitionByClause
     : PARTITION BY expr (COMMA_ expr)*
     ;
 
-orderByExpr
-    : expr (COLLATE collationName)? (ASC | DESC)? 
-    ;
-
 rowRangeClause 
     : (ROWS | RANGE) windowFrameExtent
     ;

sharding-core/sharding-core-parse/sharding-core-parse-sqlserver/src/main/resources/META-INF/parsing-rule-definition/sharding/sqlserver/extractor-rule-definition.xml

@@ -21,4 +21,7 @@
     <extractor-rule id="modifyColumnDefinition" extractor-class="org.apache.shardingsphere.core.parse.antlr.extractor.impl.ddl.column.ModifyColumnDefinitionExtractor" />
     <extractor-rule id="addPrimaryKey" extractor-class="org.apache.shardingsphere.core.parse.extractor.ddl.SQLServerAddPrimaryKeyExtractor" />
     <extractor-rule id="setImplicitTransactions" extractor-class="org.apache.shardingsphere.core.parse.extractor.tcl.SetImplicitTransactionsExtractor" />
+    
+    <extractor-rule id="groupBy" extractor-class="org.apache.shardingsphere.core.parse.antlr.extractor.impl.dml.select.groupby.DescNullOrderDirectionGroupByExtractor" />
+    <extractor-rule id="orderBy" extractor-class="org.apache.shardingsphere.core.parse.antlr.extractor.impl.dml.select.orderby.DescNullOrderDirectionOrderByExtractor" />
 </extractor-rule-definition>