diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
index 8d96299a01..c72b52ef0f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
@@ -166,8 +166,8 @@ public void SqlParameterProperties(string connection)
const string firstColumnName = @"firstColumn";
const string secondColumnName = @"secondColumn";
const string thirdColumnName = @"thirdColumn";
- string inputProcedureName = DataTestUtility.GetUniqueName("InputProc").ToString();
- string outputProcedureName = DataTestUtility.GetUniqueName("OutputProc").ToString();
+ string inputProcedureName = DataTestUtility.GetShortName("InputProc").ToString();
+ string outputProcedureName = DataTestUtility.GetShortName("OutputProc").ToString();
const int charColumnSize = 100;
const int decimalColumnPrecision = 10;
const int decimalColumnScale = 4;
@@ -722,7 +722,7 @@ public void TestExecuteReader(string connection)
[ClassData(typeof(AEConnectionStringProvider))]
public async Task TestExecuteReaderAsyncWithLargeQuery(string connectionString)
{
- string randomName = DataTestUtility.GetUniqueName(Guid.NewGuid().ToString().Replace("-", ""), false);
+ string randomName = DataTestUtility.GetShortName(Guid.NewGuid().ToString().Replace("-", ""), false);
if (randomName.Length > 50)
{
randomName = randomName.Substring(0, 50);
@@ -912,8 +912,8 @@ public void TestEnclaveStoredProceduresWithAndWithoutParameters(string connectio
using SqlCommand sqlCommand = new("", sqlConnection, transaction: null,
columnEncryptionSetting: SqlCommandColumnEncryptionSetting.Enabled);
- string procWithoutParams = DataTestUtility.GetUniqueName("EnclaveWithoutParams", withBracket: false);
- string procWithParam = DataTestUtility.GetUniqueName("EnclaveWithParams", withBracket: false);
+ string procWithoutParams = DataTestUtility.GetShortName("EnclaveWithoutParams", withBracket: false);
+ string procWithParam = DataTestUtility.GetShortName("EnclaveWithParams", withBracket: false);
try
{
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs
index bdd48967b5..54a4b0c175 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs
@@ -54,7 +54,7 @@ public void TestRoundTripWithCspAndCertStoreProvider()
[MemberData(nameof(TestEncryptDecryptWithCsp_Data))]
public void TestEncryptDecryptWithCsp(string connectionString, string providerName, int providerType)
{
- string keyIdentifier = DataTestUtility.GetUniqueNameForSqlServer("CSP");
+ string keyIdentifier = DataTestUtility.GetLongName("CSP");
CspParameters namedCspParameters = new CspParameters(providerType, providerName, keyIdentifier);
using SQLSetupStrategyCspProvider sqlSetupStrategyCsp = new SQLSetupStrategyCspProvider(namedCspParameters);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index 92da8fcc35..6412858e86 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -111,7 +111,7 @@ public static bool TcpConnectionStringDoesNotUseAadAuth
{
get
{
- SqlConnectionStringBuilder builder = new (TCPConnectionString);
+ SqlConnectionStringBuilder builder = new(TCPConnectionString);
return builder.Authentication == SqlAuthenticationMethod.SqlPassword || builder.Authentication == SqlAuthenticationMethod.NotSpecified;
}
}
@@ -556,59 +556,176 @@ public static bool DoesHostAddressContainBothIPv4AndIPv6()
}
}
+ // Generate a new GUID and return the characters from its 1st and 4th
+ // parts, as shown here:
+ //
+ // 7ff01cb8-88c7-11f0-b433-00155d7e531e
+ // ^^^^^^^^ ^^^^
+ //
+ // These 12 characters are concatenated together without any
+ // separators. These 2 parts typically comprise a timestamp and clock
+ // sequence, most likely to be unique for tests that generate names in
+ // quick succession.
+ private static string GetGuidParts()
+ {
+ var guid = Guid.NewGuid().ToString();
+ // GOTCHA: The slice operator is inclusive of the start index and
+ // exclusive of the end index!
+ return guid.Substring(0, 8) + guid.Substring(19, 4);
+ }
+
///
- /// Generate a unique name to use in Sql Server;
- /// some providers does not support names (Oracle supports up to 30).
+ /// Generate a short unique database object name, whose maximum length
+ /// is 30 characters, with the format:
+ ///
+ /// _
+ ///
+ /// The Prefix will be truncated to satisfy the overall maximum length.
+ ///
+ /// The GUID parts will be the characters from the 1st and 4th blocks
+ /// from a traditional string representation, as shown here:
+ ///
+ /// 7ff01cb8-88c7-11f0-b433-00155d7e531e
+ /// ^^^^^^^^ ^^^^
+ ///
+ /// These 2 parts typically comprise a timestamp and clock sequence,
+ /// most likely to be unique for tests that generate names in quick
+ /// succession. The 12 characters are concatenated together without any
+ /// separators.
///
- /// The name length will be no more then (16 + prefix.Length + escapeLeft.Length + escapeRight.Length).
- /// Name without brackets.
- /// Unique name by considering the Sql Server naming rules.
- public static string GetUniqueName(string prefix, bool withBracket = true)
- {
- string escapeLeft = withBracket ? "[" : string.Empty;
- string escapeRight = withBracket ? "]" : string.Empty;
- string uniqueName = string.Format("{0}{1}_{2}_{3}{4}",
- escapeLeft,
- prefix,
- DateTime.Now.Ticks.ToString("X", CultureInfo.InvariantCulture), // up to 8 characters
- Guid.NewGuid().ToString().Substring(0, 6), // take the first 6 characters only
- escapeRight);
- return uniqueName;
+ ///
+ ///
+ /// The prefix to use when generating the unique name, truncated to at
+ /// most 18 characters when withBracket is false, and 16 characters when
+ /// withBracket is true.
+ ///
+ /// This should not contain any characters that cannot be used in
+ /// database object names. See:
+ ///
+ /// https://learn.microsoft.com/en-us/sql/relational-databases/databases/database-identifiers?view=sql-server-ver17#rules-for-regular-identifiers
+ ///
+ ///
+ ///
+ /// When true, the entire generated name will be enclosed in square
+ /// brackets, for example:
+ ///
+ /// [MyPrefix_7ff01cb811f0]
+ ///
+ ///
+ ///
+ /// A unique database object name, no more than 30 characters long.
+ ///
+ public static string GetShortName(string prefix, bool withBracket = true)
+ {
+ StringBuilder name = new(30);
+
+ if (withBracket)
+ {
+ name.Append('[');
+ }
+
+ int maxPrefixLength = withBracket ? 16 : 18;
+ if (prefix.Length > maxPrefixLength)
+ {
+ prefix = prefix.Substring(0, maxPrefixLength);
+ }
+
+ name.Append(prefix);
+ name.Append('_');
+ name.Append(GetGuidParts());
+
+ if (withBracket)
+ {
+ name.Append(']');
+ }
+
+ return name.ToString();
}
///
- /// Uses environment values `UserName` and `MachineName` in addition to the specified `prefix` and current date
- /// to generate a unique name to use in Sql Server;
- /// SQL Server supports long names (up to 128 characters), add extra info for troubleshooting.
+ /// Generate a long unique database object name, whose maximum length is
+ /// 96 characters, with the format:
+ ///
+ /// ___
+ ///
+ /// The Prefix will be truncated to satisfy the overall maximum length.
+ ///
+ /// The GUID Parts will be the characters from the 1st and 4th blocks
+ /// from a traditional string representation, as shown here:
+ ///
+ /// 7ff01cb8-88c7-11f0-b433-00155d7e531e
+ /// ^^^^^^^^ ^^^^
+ ///
+ /// These 2 parts typically comprise a timestamp and clock sequence,
+ /// most likely to be unique for tests that generate names in quick
+ /// succession. The 12 characters are concatenated together without any
+ /// separators.
+ ///
+ /// The UserName and MachineName are obtained from the Environment,
+ /// and will be truncated to satisfy the maximum overall length.
///
- /// Add the prefix to the generate string.
- /// Database name must be pass with brackets by default.
- /// Unique name by considering the Sql Server naming rules, never longer than 96 characters.
- public static string GetUniqueNameForSqlServer(string prefix, bool withBracket = true)
- {
- string extendedPrefix = string.Format(
- "{0}_{1}_{2}@{3}",
- prefix,
- Environment.UserName,
- Environment.MachineName,
- DateTime.Now.ToString("yyyy_MM_dd", CultureInfo.InvariantCulture));
- string name = GetUniqueName(extendedPrefix, withBracket);
-
- // Truncate to no more than 96 characters.
- const int maxLen = 96;
- if (name.Length > maxLen)
- {
- if (withBracket)
- {
- name = name.Substring(0, maxLen - 1) + ']';
- }
- else
- {
- name = name.Substring(0, maxLen);
- }
+ ///
+ ///
+ /// The prefix to use when generating the unique name, truncated to at
+ /// most 32 characters.
+ ///
+ /// This should not contain any characters that cannot be used in
+ /// database object names. See:
+ ///
+ /// https://learn.microsoft.com/en-us/sql/relational-databases/databases/database-identifiers?view=sql-server-ver17#rules-for-regular-identifiers
+ ///
+ ///
+ ///
+ /// When true, the entire generated name will be enclosed in square
+ /// brackets, for example:
+ ///
+ /// [MyPrefix_7ff01cb811f0_test_user_ci_agent_machine_name]
+ ///
+ ///
+ ///
+ /// A unique database object name, no more than 96 characters long.
+ ///
+ public static string GetLongName(string prefix, bool withBracket = true)
+ {
+ StringBuilder name = new(96);
+
+ if (withBracket)
+ {
+ name.Append('[');
+ }
+
+ if (prefix.Length > 32)
+ {
+ prefix = prefix.Substring(0, 32);
+ }
+
+ name.Append(prefix);
+ name.Append('_');
+ name.Append(GetGuidParts());
+ name.Append('_');
+
+ var suffix =
+ Environment.UserName + '_' +
+ Environment.MachineName;
+
+ int maxSuffixLength = 96 - name.Length;
+ if (withBracket)
+ {
+ --maxSuffixLength;
+ }
+ if (suffix.Length > maxSuffixLength)
+ {
+ suffix = suffix.Substring(0, maxSuffixLength);
+ }
+
+ name.Append(suffix);
+
+ if (withBracket)
+ {
+ name.Append(']');
}
- return name;
+ return name.ToString();
}
public static void CreateTable(SqlConnection sqlConnection, string tableName, string createBody)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs
index c99fe94807..50e2b9253c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs
@@ -19,7 +19,7 @@ public static void TestMain()
{
string connectionString = DataTestUtility.TCPConnectionString;
- string tempTable = DataTestUtility.GetUniqueNameForSqlServer("table");
+ string tempTable = DataTestUtility.GetLongName("table");
DbProviderFactory provider = SqlClientFactory.Instance;
try
@@ -275,7 +275,7 @@ public static void TestMain()
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
public static void SqlDataReader_SqlBuffer_GetFieldValue()
{
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("SqlBuffer_GetFieldValue");
+ string tableName = DataTestUtility.GetLongName("SqlBuffer_GetFieldValue");
DateTimeOffset dtoffset = DateTimeOffset.Now;
DateTime dt = DateTime.Now;
//Exclude the millisecond because of rounding at some points by SQL Server.
@@ -374,7 +374,7 @@ public static void SqlDataReader_SqlBuffer_GetFieldValue()
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
public static async Task SqlDataReader_SqlBuffer_GetFieldValue_Async()
{
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("SqlBuffer_GetFieldValue_Async");
+ string tableName = DataTestUtility.GetLongName("SqlBuffer_GetFieldValue_Async");
DateTimeOffset dtoffset = DateTimeOffset.Now;
DateTime dt = DateTime.Now;
//Exclude the millisecond because of rounding at some points by SQL Server.
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
index 439406dadb..552fbf3119 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
@@ -54,7 +54,7 @@ public class AdapterTest
public AdapterTest()
{
// create random name for temp tables
- _tempTable = DataTestUtility.GetUniqueName("AdapterTest");
+ _tempTable = DataTestUtility.GetShortName("AdapterTest");
_tempTable = _tempTable.Replace('-', '_');
_randomGuid = Guid.NewGuid().ToString();
@@ -555,7 +555,7 @@ public void ParameterTest_AllTypes()
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
public void ParameterTest_InOut()
{
- string procName = DataTestUtility.GetUniqueName("P");
+ string procName = DataTestUtility.GetShortName("P");
// input, output
string spCreateInOut =
"CREATE PROCEDURE " + procName + " @in int, @inout int OUTPUT, @out nvarchar(8) OUTPUT " +
@@ -836,13 +836,13 @@ public void BulkUpdateTest()
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
public void UpdateRefreshTest()
{
- string identTableName = DataTestUtility.GetUniqueName("ID_");
+ string identTableName = DataTestUtility.GetShortName("ID_");
string createIdentTable =
$"CREATE TABLE {identTableName} (id int IDENTITY," +
"LastName nvarchar(50) NULL," +
"Firstname nvarchar(50) NULL)";
- string spName = DataTestUtility.GetUniqueName("sp_insert", withBracket: false);
+ string spName = DataTestUtility.GetShortName("sp_insert", withBracket: false);
string spCreateInsert =
$"CREATE PROCEDURE {spName}" +
"(@FirstName nvarchar(50), @LastName nvarchar(50), @id int OUTPUT) " +
@@ -1155,7 +1155,7 @@ public void AutoGenUpdateTest()
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
public void AutoGenErrorTest()
{
- string identTableName = DataTestUtility.GetUniqueName("ID_");
+ string identTableName = DataTestUtility.GetShortName("ID_");
string createIdentTable =
$"CREATE TABLE {identTableName} (id int IDENTITY," +
"LastName nvarchar(50) NULL," +
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs
index 10b653967d..8e21156bce 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs
@@ -393,7 +393,7 @@ public static async Task ConnectionOpenAsyncDisableRetry()
{
SqlConnectionStringBuilder connectionStringBuilder = new(DataTestUtility.TCPConnectionString)
{
- InitialCatalog = DataTestUtility.GetUniqueNameForSqlServer("DoesNotExist", false),
+ InitialCatalog = DataTestUtility.GetLongName("DoesNotExist", false),
Pooling = false,
ConnectTimeout = 15,
ConnectRetryCount = 3
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataClassificationTest/DataClassificationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataClassificationTest/DataClassificationTest.cs
index 83eecc5b23..3e7076d52d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataClassificationTest/DataClassificationTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataClassificationTest/DataClassificationTest.cs
@@ -18,7 +18,7 @@ public static class DataClassificationTest
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsSupportedDataClassification))]
public static void TestDataClassificationResultSetRank()
{
- s_tableName = DataTestUtility.GetUniqueNameForSqlServer("DC");
+ s_tableName = DataTestUtility.GetLongName("DC");
using (SqlConnection sqlConnection = new SqlConnection(DataTestUtility.TCPConnectionString))
using (SqlCommand sqlCommand = sqlConnection.CreateCommand())
{
@@ -41,7 +41,7 @@ public static void TestDataClassificationResultSetRank()
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSupportedDataClassification))]
public static void TestDataClassificationResultSet()
{
- s_tableName = DataTestUtility.GetUniqueNameForSqlServer("DC");
+ s_tableName = DataTestUtility.GetLongName("DC");
using (SqlConnection sqlConnection = new SqlConnection(DataTestUtility.TCPConnectionString))
using (SqlCommand sqlCommand = sqlConnection.CreateCommand())
{
@@ -232,7 +232,7 @@ public static void TestDataClassificationBulkCopy()
data.Rows.Add(Guid.NewGuid(), "Company 2", "sample2@contoso.com", 1);
data.Rows.Add(Guid.NewGuid(), "Company 3", "sample3@contoso.com", 1);
- var tableName = DataTestUtility.GetUniqueNameForSqlServer("DC");
+ var tableName = DataTestUtility.GetLongName("DC");
using (var connection = new SqlConnection(DataTestUtility.TCPConnectionString))
{
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
index b00662a90f..e9786bea16 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
@@ -131,7 +131,7 @@ public static void CheckSparseColumnBit()
[InlineData("Georgian_Modern_Sort_CI_AS")]
public static void CollatedDataReaderTest(string collation)
{
- string dbName = DataTestUtility.GetUniqueName("CollationTest", false);
+ string dbName = DataTestUtility.GetShortName("CollationTest", false);
SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionString)
{
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
index 9924c6d104..516253219a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
@@ -52,7 +52,7 @@ public static async Task AsyncMultiPacketStreamRead()
byte[] inputData = null;
byte[] outputData = null;
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("data");
+ string tableName = DataTestUtility.GetLongName("data");
using (SqlConnection connection = new(connectionString))
{
@@ -556,7 +556,7 @@ private static void RowBuffer(string connectionString)
private static void TimestampRead(string connectionString)
{
- string tempTable = DataTestUtility.GetUniqueNameForSqlServer("##Temp");
+ string tempTable = DataTestUtility.GetLongName("##Temp");
tempTable = tempTable.Replace('-', '_');
using (SqlConnection conn = new SqlConnection(connectionString))
@@ -1062,7 +1062,7 @@ private static void SequentialAccess(string connectionString)
private static void NumericRead(string connectionString)
{
- string tempTable = DataTestUtility.GetUniqueNameForSqlServer("##Temp");
+ string tempTable = DataTestUtility.GetLongName("##Temp");
tempTable = tempTable.Replace('-', '_');
using (SqlConnection conn = new SqlConnection(connectionString))
@@ -1892,8 +1892,8 @@ private static void StreamingBlobDataTypes(string connectionString)
private static void VariantCollationsTest(string connectionString)
{
- string dbName = DataTestUtility.GetUniqueName("JPN");
- string tableName = DataTestUtility.GetUniqueName("T");
+ string dbName = DataTestUtility.GetShortName("JPN");
+ string tableName = DataTestUtility.GetShortName("T");
using (SqlConnection connection = new SqlConnection(connectionString))
{
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
index 45a2c59a35..d733f5290c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
@@ -14,10 +14,10 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.JsonTest
public class JsonBulkCopyTest
{
private readonly ITestOutputHelper _output;
- private static readonly string _generatedJsonFile = DataTestUtility.GetUniqueName("randomRecords");
- private static readonly string _outputFile = DataTestUtility.GetUniqueName("serverResults");
- private static readonly string _sourceTableName = DataTestUtility.GetUniqueName("jsonBulkCopySrcTable", true);
- private static readonly string _destinationTableName = DataTestUtility.GetUniqueName("jsonBulkCopyDestTable", true);
+ private static readonly string _generatedJsonFile = DataTestUtility.GetShortName("randomRecords");
+ private static readonly string _outputFile = DataTestUtility.GetShortName("serverResults");
+ private static readonly string _sourceTableName = DataTestUtility.GetShortName("jsonBulkCopySrcTable", true);
+ private static readonly string _destinationTableName = DataTestUtility.GetShortName("jsonBulkCopyDestTable", true);
public JsonBulkCopyTest(ITestOutputHelper output)
{
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
index efcef3e674..bb1c658118 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
@@ -22,8 +22,8 @@ public class JsonRecord
public class JsonStreamTest
{
private readonly ITestOutputHelper _output;
- private static readonly string _jsonFile = DataTestUtility.GetUniqueName("randomRecords") + ".json";
- private static readonly string _outputFile = DataTestUtility.GetUniqueName("serverRecords") + ".json";
+ private static readonly string _jsonFile = DataTestUtility.GetShortName("randomRecords") + ".json";
+ private static readonly string _outputFile = DataTestUtility.GetShortName("serverRecords") + ".json";
public JsonStreamTest(ITestOutputHelper output)
{
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTest.cs
index 31c232e3d0..20768e9329 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTest.cs
@@ -75,7 +75,7 @@ private static void TestSimpleParameter_Type(object paramValue, string expectedT
{
string tag = "TestSimpleParameter_Type";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string procName = DataTestUtility.GetUniqueNameForSqlServer("paramProc1");
+ string procName = DataTestUtility.GetLongName("paramProc1");
try
{
using SqlConnection conn = new(s_connStr);
@@ -115,7 +115,7 @@ private static void TestSimpleParameter_Variant(object paramValue, string expect
{
string tag = "TestSimpleParameter_Variant";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string procName = DataTestUtility.GetUniqueNameForSqlServer("paramProc2");
+ string procName = DataTestUtility.GetLongName("paramProc2");
try
{
using SqlConnection conn = new(s_connStr);
@@ -153,7 +153,7 @@ private static void TestSqlDataRecordParameterToTVP_Type(object paramValue, stri
{
string tag = "TestSqlDataRecordParameterToTVP_Type";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string tvpTypeName = DataTestUtility.GetUniqueNameForSqlServer("tvpType");
+ string tvpTypeName = DataTestUtility.GetLongName("tvpType");
try
{
using SqlConnection conn = new(s_connStr);
@@ -200,7 +200,7 @@ private static void TestSqlDataRecordParameterToTVP_Variant(object paramValue, s
{
string tag = "TestSqlDataRecordParameterToTVP_Variant";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string tvpTypeName = DataTestUtility.GetUniqueNameForSqlServer("tvpVariant");
+ string tvpTypeName = DataTestUtility.GetLongName("tvpVariant");
try
{
using SqlConnection conn = new(s_connStr);
@@ -245,7 +245,7 @@ private static void TestSqlDataReaderParameterToTVP_Type(object paramValue, stri
{
string tag = "TestSqlDataReaderParameterToTVP_Type";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string tvpTypeName = DataTestUtility.GetUniqueNameForSqlServer("tvpType");
+ string tvpTypeName = DataTestUtility.GetLongName("tvpType");
try
{
using SqlConnection conn = new(s_connStr);
@@ -295,7 +295,7 @@ private static void TestSqlDataReaderParameterToTVP_Variant(object paramValue, s
{
string tag = "TestSqlDataReaderParameterToTVP_Variant";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string tvpTypeName = DataTestUtility.GetUniqueNameForSqlServer("tvpVariant");
+ string tvpTypeName = DataTestUtility.GetLongName("tvpVariant");
try
{
using SqlConnection conn = new(s_connStr);
@@ -347,10 +347,10 @@ private static void TestSqlDataReader_TVP_Type(object paramValue, string expecte
{
string tag = "TestSqlDataReader_TVP_Type";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string tvpTypeName = DataTestUtility.GetUniqueNameForSqlServer("tvpType");
- string InputTableName = DataTestUtility.GetUniqueNameForSqlServer("InputTable");
- string OutputTableName = DataTestUtility.GetUniqueNameForSqlServer("OutputTable");
- string ProcName = DataTestUtility.GetUniqueNameForSqlServer("spTVPProc");
+ string tvpTypeName = DataTestUtility.GetLongName("tvpType");
+ string InputTableName = DataTestUtility.GetLongName("InputTable");
+ string OutputTableName = DataTestUtility.GetLongName("OutputTable");
+ string ProcName = DataTestUtility.GetLongName("spTVPProc");
try
{
using SqlConnection conn = new(s_connStr);
@@ -428,10 +428,10 @@ private static void TestSqlDataReader_TVP_Variant(object paramValue, string expe
{
string tag = "TestSqlDataReader_TVP_Variant";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string tvpTypeName = DataTestUtility.GetUniqueNameForSqlServer("tvpVariant_DRdrTVPVar");
- string InputTableName = DataTestUtility.GetUniqueNameForSqlServer("InputTable");
- string OutputTableName = DataTestUtility.GetUniqueNameForSqlServer("OutputTable");
- string ProcName = DataTestUtility.GetUniqueNameForSqlServer("spTVPProc_DRdrTVPVar");
+ string tvpTypeName = DataTestUtility.GetLongName("tvpVariant_DRdrTVPVar");
+ string InputTableName = DataTestUtility.GetLongName("InputTable");
+ string OutputTableName = DataTestUtility.GetLongName("OutputTable");
+ string ProcName = DataTestUtility.GetLongName("spTVPProc_DRdrTVPVar");
try
{
using SqlConnection conn = new(s_connStr);
@@ -512,8 +512,8 @@ private static void TestSimpleDataReader_Type(object paramValue, string expected
{
string tag = "TestSimpleDataReader_Type";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string inputTable = DataTestUtility.GetUniqueNameForSqlServer("inputTable");
- string procName = DataTestUtility.GetUniqueNameForSqlServer("paramProc3");
+ string inputTable = DataTestUtility.GetLongName("inputTable");
+ string procName = DataTestUtility.GetLongName("paramProc3");
try
{
using SqlConnection conn = new(s_connStr);
@@ -568,8 +568,8 @@ private static void TestSimpleDataReader_Variant(object paramValue, string expec
{
string tag = "TestSimpleDataReader_Variant";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string inputTable = DataTestUtility.GetUniqueNameForSqlServer("inputTable");
- string procName = DataTestUtility.GetUniqueNameForSqlServer("paramProc4");
+ string inputTable = DataTestUtility.GetLongName("inputTable");
+ string procName = DataTestUtility.GetLongName("paramProc4");
try
{
using SqlConnection conn = new(s_connStr);
@@ -624,8 +624,8 @@ private static void SqlBulkCopySqlDataReader_Type(object paramValue, string expe
{
string tag = "SqlBulkCopySqlDataReader_Type";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string bulkCopySrcTableName = DataTestUtility.GetUniqueNameForSqlServer("bulkSrcTable");
- string bulkCopyTableName = DataTestUtility.GetUniqueNameForSqlServer("bulkDestTable");
+ string bulkCopySrcTableName = DataTestUtility.GetLongName("bulkSrcTable");
+ string bulkCopyTableName = DataTestUtility.GetLongName("bulkDestTable");
try
{
using SqlConnection conn = new(s_connStr);
@@ -698,8 +698,8 @@ private static void SqlBulkCopySqlDataReader_Variant(object paramValue, string e
{
string tag = "SqlBulkCopySqlDataReader_Variant";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string bulkCopySrcTableName = DataTestUtility.GetUniqueNameForSqlServer("bulkSrcTable");
- string bulkCopyTableName = DataTestUtility.GetUniqueNameForSqlServer("bulkDestTable");
+ string bulkCopySrcTableName = DataTestUtility.GetLongName("bulkSrcTable");
+ string bulkCopyTableName = DataTestUtility.GetLongName("bulkDestTable");
try
{
using SqlConnection conn = new(s_connStr);
@@ -776,7 +776,7 @@ private static void SqlBulkCopyDataTable_Type(object paramValue, string expected
{
string tag = "SqlBulkCopyDataTable_Type";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string bulkCopyTableName = DataTestUtility.GetUniqueNameForSqlServer("bulkDestType");
+ string bulkCopyTableName = DataTestUtility.GetLongName("bulkDestType");
try
{
using SqlConnection conn = new(s_connStr);
@@ -836,7 +836,7 @@ private static void SqlBulkCopyDataTable_Variant(object paramValue, string expec
{
string tag = "SqlBulkCopyDataTable_Variant";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string bulkCopyTableName = DataTestUtility.GetUniqueNameForSqlServer("bulkDestVariant");
+ string bulkCopyTableName = DataTestUtility.GetLongName("bulkDestVariant");
try
{
using SqlConnection conn = new(s_connStr);
@@ -886,7 +886,7 @@ private static void SqlBulkCopyDataRow_Type(object paramValue, string expectedTy
{
string tag = "SqlBulkCopyDataRow_Type";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string bulkCopyTableName = DataTestUtility.GetUniqueNameForSqlServer("bulkDestType");
+ string bulkCopyTableName = DataTestUtility.GetLongName("bulkDestType");
try
{
using SqlConnection conn = new(s_connStr);
@@ -941,7 +941,7 @@ private static void SqlBulkCopyDataRow_Variant(object paramValue, string expecte
{
string tag = "SqlBulkCopyDataRow_Variant";
DisplayHeader(tag, paramValue, expectedBaseTypeName);
- string bulkCopyTableName = DataTestUtility.GetUniqueNameForSqlServer("bulkDestVariant");
+ string bulkCopyTableName = DataTestUtility.GetLongName("bulkDestVariant");
try
{
using SqlConnection conn = new(s_connStr);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
index d98fe6abd4..88f99a2f51 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
@@ -120,7 +120,7 @@ public static void CodeCoverageSqlClient()
public static void Test_Copy_SqlParameter()
{
using var conn = new SqlConnection(s_connString);
- string cTableName = DataTestUtility.GetUniqueNameForSqlServer("#tmp");
+ string cTableName = DataTestUtility.GetLongName("#tmp");
try
{
// Create tmp table
@@ -262,9 +262,9 @@ public static void TestParametersWithDatatablesTVPInsert()
};
using SqlConnection connection = new(builder.ConnectionString);
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("Table");
- string procName = DataTestUtility.GetUniqueNameForSqlServer("Proc");
- string typeName = DataTestUtility.GetUniqueName("Type");
+ string tableName = DataTestUtility.GetLongName("Table");
+ string procName = DataTestUtility.GetLongName("Proc");
+ string typeName = DataTestUtility.GetShortName("Type");
try
{
connection.Open();
@@ -343,8 +343,8 @@ public static void TestParametersWithSqlRecordsTVPInsert()
};
using SqlConnection connection = new(builder.ConnectionString);
- string procName = DataTestUtility.GetUniqueNameForSqlServer("Proc");
- string typeName = DataTestUtility.GetUniqueName("Type");
+ string procName = DataTestUtility.GetLongName("Proc");
+ string typeName = DataTestUtility.GetShortName("Type");
try
{
connection.Open();
@@ -403,8 +403,8 @@ @newRoads as {typeName} READONLY
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
public static void TestDateOnlyTVPDataTable_CommandSP()
{
- string tableTypeName = "[dbo]." + DataTestUtility.GetUniqueNameForSqlServer("UDTTTestDateOnlyTVP");
- string spName = DataTestUtility.GetUniqueNameForSqlServer("spTestDateOnlyTVP");
+ string tableTypeName = "[dbo]." + DataTestUtility.GetLongName("UDTTTestDateOnlyTVP");
+ string spName = DataTestUtility.GetLongName("spTestDateOnlyTVP");
SqlConnection connection = new(s_connString);
try
{
@@ -451,8 +451,8 @@ public static void TestDateOnlyTVPDataTable_CommandSP()
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
public static void TestDateOnlyTVPSqlDataRecord_CommandSP()
{
- string tableTypeName = "[dbo]." + DataTestUtility.GetUniqueNameForSqlServer("UDTTTestDateOnlySqlDataRecordTVP");
- string spName = DataTestUtility.GetUniqueNameForSqlServer("spTestDateOnlySqlDataRecordTVP");
+ string tableTypeName = "[dbo]." + DataTestUtility.GetLongName("UDTTTestDateOnlySqlDataRecordTVP");
+ string spName = DataTestUtility.GetLongName("spTestDateOnlySqlDataRecordTVP");
SqlConnection connection = new(s_connString);
try
{
@@ -574,7 +574,7 @@ public static void TestScaledDecimalParameter_CommandInsert(string connectionStr
{
using LocalAppContextSwitchesHelper appContextSwitchesHelper = new();
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("TestDecimalParameterCMD");
+ string tableName = DataTestUtility.GetLongName("TestDecimalParameterCMD");
using SqlConnection connection = InitialDatabaseTable(connectionString, tableName);
try
{
@@ -609,7 +609,7 @@ public static void TestScaledDecimalParameter_BulkCopy(string connectionString,
{
using LocalAppContextSwitchesHelper appContextSwitchesHelper = new();
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("TestDecimalParameterBC");
+ string tableName = DataTestUtility.GetLongName("TestDecimalParameterBC");
using SqlConnection connection = InitialDatabaseTable(connectionString, tableName);
try
{
@@ -645,9 +645,9 @@ public static void TestScaledDecimalTVP_CommandSP(string connectionString, bool
{
using LocalAppContextSwitchesHelper appContextSwitchesHelper = new();
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("TestDecimalParameterBC");
- string tableTypeName = DataTestUtility.GetUniqueNameForSqlServer("UDTTTestDecimalParameterBC");
- string spName = DataTestUtility.GetUniqueNameForSqlServer("spTestDecimalParameterBC");
+ string tableName = DataTestUtility.GetLongName("TestDecimalParameterBC");
+ string tableTypeName = DataTestUtility.GetLongName("UDTTTestDecimalParameterBC");
+ string spName = DataTestUtility.GetLongName("spTestDecimalParameterBC");
using SqlConnection connection = InitialDatabaseUDTT(connectionString, tableName, tableTypeName, spName);
try
{
@@ -932,7 +932,7 @@ private static void EnableOptimizedParameterBinding_ReturnSucceeds()
{
int firstInput = 12;
- string sprocName = DataTestUtility.GetUniqueName("P");
+ string sprocName = DataTestUtility.GetShortName("P");
// input, output
string createSprocQuery =
"CREATE PROCEDURE " + sprocName + " @in int " +
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlAdapterUpdateBatch.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlAdapterUpdateBatch.cs
index 7f383e8201..aa59bc319c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlAdapterUpdateBatch.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlAdapterUpdateBatch.cs
@@ -15,7 +15,7 @@ public class SqlAdapterUpdateBatch
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
public void SqlAdapterTest()
{
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("Adapter");
+ string tableName = DataTestUtility.GetLongName("Adapter");
string tableNameNoBrackets = tableName.Substring(1, tableName.Length - 2);
try
{
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParam.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParam.cs
index 2d11274191..e1592825b1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParam.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParam.cs
@@ -108,7 +108,7 @@ private static void SendVariantParam(object paramValue, string expectedTypeName,
///
private static void SendVariantBulkCopy(object paramValue, string expectedTypeName, string expectedBaseTypeName)
{
- string bulkCopyTableName = DataTestUtility.GetUniqueNameForSqlServer("bulkDest");
+ string bulkCopyTableName = DataTestUtility.GetLongName("bulkDest");
// Fetch reader using type.
using SqlDataReader dr = GetReaderForVariant(paramValue, false);
@@ -194,7 +194,7 @@ private static void SendVariantBulkCopy(object paramValue, string expectedTypeNa
///
private static void SendVariantTvp(object paramValue, string expectedTypeName, string expectedBaseTypeName)
{
- string tvpTypeName = DataTestUtility.GetUniqueNameForSqlServer("tvpVariant");
+ string tvpTypeName = DataTestUtility.GetLongName("tvpVariant");
using SqlConnection connTvp = new(s_connStr);
connTvp.Open();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs
index 7c590ebe05..21165e7624 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs
@@ -268,7 +268,7 @@ public void RetryExecuteUnauthorizedSqlStatementDML(string cnnString, SqlRetryLo
public void DropDatabaseWithActiveConnection(string cnnString, SqlRetryLogicBaseProvider provider)
{
int currentRetries = 0;
- string database = DataTestUtility.GetUniqueNameForSqlServer($"RetryLogic_{provider.RetryLogic.RetryIntervalEnumerator.GetType().Name}", false);
+ string database = DataTestUtility.GetLongName($"RetryLogic_{provider.RetryLogic.RetryIntervalEnumerator.GetType().Name}", false);
var builder = new SqlConnectionStringBuilder(cnnString)
{
InitialCatalog = database,
@@ -330,7 +330,7 @@ public void DropDatabaseWithActiveConnection(string cnnString, SqlRetryLogicBase
public void UpdateALockedTable(string cnnString, SqlRetryLogicBaseProvider provider)
{
int currentRetries = 0;
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("Region");
+ string tableName = DataTestUtility.GetLongName("Region");
string fieldName = "RegionDescription";
using (var cnn1 = new SqlConnection(cnnString))
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConnectionReliabilityTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConnectionReliabilityTest.cs
index 61a1b07c5e..e5ed05e09f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConnectionReliabilityTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConnectionReliabilityTest.cs
@@ -58,7 +58,7 @@ public void ConnectionCancelRetryOpenInvalidCatalog(string cnnString, SqlRetryLo
public void CreateDatabaseWhileTryingToConnect(string cnnString, SqlRetryLogicBaseProvider provider)
{
int currentRetries = 0;
- string database = DataTestUtility.GetUniqueNameForSqlServer($"RetryLogic_{provider.RetryLogic.RetryIntervalEnumerator.GetType().Name}", false);
+ string database = DataTestUtility.GetLongName($"RetryLogic_{provider.RetryLogic.RetryIntervalEnumerator.GetType().Name}", false);
var builder = new SqlConnectionStringBuilder(cnnString)
{
InitialCatalog = database,
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AdjustPrecScaleForBulkCopy.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AdjustPrecScaleForBulkCopy.cs
index 117ab67c0d..5a335e957e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AdjustPrecScaleForBulkCopy.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AdjustPrecScaleForBulkCopy.cs
@@ -43,7 +43,7 @@ public static void RunTest()
private static SqlDecimal BulkCopySqlDecimalToTable(SqlDecimal decimalValue, int sourcePrecision, int sourceScale, int targetPrecision, int targetScale)
{
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("Table");
+ string tableName = DataTestUtility.GetLongName("Table");
string connectionString = DataTestUtility.TCPConnectionString;
SqlDecimal resultValue;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AzureDistributedTransaction.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AzureDistributedTransaction.cs
index 823bc50a9d..2a853d7ed4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AzureDistributedTransaction.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AzureDistributedTransaction.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
public class AzureDistributedTransaction
{
private static readonly string s_connectionString = DataTestUtility.TCPConnectionString;
- private static readonly string s_tableName = DataTestUtility.GetUniqueNameForSqlServer("Azure");
+ private static readonly string s_tableName = DataTestUtility.GetLongName("Azure");
private static readonly string s_createTableCmd = $"CREATE TABLE {s_tableName} (NAME NVARCHAR(40), AGE INT)";
private static readonly string s_sqlBulkCopyCmd = "SELECT * FROM(VALUES ('Fuller', 33), ('Davon', 49)) AS q (FirstName, Age)";
private static readonly int s_commandTimeout = 30;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWidenNullInexactNumerics.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWidenNullInexactNumerics.cs
index 5ccda71fb9..f961521233 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWidenNullInexactNumerics.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWidenNullInexactNumerics.cs
@@ -12,8 +12,8 @@ public class CopyWidenNullInexactNumerics
{
public static void Test(string sourceDatabaseConnectionString, string destinationDatabaseConnectionString)
{
- string sourceTableName = DataTestUtility.GetUniqueNameForSqlServer("BCP_SRC");
- string destTableName = DataTestUtility.GetUniqueNameForSqlServer("BCP_DST");
+ string sourceTableName = DataTestUtility.GetLongName("BCP_SRC");
+ string destTableName = DataTestUtility.GetLongName("BCP_DST");
// this test copies float and real inexact numeric types into decimal targets using bulk copy to check that the widening of the type succeeds.
using (var sourceConnection = new SqlConnection(sourceDatabaseConnectionString))
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/DataConversionErrorMessageTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/DataConversionErrorMessageTest.cs
index 4c3d594ad1..4a722dd409 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/DataConversionErrorMessageTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/DataConversionErrorMessageTest.cs
@@ -28,7 +28,7 @@ public InitialDatabase()
srcConstr = DataTestUtility.TCPConnectionString;
Connection = new SqlConnection(srcConstr);
- TableName = DataTestUtility.GetUniqueNameForSqlServer("SqlBulkCopyTest_CopyStringToIntTest_");
+ TableName = DataTestUtility.GetLongName("SqlBulkCopyTest_CopyStringToIntTest_");
InitialTable(Connection, TableName);
}
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs
index dc3779b4dc..5b7112476d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs
@@ -15,8 +15,8 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
///
public sealed class TestBulkCopyWithUtf8 : IDisposable
{
- private static string s_sourceTable = DataTestUtility.GetUniqueName("SourceTableForUTF8Data");
- private static string s_destinationTable = DataTestUtility.GetUniqueName("DestinationTableForUTF8Data");
+ private static string s_sourceTable = DataTestUtility.GetShortName("SourceTableForUTF8Data");
+ private static string s_destinationTable = DataTestUtility.GetShortName("DestinationTableForUTF8Data");
private static string s_testValue = "test";
private static byte[] s_testValueInUtf8Bytes = new byte[] { 0x74, 0x65, 0x73, 0x74 };
private static readonly string s_insertQuery = $"INSERT INTO {s_sourceTable} VALUES('{s_testValue}')";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/WriteToServerTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/WriteToServerTest.cs
index 343a7bcfe2..20f63a2e0a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/WriteToServerTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/WriteToServerTest.cs
@@ -12,8 +12,8 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
public class WriteToServerTest
{
private readonly string _connectionString = null;
- private readonly string _tableName1 = DataTestUtility.GetUniqueName("Bulk1");
- private readonly string _tableName2 = DataTestUtility.GetUniqueName("Bulk2");
+ private readonly string _tableName1 = DataTestUtility.GetShortName("Bulk1");
+ private readonly string _tableName2 = DataTestUtility.GetShortName("Bulk2");
public WriteToServerTest()
{
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCompletedTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCompletedTest.cs
index 8e38bee7c0..21ff771ac0 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCompletedTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCompletedTest.cs
@@ -11,7 +11,7 @@ public static class SqlCommandCompletedTest
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
public static void VerifyStatmentCompletedCalled()
{
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("stmt");
+ string tableName = DataTestUtility.GetLongName("stmt");
using (var conn = new SqlConnection(s_connStr))
using (var cmd = conn.CreateCommand())
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs
index 26b11055c2..7f28a4a09a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs
@@ -15,8 +15,8 @@ public class SqlCommandSetTest
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
public void TestByteArrayParameters()
{
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("CMD");
- string procName = DataTestUtility.GetUniqueNameForSqlServer("CMD");
+ string tableName = DataTestUtility.GetLongName("CMD");
+ string procName = DataTestUtility.GetLongName("CMD");
byte[] bArray = new byte[] { 1, 2, 3 };
using (var connection = new SqlConnection(DataTestUtility.TCPConnectionString))
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlFileStreamTest/SqlFileStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlFileStreamTest/SqlFileStreamTest.cs
index 742a800bb9..9cba46959f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlFileStreamTest/SqlFileStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlFileStreamTest/SqlFileStreamTest.cs
@@ -221,7 +221,7 @@ private static string SetupFileStreamDB()
fileStreamDir += "\\";
}
- string dbName = DataTestUtility.GetUniqueName("FS", false);
+ string dbName = DataTestUtility.GetShortName("FS", false);
string createDBQuery = @$"CREATE DATABASE [{dbName}]
ON PRIMARY
(NAME = PhotoLibrary_data,
@@ -266,7 +266,7 @@ private static void DropFileStreamDb(string connString)
private static string SetupTable(string connString)
{
// Generate random table name
- string tempTable = DataTestUtility.GetUniqueNameForSqlServer("fs");
+ string tempTable = DataTestUtility.GetLongName("fs");
// Create table
string createTable = $"CREATE TABLE {tempTable} (EmployeeId INT NOT NULL PRIMARY KEY, Photo VARBINARY(MAX) FILESTREAM NULL, RowGuid UNIQUEIDENTIFIER NOT NULL ROWGUIDCOL UNIQUE DEFAULT NEWID() ) ";
ExecuteNonQueryCommand(createTable, connString);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
index 0fd8f22daf..67a5cf2748 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
@@ -408,7 +408,7 @@ private static string GetUdtName(Type udtClrType)
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
public static void TestSqlServerTypesInsertAndRead()
{
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("Type");
+ string tableName = DataTestUtility.GetLongName("Type");
string allTypesSQL = @$"
if not exists (select * from sysobjects where name='{tableName}' and xtype='U')
Begin
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtBulkCopyTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtBulkCopyTest.cs
index 8adf6c7bb5..469c895a61 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtBulkCopyTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtBulkCopyTest.cs
@@ -18,9 +18,9 @@ public void RunCopyTest()
_connStr = (new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { InitialCatalog = DataTestUtility.UdtTestDbName }).ConnectionString;
SqlConnection conn = new SqlConnection(_connStr);
- string cities = DataTestUtility.GetUniqueNameForSqlServer("UdtBulkCopy_cities");
- string customers = DataTestUtility.GetUniqueNameForSqlServer("UdtBulkCopy_customers");
- string circles = DataTestUtility.GetUniqueNameForSqlServer("UdtBulkCopy_circles");
+ string cities = DataTestUtility.GetLongName("UdtBulkCopy_cities");
+ string customers = DataTestUtility.GetLongName("UdtBulkCopy_customers");
+ string circles = DataTestUtility.GetLongName("UdtBulkCopy_circles");
conn.Open();
try
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs
index 59896086f4..74e6aaa277 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs
@@ -32,7 +32,7 @@ public DateTimeOffsetVariableScale(DateTimeOffset dateTimeOffset, int scale)
public class UdtDateTimeOffsetTest
{
private readonly string _connectionString = null;
- private readonly string _udtTableType = DataTestUtility.GetUniqueNameForSqlServer("DataTimeOffsetTableType");
+ private readonly string _udtTableType = DataTestUtility.GetLongName("DataTimeOffsetTableType");
private readonly ITestOutputHelper _testOutputHelper;
public UdtDateTimeOffsetTest(ITestOutputHelper testOutputHelper)
@@ -87,7 +87,7 @@ public void DateTimeOffsetAllScalesTestShouldSucceed()
for (int scale = fromScale; scale <= toScale; scale++)
{
- string tvpTypeName = DataTestUtility.GetUniqueNameForSqlServer("tvpType"); // Need a unique name per scale, else we get errors. See https://github.com/dotnet/SqlClient/issues/3011
+ string tvpTypeName = DataTestUtility.GetLongName("tvpType"); // Need a unique name per scale, else we get errors. See https://github.com/dotnet/SqlClient/issues/3011
DateTimeOffset dateTimeOffset = new DateTimeOffset(2024, 1, 1, 23, 59, 59, TimeSpan.Zero);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs
index 16d48d7c37..85dbf99b33 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs
@@ -84,8 +84,8 @@ public void UDTParams_Binary()
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsUdtTestDatabasePresent), nameof(DataTestUtility.AreConnStringsSetup))]
public void UDTParams_Invalid2()
{
- string spInsertCustomer = DataTestUtility.GetUniqueNameForSqlServer("spUdtTest2_InsertCustomer");
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("UdtTest2");
+ string spInsertCustomer = DataTestUtility.GetLongName("spUdtTest2_InsertCustomer");
+ string tableName = DataTestUtility.GetLongName("UdtTest2");
using (SqlConnection conn = new SqlConnection(_connStr))
using (SqlCommand cmd = conn.CreateCommand())
@@ -143,8 +143,8 @@ public void UDTParams_Invalid()
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsUdtTestDatabasePresent), nameof(DataTestUtility.AreConnStringsSetup))]
public void UDTParams_TypedNull()
{
- string spInsertCustomer = DataTestUtility.GetUniqueNameForSqlServer("spUdtTest2_InsertCustomer");
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("UdtTest2_Customer");
+ string spInsertCustomer = DataTestUtility.GetLongName("spUdtTest2_InsertCustomer");
+ string tableName = DataTestUtility.GetLongName("UdtTest2_Customer");
using (SqlConnection conn = new SqlConnection(_connStr))
using (SqlCommand cmd = conn.CreateCommand())
@@ -188,8 +188,8 @@ public void UDTParams_TypedNull()
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsUdtTestDatabasePresent), nameof(DataTestUtility.AreConnStringsSetup))]
public void UDTParams_NullInput()
{
- string spInsertCustomer = DataTestUtility.GetUniqueNameForSqlServer("spUdtTest2_InsertCustomer");
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("UdtTest2_Customer");
+ string spInsertCustomer = DataTestUtility.GetLongName("spUdtTest2_InsertCustomer");
+ string tableName = DataTestUtility.GetLongName("UdtTest2_Customer");
using (SqlConnection conn = new SqlConnection(_connStr))
using (SqlCommand cmd = conn.CreateCommand())
@@ -232,8 +232,8 @@ public void UDTParams_NullInput()
[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsUdtTestDatabasePresent), nameof(DataTestUtility.AreConnStringsSetup))]
public void UDTParams_InputOutput()
{
- string spInsertCity = DataTestUtility.GetUniqueNameForSqlServer("spUdtTest2_InsertCity");
- string tableName = DataTestUtility.GetUniqueNameForSqlServer("UdtTest2");
+ string spInsertCity = DataTestUtility.GetLongName("spUdtTest2_InsertCity");
+ string tableName = DataTestUtility.GetLongName("UdtTest2");
using (SqlConnection conn = new SqlConnection(_connStr))
{
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Utf8SupportTest/Utf8SupportTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Utf8SupportTest/Utf8SupportTest.cs
index effecb35b3..41f81b12e3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Utf8SupportTest/Utf8SupportTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Utf8SupportTest/Utf8SupportTest.cs
@@ -37,7 +37,7 @@ public static void CheckSupportUtf8ConnectionProperty()
public static void UTF8databaseTest()
{
const string letters = @"!\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u007f€\u0081‚ƒ„…†‡ˆ‰Š‹Œ\u008dŽ\u008f\u0090‘’“”•–—˜™š›œ\u009džŸ ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ";
- string dbName = DataTestUtility.GetUniqueNameForSqlServer("UTF8databaseTest", false);
+ string dbName = DataTestUtility.GetLongName("UTF8databaseTest", false);
string tblName = "Table1";
SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionString);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs
index 119190f8c5..d905e15bc5 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs
@@ -57,15 +57,15 @@ public sealed class NativeVectorFloat32Tests : IDisposable
{
private readonly ITestOutputHelper _output;
private static readonly string s_connectionString = ManualTesting.Tests.DataTestUtility.TCPConnectionString;
- private static readonly string s_tableName = DataTestUtility.GetUniqueName("VectorTestTable");
- private static readonly string s_bulkCopySrcTableName = DataTestUtility.GetUniqueName("VectorBulkCopyTestTable");
+ private static readonly string s_tableName = DataTestUtility.GetShortName("VectorTestTable");
+ private static readonly string s_bulkCopySrcTableName = DataTestUtility.GetShortName("VectorBulkCopyTestTable");
private static readonly string s_bulkCopySrcTableDef = $@"(Id INT PRIMARY KEY IDENTITY, VectorData vector(3) NULL)";
private static readonly string s_tableDefinition = $@"(Id INT PRIMARY KEY IDENTITY, VectorData vector(3) NULL)";
private static readonly string s_selectCmdString = $"SELECT VectorData FROM {s_tableName} ORDER BY Id DESC";
private static readonly string s_insertCmdString = $"INSERT INTO {s_tableName} (VectorData) VALUES (@VectorData)";
private static readonly string s_vectorParamName = $"@VectorData";
private static readonly string s_outputVectorParamName = $"@OutputVectorData";
- private static readonly string s_storedProcName = DataTestUtility.GetUniqueName("VectorsAsVarcharSp");
+ private static readonly string s_storedProcName = DataTestUtility.GetShortName("VectorsAsVarcharSp");
private static readonly string s_storedProcBody = $@"
{s_vectorParamName} vector(3), -- Input: Serialized float[] as JSON string
{s_outputVectorParamName} vector(3) OUTPUT -- Output: Echoed back from latest inserted row
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs
index 402a2777f8..d38323b72f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs
@@ -17,14 +17,14 @@ public sealed class VectorTypeBackwardCompatibilityTests : IDisposable
{
private readonly ITestOutputHelper _output;
private static readonly string s_connectionString = ManualTesting.Tests.DataTestUtility.TCPConnectionString;
- private static readonly string s_tableName = DataTestUtility.GetUniqueName("VectorTestTable");
- private static readonly string s_bulkCopySrcTableName = DataTestUtility.GetUniqueName("VectorBulkCopyTestTable");
+ private static readonly string s_tableName = DataTestUtility.GetShortName("VectorTestTable");
+ private static readonly string s_bulkCopySrcTableName = DataTestUtility.GetShortName("VectorBulkCopyTestTable");
private static readonly string s_bulkCopySrcTableDef = $@"(Id INT PRIMARY KEY IDENTITY, VectorData varchar(max) NULL)";
private static readonly string s_tableDefinition = $@"(Id INT PRIMARY KEY IDENTITY, VectorData vector(3) NULL)";
private static readonly string s_selectCmdString = $"SELECT VectorData FROM {s_tableName} ORDER BY Id DESC";
private static readonly string s_insertCmdString = $"INSERT INTO {s_tableName} (VectorData) VALUES (@VectorData)";
private static readonly string s_vectorParamName = $"@VectorData";
- private static readonly string s_storedProcName = DataTestUtility.GetUniqueName("VectorsAsVarcharSp");
+ private static readonly string s_storedProcName = DataTestUtility.GetShortName("VectorsAsVarcharSp");
private static readonly string s_storedProcBody = $@"
@InputVectorJson VARCHAR(MAX), -- Input: Serialized float[] as JSON string
@OutputVectorJson VARCHAR(MAX) OUTPUT -- Output: Echoed back from latest inserted row