Fix | Support Georgian collation (#2194)

dotnet · Oct 25, 2023 · 6beab6a · 6beab6a
1 parent b86ddf1
commit 6beab6a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -4435,6 +4435,9 @@ internal int GetCodePage(SqlCollation collation, TdsParserStateObject stateObj)
                         case 0x43f:
                             codePage = 1251;  // Kazakh code page based on SQL Server
                             break;
+                        case 0x10437:
+                            codePage = 1252;  // Georgian code page based on SQL Server
+                            break;
                         default:
                             break;
                     }

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -5006,6 +5006,9 @@ internal int GetCodePage(SqlCollation collation, TdsParserStateObject stateObj)
                         case 0x43f:
                             codePage = 1251;  // Kazakh code page based on SQL Server
                             break;
+                        case 0x10437:
+                            codePage = 1252;  // Georgian code page based on SQL Server
+                            break;
                         default:
                             break;
                     }

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
@@ -120,12 +120,12 @@ public static void CheckSparseColumnBit()
         }
 
         // Synapse: Statement 'Drop Database' is not supported in this version of SQL Server.
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer), nameof(DataTestUtility.IsNotAzureSynapse))]
-        public static void CollatedDataReaderTest()
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData("KAZAKH_90_CI_AI")]
+        [InlineData("Georgian_Modern_Sort_CI_AS")]
+        public static void CollatedDataReaderTest(string collation)
         {
-            var databaseName = DataTestUtility.GetUniqueName("DB");
-            // Remove square brackets
-            var dbName = databaseName.Substring(1, databaseName.Length - 2);
+            string dbName = DataTestUtility.GetUniqueName("CollationTest", false);
 
             SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionString)
             {
@@ -140,33 +140,27 @@ public static void CollatedDataReaderTest()
                 con.Open();
 
                 // Create collated database
-                cmd.CommandText = $"CREATE DATABASE {databaseName} COLLATE KAZAKH_90_CI_AI";
+                cmd.CommandText = $"CREATE DATABASE [{dbName}] COLLATE {collation}";
                 cmd.ExecuteNonQuery();
 
                 //Create connection without pooling in order to delete database later.
                 using (SqlConnection dbCon = new(builder.ConnectionString))
                 using (SqlCommand dbCmd = dbCon.CreateCommand())
                 {
-                    var data = "TestData";
+                    string data = Guid.NewGuid().ToString();
 
                     dbCon.Open();
                     dbCmd.CommandText = $"SELECT '{data}'";
                     using SqlDataReader reader = dbCmd.ExecuteReader();
                     reader.Read();
                     Assert.Equal(data, reader.GetString(0));
                 }
-
-                // Let connection close safely before dropping database for slow servers.
-                Thread.Sleep(500);
-            }
-            catch (SqlException e)
-            {
-                Assert.Fail($"Unexpected Exception occurred: {e.Message}");
             }
             finally
             {
-                cmd.CommandText = $"DROP DATABASE {databaseName}";
-                cmd.ExecuteNonQuery();
+                // Let connection close safely before dropping database for slow servers.
+                Thread.Sleep(500);
+                DataTestUtility.DropDatabase(con, dbName);
             }
         }