[shardingsphere] branch master updated: add SQLServer order by collate support. (#9493)

[panjuan]

This is an automated email from the ASF dual-hosted git repository.

panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new f06d26d  add SQLServer order by collate support. (#9493)
f06d26d is described below

commit f06d26d9e37fc650141cff308e5cb552c300b7d8
Author: Zonglei Dong <dongzong...@apache.org>
AuthorDate: Thu Feb 25 10:29:12 2021 +0800

    add SQLServer order by collate support. (#9493)
    
    Co-authored-by: Zonglei Dong <dzllike...@613.com>
---
 .../src/main/antlr4/imports/sqlserver/BaseRule.g4                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/antlr4/imports/sqlserver/BaseRule.g4
 
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/antlr4/imports/sqlserver/BaseRule.g4
index ba3df93..01ba1ae 100644
--- 
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/antlr4/imports/sqlserver/BaseRule.g4
+++ 
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/antlr4/imports/sqlserver/BaseRule.g4
@@ -277,7 +277,7 @@ orderByClause
     ;
 
 orderByItem
-    : (columnName | numberLiterals | expr) (ASC | DESC)?
+    : (columnName | numberLiterals | expr) (COLLATE identifier)? (ASC | DESC)?
     ;
 
 dataType