Revert "User Story 38481: Fix unique db object name issues"

This reverts commit 82ce7cf.

Author: paulmedynski

src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs

@@ -148,8 +148,8 @@ public void SqlParameterProperties(string connection)
             const string firstColumnName = @"firstColumn";
             const string secondColumnName = @"secondColumn";
             const string thirdColumnName = @"thirdColumn";
-            string inputProcedureName = DataTestUtility.GetShortName("InputProc").ToString();
-            string outputProcedureName = DataTestUtility.GetShortName("OutputProc").ToString();
+            string inputProcedureName = DataTestUtility.GetUniqueName("InputProc").ToString();
+            string outputProcedureName = DataTestUtility.GetUniqueName("OutputProc").ToString();
             const int charColumnSize = 100;
             const int decimalColumnPrecision = 10;
             const int decimalColumnScale = 4;
@@ -694,7 +694,7 @@ public void TestExecuteReader(string connection)
         [ClassData(typeof(AEConnectionStringProvider))]
         public async void TestExecuteReaderAsyncWithLargeQuery(string connectionString)
         {
-            string randomName = DataTestUtility.GetShortName(Guid.NewGuid().ToString().Replace("-", ""), false);
+            string randomName = DataTestUtility.GetUniqueName(Guid.NewGuid().ToString().Replace("-", ""), false);
             if (randomName.Length > 50)
             {
                 randomName = randomName.Substring(0, 50);
@@ -878,8 +878,8 @@ public void TestEnclaveStoredProceduresWithAndWithoutParameters(string connectio
             using SqlCommand sqlCommand = new("", sqlConnection, transaction: null,
                 columnEncryptionSetting: SqlCommandColumnEncryptionSetting.Enabled);
 
-            string procWithoutParams = DataTestUtility.GetShortName("EnclaveWithoutParams", withBracket: false);
-            string procWithParam = DataTestUtility.GetShortName("EnclaveWithParams", withBracket: false);
+            string procWithoutParams = DataTestUtility.GetUniqueName("EnclaveWithoutParams", withBracket: false);
+            string procWithParam = DataTestUtility.GetUniqueName("EnclaveWithParams", withBracket: false);
 
             try
             {

src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs

@@ -157,6 +157,55 @@ public void TestRoundTripWithCSPAndCertStoreProvider()
             }
         }
 
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringSetupForAE))]
+        [ClassData(typeof(AEConnectionStringProvider))]
+        public void TestEncryptDecryptWithCSP(string connectionString)
+        {
+            string providerName = @"Microsoft Enhanced RSA and AES Cryptographic Provider";
+            string keyIdentifier = DataTestUtility.GetUniqueNameForSqlServer("CSP");
+
+            try
+            {
+                CertificateUtilityWin.RSAPersistKeyInCsp(providerName, keyIdentifier);
+                string cspPath = String.Concat(providerName, @"/", keyIdentifier);
+
+                SQLSetupStrategyCspExt sqlSetupStrategyCsp = new SQLSetupStrategyCspExt(cspPath);
+                string tableName = sqlSetupStrategyCsp.CspProviderTable.Name;
+
+                try
+                {
+                    using SqlConnection sqlConn = new(connectionString);
+                    sqlConn.Open();
+
+                    Table.DeleteData(tableName, sqlConn);
+
+                    // insert 1 row data
+                    Customer customer = new Customer(45, "Microsoft", "Corporation");
+
+                    DatabaseHelper.InsertCustomerData(sqlConn, null, tableName, customer);
+
+                    // Test INPUT parameter on an encrypted parameter
+                    using SqlCommand sqlCommand = new(@$"SELECT CustomerId, FirstName, LastName FROM [{tableName}] WHERE FirstName = @firstName",
+                                                                sqlConn, null, SqlCommandColumnEncryptionSetting.Enabled);
+                    SqlParameter customerFirstParam = sqlCommand.Parameters.AddWithValue(@"firstName", @"Microsoft");
+                    Console.WriteLine(@"Exception: {0}");
+                    customerFirstParam.Direction = System.Data.ParameterDirection.Input;
+
+                    using SqlDataReader sqlDataReader = sqlCommand.ExecuteReader();
+                    ValidateResultSet(sqlDataReader);
+                }
+                finally
+                {
+                    // clean up database resources
+                    sqlSetupStrategyCsp.Dispose();
+                }
+            }
+            finally
+            {
+                CertificateUtilityWin.RSADeleteKeyInCsp(providerName, keyIdentifier);
+            }
+        }
+
         /// <summary>
         /// Validates that the results are the ones expected.
         /// </summary>

src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs

@@ -88,7 +88,7 @@ public static bool TcpConnectionStringDoesNotUseAadAuth
         {
             get
             {
-                SqlConnectionStringBuilder builder = new(TCPConnectionString);
+                SqlConnectionStringBuilder builder = new (TCPConnectionString);
                 return builder.Authentication == SqlAuthenticationMethod.SqlPassword || builder.Authentication == SqlAuthenticationMethod.NotSpecified;
             }
         }
@@ -415,176 +415,48 @@ 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);
-        }
-
         /// <summary>
-        /// Generate a short unique database object name, whose maximum length
-        /// is 30 characters, with the format:
-        ///
-        ///   <Prefix>_<GuidParts>
-        ///
-        /// 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.
+        /// Generate a unique name to use in Sql Server; 
+        /// some providers does not support names (Oracle supports up to 30).
         /// </summary>
-        /// 
-        /// <param name="prefix">
-        /// 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
-        /// </param>
-        /// 
-        /// <param name="withBracket">
-        /// When true, the entire generated name will be enclosed in square
-        /// brackets, for example:
-        /// 
-        ///   [MyPrefix_7ff01cb811f0]
-        /// </param>
-        /// 
-        /// <returns>
-        /// A unique database object name, no more than 30 characters long.
-        /// </returns>
-        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();
+        /// <param name="prefix">The name length will be no more then (16 + prefix.Length + escapeLeft.Length + escapeRight.Length).</param>
+        /// <param name="withBracket">Name without brackets.</param>
+        /// <returns>Unique name by considering the Sql Server naming rules.</returns>
+        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;
         }
 
         /// <summary>
-        /// Generate a long unique database object name, whose maximum length is
-        /// 96 characters, with the format:
-        /// 
-        ///   <Prefix>_<GuidParts>_<UserName>_<MachineName>
-        ///
-        /// 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.
+        /// 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.
         /// </summary>
-        /// 
-        /// <param name="prefix">
-        /// 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
-        /// </param>
-        /// 
-        /// <param name="withBracket">
-        /// When true, the entire generated name will be enclosed in square
-        /// brackets, for example:
-        /// 
-        ///   [MyPrefix_7ff01cb811f0_test_user_ci_agent_machine_name]
-        /// </param>
-        /// 
-        /// <returns>
-        /// A unique database object name, no more than 96 characters long.
-        /// </returns>
-        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.ToString();
+        /// <param name="prefix">Add the prefix to the generate string.</param>
+        /// <param name="withBracket">Database name must be pass with brackets by default.</param>
+        /// <returns>Unique name by considering the Sql Server naming rules.</returns>
+        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);
+            if (name.Length > 128)
+            {
+                throw new ArgumentOutOfRangeException("the name is too long - SQL Server names are limited to 128");
+            }
+            return name;
         }
 
         public static bool IsSupportingDistributedTransactions()

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.GetLongName("table");
+            string tempTable = DataTestUtility.GetUniqueNameForSqlServer("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.GetLongName("SqlBuffer_GetFieldValue");
+            string tableName = DataTestUtility.GetUniqueNameForSqlServer("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.GetLongName("SqlBuffer_GetFieldValue_Async");
+            string tableName = DataTestUtility.GetUniqueNameForSqlServer("SqlBuffer_GetFieldValue_Async");
             DateTimeOffset dtoffset = DateTimeOffset.Now;
             DateTime dt = DateTime.Now;
             //Exclude the millisecond because of rounding at some points by SQL Server.

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.GetShortName("AdapterTest");
+            _tempTable = DataTestUtility.GetUniqueName("AdapterTest");
             _tempTable = _tempTable.Replace('-', '_');
 
             _randomGuid = Guid.NewGuid().ToString();
@@ -487,7 +487,7 @@ public void ParameterTest_AllTypes()
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public void ParameterTest_InOut()
         {
-            string procName = DataTestUtility.GetShortName("P");
+            string procName = DataTestUtility.GetUniqueName("P");
             // input, output
             string spCreateInOut =
                 "CREATE PROCEDURE " + procName + " @in int, @inout int OUTPUT, @out nvarchar(8) OUTPUT " +
@@ -768,13 +768,13 @@ public void BulkUpdateTest()
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public void UpdateRefreshTest()
         {
-            string identTableName = DataTestUtility.GetShortName("ID_");
+            string identTableName = DataTestUtility.GetUniqueName("ID_");
             string createIdentTable =
                 $"CREATE TABLE {identTableName} (id int IDENTITY," +
                 "LastName nvarchar(50) NULL," +
                 "Firstname nvarchar(50) NULL)";
 
-            string spName = DataTestUtility.GetShortName("sp_insert", withBracket: false);
+            string spName = DataTestUtility.GetUniqueName("sp_insert", withBracket: false);
             string spCreateInsert =
                 $"CREATE PROCEDURE {spName}" +
                 "(@FirstName nvarchar(50), @LastName nvarchar(50), @id int OUTPUT) " +
@@ -1087,7 +1087,7 @@ public void AutoGenUpdateTest()
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public void AutoGenErrorTest()
         {
-            string identTableName = DataTestUtility.GetShortName("ID_");
+            string identTableName = DataTestUtility.GetUniqueName("ID_");
             string createIdentTable =
                 $"CREATE TABLE {identTableName} (id int IDENTITY," +
                 "LastName nvarchar(50) NULL," +