Addressed Saurabh's review feedback.

Keerat Singh · Keerat Singh · commit 0c591e408df1 · 2018-07-12T13:35:53.000-07:00
diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParser.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/TdsParser.cs
@@ -2281,17 +2281,17 @@ private bool TryProcessEnvChange(int tokenLength, TdsParserStateObject stateObj,
                             {
                                 return false;
                             }
+                            
+                            // Give the parser the new collation values in case parameters don't specify one
+                            _defaultCollation = env.newCollation;
 
                             // UTF8 collation
                             if ((env.newCollation.info & TdsEnums.UTF8_IN_TDSCOLLATION) == TdsEnums.UTF8_IN_TDSCOLLATION)
                             {
                                 _defaultEncoding = Encoding.UTF8;
-                                _defaultCollation = env.newCollation;
                             }
                             else
                             {
-                                // give the parser the new collation values in case parameters don't specify one
-                                _defaultCollation = env.newCollation;
                                 int newCodePage = GetCodePage(env.newCollation, stateObj);
                                 if (newCodePage != _defaultCodePage)
                                 {
@@ -3263,7 +3263,7 @@ internal bool TryProcessReturnValue(int length, TdsParserStateObject stateObj, o
                 {
                     int codePage = GetCodePage(rec.collation, stateObj);
 
-                    // if the column lcid is the same as the default, use the default encoder
+                    // If the column lcid is the same as the default, use the default encoder
                     if (codePage == _defaultCodePage)
                     {
                         rec.codePage = _defaultCodePage;

Original file line number	Diff line number	Diff line change
`@@ -2281,17 +2281,17 @@ private bool TryProcessEnvChange(int tokenLength, TdsParserStateObject stateObj,`
`2281`	`2281`	`{`
`2282`	`2282`	`return false;`
`2283`	`2283`	`}`
	`2284`	`+`
	`2285`	`+ // Give the parser the new collation values in case parameters don't specify one`
	`2286`	`+ _defaultCollation = env.newCollation;`
`2284`	`2287`
`2285`	`2288`	`// UTF8 collation`
`2286`	`2289`	`if ((env.newCollation.info & TdsEnums.UTF8_IN_TDSCOLLATION) == TdsEnums.UTF8_IN_TDSCOLLATION)`
`2287`	`2290`	`{`
`2288`	`2291`	`_defaultEncoding = Encoding.UTF8;`
`2289`		`- _defaultCollation = env.newCollation;`
`2290`	`2292`	`}`
`2291`	`2293`	`else`
`2292`	`2294`	`{`
`2293`		`- // give the parser the new collation values in case parameters don't specify one`
`2294`		`- _defaultCollation = env.newCollation;`
`2295`	`2295`	`int newCodePage = GetCodePage(env.newCollation, stateObj);`
`2296`	`2296`	`if (newCodePage != _defaultCodePage)`
`2297`	`2297`	`{`
`@@ -3263,7 +3263,7 @@ internal bool TryProcessReturnValue(int length, TdsParserStateObject stateObj, o`
`3263`	`3263`	`{`
`3264`	`3264`	`int codePage = GetCodePage(rec.collation, stateObj);`
`3265`	`3265`
`3266`		`- // if the column lcid is the same as the default, use the default encoder`
	`3266`	`+ // If the column lcid is the same as the default, use the default encoder`
`3267`	`3267`	`if (codePage == _defaultCodePage)`
`3268`	`3268`	`{`
`3269`	`3269`	`rec.codePage = _defaultCodePage;`