@@ -120,12 +120,12 @@ public static void CheckSparseColumnBit()
120120 }
121121
122122 // Synapse: Statement 'Drop Database' is not supported in this version of SQL Server.
123- [ ConditionalFact ( typeof ( DataTestUtility ) , nameof ( DataTestUtility . AreConnStringsSetup ) , nameof ( DataTestUtility . IsNotAzureServer ) , nameof ( DataTestUtility . IsNotAzureSynapse ) ) ]
124- public static void CollatedDataReaderTest ( )
123+ [ ConditionalTheory ( typeof ( DataTestUtility ) , nameof ( DataTestUtility . AreConnStringsSetup ) , nameof ( DataTestUtility . IsNotAzureServer ) , nameof ( DataTestUtility . IsNotAzureSynapse ) ) ]
124+ [ InlineData ( "KAZAKH_90_CI_AI" ) ]
125+ [ InlineData ( "Georgian_Modern_Sort_CI_AS" ) ]
126+ public static void CollatedDataReaderTest ( string collation )
125127 {
126- var databaseName = DataTestUtility . GetUniqueName ( "DB" ) ;
127- // Remove square brackets
128- var dbName = databaseName . Substring ( 1 , databaseName . Length - 2 ) ;
128+ string dbName = DataTestUtility . GetUniqueName ( "CollationTest" , false ) ;
129129
130130 SqlConnectionStringBuilder builder = new ( DataTestUtility . TCPConnectionString )
131131 {
@@ -140,33 +140,27 @@ public static void CollatedDataReaderTest()
140140 con . Open ( ) ;
141141
142142 // Create collated database
143- cmd . CommandText = $ "CREATE DATABASE { databaseName } COLLATE KAZAKH_90_CI_AI ";
143+ cmd . CommandText = $ "CREATE DATABASE [ { dbName } ] COLLATE { collation } ";
144144 cmd . ExecuteNonQuery ( ) ;
145145
146146 //Create connection without pooling in order to delete database later.
147147 using ( SqlConnection dbCon = new ( builder . ConnectionString ) )
148148 using ( SqlCommand dbCmd = dbCon . CreateCommand ( ) )
149149 {
150- var data = "TestData" ;
150+ string data = Guid . NewGuid ( ) . ToString ( ) ;
151151
152152 dbCon . Open ( ) ;
153153 dbCmd . CommandText = $ "SELECT '{ data } '";
154154 using SqlDataReader reader = dbCmd . ExecuteReader ( ) ;
155155 reader . Read ( ) ;
156156 Assert . Equal ( data , reader . GetString ( 0 ) ) ;
157157 }
158-
159- // Let connection close safely before dropping database for slow servers.
160- Thread . Sleep ( 500 ) ;
161- }
162- catch ( SqlException e )
163- {
164- Assert . Fail ( $ "Unexpected Exception occurred: { e . Message } ") ;
165158 }
166159 finally
167160 {
168- cmd . CommandText = $ "DROP DATABASE { databaseName } ";
169- cmd . ExecuteNonQuery ( ) ;
161+ // Let connection close safely before dropping database for slow servers.
162+ Thread . Sleep ( 500 ) ;
163+ DataTestUtility . DropDatabase ( con , dbName ) ;
170164 }
171165 }
172166
0 commit comments