Merge pull request #1772 from ztzg/sql-server-variant