Enhancement tasks for json support (#2891)

deepaksa1 · web-flow · commit cc58d7923952 · 2024-10-01T00:42:28.000+05:30
* some enhancements tasks for json support

* added some missing drop table funtion

* remove unique naming for tables and SPs
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
@@ -1365,9 +1365,7 @@ private void Login(ServerInfo server, TimeoutTimer timeout, string newPassword,
 
             // The SQLDNSCaching feature is implicitly set
             requestedFeatures |= TdsEnums.FeatureExtension.SQLDNSCaching;
-#if DEBUG
             requestedFeatures |= TdsEnums.FeatureExtension.JsonSupport;
-#endif
             _parser.TdsLogin(login, requestedFeatures, _recoverySessionData, _fedAuthFeatureExtensionData, encrypt);
         }
 
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
@@ -1641,9 +1641,7 @@ private void Login(ServerInfo server, TimeoutTimer timeout, string newPassword,
             // The SQLDNSCaching feature is implicitly set
             requestedFeatures |= TdsEnums.FeatureExtension.SQLDNSCaching;
 
-#if DEBUG
             requestedFeatures |= TdsEnums.FeatureExtension.JsonSupport;
-#endif
 
             _parser.TdsLogin(login, requestedFeatures, _recoverySessionData, _fedAuthFeatureExtensionData, _originalNetworkAddressInfo, encrypt);
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs
@@ -64,11 +64,10 @@ private void ValidateSchema(SqlDataReader reader)
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]
         public void TestJsonWrite()
-        {       
-            string tableName = DataTestUtility.GetUniqueNameForSqlServer("Json_Test");
-            string spName = DataTestUtility.GetUniqueNameForSqlServer("spJson_WriteTest");
-           
-            string tableCreate = "CREATE TABLE " + tableName + " (Data json)";
+        {
+            string tableName = "jsonWriteTest";
+            string spName = "spJsonWriteTest";
+
             string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";
             string spCreate = "CREATE PROCEDURE " + spName + " (@jsonData json) AS " + tableInsert;
 
@@ -79,10 +78,10 @@ public void TestJsonWrite()
                 using (SqlCommand command = connection.CreateCommand())
                 {
                     //Create Table
-                    command.CommandText = tableCreate;
-                    command.ExecuteNonQuery();
+                    DataTestUtility.CreateTable(connection, tableName, "(data json)");
 
                     //Create SP for writing json values
+                    DataTestUtility.DropStoredProcedure(connection, spName);
                     command.CommandText = spCreate;
                     command.ExecuteNonQuery();
 
@@ -116,17 +115,17 @@ public void TestJsonWrite()
                     }
 
                     DataTestUtility.DropTable(connection, tableName);
+                    DataTestUtility.DropStoredProcedure(connection, spName);
                 }
             }
         }
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]
         public async Task TestJsonWriteAsync()
         {
-            string tableName = DataTestUtility.GetUniqueNameForSqlServer("Json_Test");
-            string spName = DataTestUtility.GetUniqueNameForSqlServer("spJson_WriteTest");
+            string tableName = "jsonWriteTest";
+            string spName = "spJsonWriteTest";
 
-            string tableCreate = "CREATE TABLE " + tableName + " (Data json)";
             string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";
             string spCreate = "CREATE PROCEDURE " + spName + " (@jsonData json) AS " + tableInsert;
 
@@ -137,10 +136,10 @@ public async Task TestJsonWriteAsync()
                 using (SqlCommand command = connection.CreateCommand())
                 {
                     //Create Table
-                    command.CommandText = tableCreate;
-                    await command.ExecuteNonQueryAsync();
+                    DataTestUtility.CreateTable(connection, tableName, "(data json)");
 
                     //Create SP for writing json values
+                    DataTestUtility.DropStoredProcedure(connection, spName);
                     command.CommandText = spCreate;
                     await command.ExecuteNonQueryAsync();
 
@@ -172,31 +171,33 @@ public async Task TestJsonWriteAsync()
                         int rowsAffected3 = await command.ExecuteNonQueryAsync();
                         ValidateRowsAffected(rowsAffected3);
                     }
+
+                    DataTestUtility.DropTable(connection, tableName);
+                    DataTestUtility.DropStoredProcedure(connection, spName);
                 }
             }
         }
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]
         public void TestJsonRead()
         {
-            string tableName = DataTestUtility.GetUniqueNameForSqlServer("Json_Test");
-            string spName = DataTestUtility.GetUniqueNameForSqlServer("spJson_ReadTest");
+            string tableName = "jsonReadTest";
+            string spName = "spJsonReadTest";
 
-            string tableCreate = "CREATE TABLE " + tableName + " (Data json)";
             string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";
             string tableRead = "SELECT * FROM " + tableName;
-            string spCreate = "CREATE PROCEDURE " + spName + "AS " + tableRead;
+            string spCreate = "CREATE PROCEDURE " + spName + " AS " + tableRead;
 
             using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))
             {
                 connection.Open();
                 using (SqlCommand command = connection.CreateCommand())
                 {
                     //Create Table
-                    command.CommandText = tableCreate;
-                    command.ExecuteNonQuery();
+                    DataTestUtility.CreateTable(connection, tableName, "(data json)");
 
                     //Create SP for reading from json column
+                    DataTestUtility.DropStoredProcedure(connection, spName);
                     command.CommandText = spCreate;
                     command.ExecuteNonQuery();
 
@@ -231,31 +232,31 @@ public void TestJsonRead()
                     }
 
                     DataTestUtility.DropTable(connection, tableName);
+                    DataTestUtility.DropStoredProcedure(connection, spName);
                 }
             }
         }
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]
         public async Task TestJsonReadAsync()
         {
-            string tableName = DataTestUtility.GetUniqueNameForSqlServer("Json_Test");
-            string spName = DataTestUtility.GetUniqueNameForSqlServer("spJson_ReadTest");
+            string tableName = "jsonReadTest";
+            string spName = "spJsonReadTest";
 
-            string tableCreate = "CREATE TABLE " + tableName + " (Data json)";
             string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";
             string tableRead = "SELECT * FROM " + tableName;
-            string spCreate = "CREATE PROCEDURE " + spName + "AS " + tableRead;
+            string spCreate = "CREATE PROCEDURE " + spName + " AS " + tableRead;
 
             using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))
             {
                 await connection.OpenAsync();
                 using (SqlCommand command = connection.CreateCommand())
                 {
                     //Create Table
-                    command.CommandText = tableCreate;
-                    await command.ExecuteNonQueryAsync();
+                    DataTestUtility.CreateTable(connection, tableName, "(data json)");
 
                     //Create SP for reading from json column
+                    DataTestUtility.DropStoredProcedure(connection, spName);
                     command.CommandText = spCreate;
                     await command.ExecuteNonQueryAsync();
 
@@ -288,6 +289,9 @@ public async Task TestJsonReadAsync()
                         await ValidateRowsAsync(reader2);
                         reader2.Close();
                     }
+
+                    DataTestUtility.DropTable(connection, tableName);
+                    DataTestUtility.DropStoredProcedure(connection, spName);
                 }
             }
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTDSServer.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTDSServer.cs
@@ -232,14 +232,12 @@ public virtual TDSMessageCollection OnLogin7Request(ITDSServerSession session, T
 
                                 break;
                             }
-#if DEBUG
                         case TDSFeatureID.JsonSupport:
                             {
                                 // Enable Json Support
                                 session.IsJsonSupportEnabled = true;
                                 break;
                             }
-#endif
                         default:
                             {
                                 // Do nothing
@@ -552,7 +550,6 @@ protected virtual TDSMessageCollection OnAuthenticationCompleted(ITDSServerSessi
                 responseMessage.Add(featureExtActToken);
             }
 
-#if DEBUG
             // Check if Json is supported
             if (session.IsJsonSupportEnabled)
             {
@@ -578,7 +575,6 @@ protected virtual TDSMessageCollection OnAuthenticationCompleted(ITDSServerSessi
                     featureExtAckToken.Options.Add(jsonSupportOption);
                 }
             }
-#endif
 
             // Create DONE token
             TDSDoneToken doneToken = new TDSDoneToken(TDSDoneTokenStatusType.Final);

Original file line number	Diff line number	Diff line change
`@@ -1365,9 +1365,7 @@ private void Login(ServerInfo server, TimeoutTimer timeout, string newPassword,`
`1365`	`1365`
`1366`	`1366`	`// The SQLDNSCaching feature is implicitly set`
`1367`	`1367`	`requestedFeatures \|= TdsEnums.FeatureExtension.SQLDNSCaching;`
`1368`		`-#if DEBUG`
`1369`	`1368`	`requestedFeatures \|= TdsEnums.FeatureExtension.JsonSupport;`
`1370`		`-#endif`
`1371`	`1369`	`_parser.TdsLogin(login, requestedFeatures, _recoverySessionData, _fedAuthFeatureExtensionData, encrypt);`
`1372`	`1370`	`}`
`1373`	`1371`
Original file line number	Diff line number	Diff line change
`@@ -1641,9 +1641,7 @@ private void Login(ServerInfo server, TimeoutTimer timeout, string newPassword,`
`1641`	`1641`	`// The SQLDNSCaching feature is implicitly set`
`1642`	`1642`	`requestedFeatures \|= TdsEnums.FeatureExtension.SQLDNSCaching;`
`1643`	`1643`
`1644`		`-#if DEBUG`
`1645`	`1644`	`requestedFeatures \|= TdsEnums.FeatureExtension.JsonSupport;`
`1646`		`-#endif`
`1647`	`1645`
`1648`	`1646`	`_parser.TdsLogin(login, requestedFeatures, _recoverySessionData, _fedAuthFeatureExtensionData, _originalNetworkAddressInfo, encrypt);`
`1649`	`1647`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,10 @@ private void ValidateSchema(SqlDataReader reader)`
`64`	`64`
`65`	`65`	`[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]`
`66`	`66`	`public void TestJsonWrite()`
`67`		`- {`
`68`		`- string tableName = DataTestUtility.GetUniqueNameForSqlServer("Json_Test");`
`69`		`- string spName = DataTestUtility.GetUniqueNameForSqlServer("spJson_WriteTest");`
`70`		`-`
`71`		`- string tableCreate = "CREATE TABLE " + tableName + " (Data json)";`
	`67`	`+ {`
	`68`	`+ string tableName = "jsonWriteTest";`
	`69`	`+ string spName = "spJsonWriteTest";`
	`70`	`+`
`72`	`71`	`string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";`
`73`	`72`	`string spCreate = "CREATE PROCEDURE " + spName + " (@jsonData json) AS " + tableInsert;`
`74`	`73`
`@@ -79,10 +78,10 @@ public void TestJsonWrite()`
`79`	`78`	`using (SqlCommand command = connection.CreateCommand())`
`80`	`79`	`{`
`81`	`80`	`//Create Table`
`82`		`- command.CommandText = tableCreate;`
`83`		`- command.ExecuteNonQuery();`
	`81`	`+ DataTestUtility.CreateTable(connection, tableName, "(data json)");`
`84`	`82`
`85`	`83`	`//Create SP for writing json values`
	`84`	`+ DataTestUtility.DropStoredProcedure(connection, spName);`
`86`	`85`	`command.CommandText = spCreate;`
`87`	`86`	`command.ExecuteNonQuery();`
`88`	`87`
`@@ -116,17 +115,17 @@ public void TestJsonWrite()`
`116`	`115`	`}`
`117`	`116`
`118`	`117`	`DataTestUtility.DropTable(connection, tableName);`
	`118`	`+ DataTestUtility.DropStoredProcedure(connection, spName);`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]`
`124`	`124`	`public async Task TestJsonWriteAsync()`
`125`	`125`	`{`
`126`		`- string tableName = DataTestUtility.GetUniqueNameForSqlServer("Json_Test");`
`127`		`- string spName = DataTestUtility.GetUniqueNameForSqlServer("spJson_WriteTest");`
	`126`	`+ string tableName = "jsonWriteTest";`
	`127`	`+ string spName = "spJsonWriteTest";`
`128`	`128`
`129`		`- string tableCreate = "CREATE TABLE " + tableName + " (Data json)";`
`130`	`129`	`string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";`
`131`	`130`	`string spCreate = "CREATE PROCEDURE " + spName + " (@jsonData json) AS " + tableInsert;`
`132`	`131`
`@@ -137,10 +136,10 @@ public async Task TestJsonWriteAsync()`
`137`	`136`	`using (SqlCommand command = connection.CreateCommand())`
`138`	`137`	`{`
`139`	`138`	`//Create Table`
`140`		`- command.CommandText = tableCreate;`
`141`		`- await command.ExecuteNonQueryAsync();`
	`139`	`+ DataTestUtility.CreateTable(connection, tableName, "(data json)");`
`142`	`140`
`143`	`141`	`//Create SP for writing json values`
	`142`	`+ DataTestUtility.DropStoredProcedure(connection, spName);`
`144`	`143`	`command.CommandText = spCreate;`
`145`	`144`	`await command.ExecuteNonQueryAsync();`
`146`	`145`
`@@ -172,31 +171,33 @@ public async Task TestJsonWriteAsync()`
`172`	`171`	`int rowsAffected3 = await command.ExecuteNonQueryAsync();`
`173`	`172`	`ValidateRowsAffected(rowsAffected3);`
`174`	`173`	`}`
	`174`	`+`
	`175`	`+ DataTestUtility.DropTable(connection, tableName);`
	`176`	`+ DataTestUtility.DropStoredProcedure(connection, spName);`
`175`	`177`	`}`
`176`	`178`	`}`
`177`	`179`	`}`
`178`	`180`
`179`	`181`	`[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]`
`180`	`182`	`public void TestJsonRead()`
`181`	`183`	`{`
`182`		`- string tableName = DataTestUtility.GetUniqueNameForSqlServer("Json_Test");`
`183`		`- string spName = DataTestUtility.GetUniqueNameForSqlServer("spJson_ReadTest");`
	`184`	`+ string tableName = "jsonReadTest";`
	`185`	`+ string spName = "spJsonReadTest";`
`184`	`186`
`185`		`- string tableCreate = "CREATE TABLE " + tableName + " (Data json)";`
`186`	`187`	`string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";`
`187`	`188`	`string tableRead = "SELECT * FROM " + tableName;`
`188`		`- string spCreate = "CREATE PROCEDURE " + spName + "AS " + tableRead;`
	`189`	`+ string spCreate = "CREATE PROCEDURE " + spName + " AS " + tableRead;`
`189`	`190`
`190`	`191`	`using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))`
`191`	`192`	`{`
`192`	`193`	`connection.Open();`
`193`	`194`	`using (SqlCommand command = connection.CreateCommand())`
`194`	`195`	`{`
`195`	`196`	`//Create Table`
`196`		`- command.CommandText = tableCreate;`
`197`		`- command.ExecuteNonQuery();`
	`197`	`+ DataTestUtility.CreateTable(connection, tableName, "(data json)");`
`198`	`198`
`199`	`199`	`//Create SP for reading from json column`
	`200`	`+ DataTestUtility.DropStoredProcedure(connection, spName);`
`200`	`201`	`command.CommandText = spCreate;`
`201`	`202`	`command.ExecuteNonQuery();`
`202`	`203`
`@@ -231,31 +232,31 @@ public void TestJsonRead()`
`231`	`232`	`}`
`232`	`233`
`233`	`234`	`DataTestUtility.DropTable(connection, tableName);`
	`235`	`+ DataTestUtility.DropStoredProcedure(connection, spName);`
`234`	`236`	`}`
`235`	`237`	`}`
`236`	`238`	`}`
`237`	`239`
`238`	`240`	`[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]`
`239`	`241`	`public async Task TestJsonReadAsync()`
`240`	`242`	`{`
`241`		`- string tableName = DataTestUtility.GetUniqueNameForSqlServer("Json_Test");`
`242`		`- string spName = DataTestUtility.GetUniqueNameForSqlServer("spJson_ReadTest");`
	`243`	`+ string tableName = "jsonReadTest";`
	`244`	`+ string spName = "spJsonReadTest";`
`243`	`245`
`244`		`- string tableCreate = "CREATE TABLE " + tableName + " (Data json)";`
`245`	`246`	`string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";`
`246`	`247`	`string tableRead = "SELECT * FROM " + tableName;`
`247`		`- string spCreate = "CREATE PROCEDURE " + spName + "AS " + tableRead;`
	`248`	`+ string spCreate = "CREATE PROCEDURE " + spName + " AS " + tableRead;`
`248`	`249`
`249`	`250`	`using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))`
`250`	`251`	`{`
`251`	`252`	`await connection.OpenAsync();`
`252`	`253`	`using (SqlCommand command = connection.CreateCommand())`
`253`	`254`	`{`
`254`	`255`	`//Create Table`
`255`		`- command.CommandText = tableCreate;`
`256`		`- await command.ExecuteNonQueryAsync();`
	`256`	`+ DataTestUtility.CreateTable(connection, tableName, "(data json)");`
`257`	`257`
`258`	`258`	`//Create SP for reading from json column`
	`259`	`+ DataTestUtility.DropStoredProcedure(connection, spName);`
`259`	`260`	`command.CommandText = spCreate;`
`260`	`261`	`await command.ExecuteNonQueryAsync();`
`261`	`262`
`@@ -288,6 +289,9 @@ public async Task TestJsonReadAsync()`
`288`	`289`	`await ValidateRowsAsync(reader2);`
`289`	`290`	`reader2.Close();`
`290`	`291`	`}`
	`292`	`+`
	`293`	`+ DataTestUtility.DropTable(connection, tableName);`
	`294`	`+ DataTestUtility.DropStoredProcedure(connection, spName);`
`291`	`295`	`}`
`292`	`296`	`}`
`293`	`297`	`}`
Original file line number	Diff line number	Diff line change
`@@ -232,14 +232,12 @@ public virtual TDSMessageCollection OnLogin7Request(ITDSServerSession session, T`
`232`	`232`
`233`	`233`	`break;`
`234`	`234`	`}`
`235`		`-#if DEBUG`
`236`	`235`	`case TDSFeatureID.JsonSupport:`
`237`	`236`	`{`
`238`	`237`	`// Enable Json Support`
`239`	`238`	`session.IsJsonSupportEnabled = true;`
`240`	`239`	`break;`
`241`	`240`	`}`
`242`		`-#endif`
`243`	`241`	`default:`
`244`	`242`	`{`
`245`	`243`	`// Do nothing`
`@@ -552,7 +550,6 @@ protected virtual TDSMessageCollection OnAuthenticationCompleted(ITDSServerSessi`
`552`	`550`	`responseMessage.Add(featureExtActToken);`
`553`	`551`	`}`
`554`	`552`
`555`		`-#if DEBUG`
`556`	`553`	`// Check if Json is supported`
`557`	`554`	`if (session.IsJsonSupportEnabled)`
`558`	`555`	`{`
`@@ -578,7 +575,6 @@ protected virtual TDSMessageCollection OnAuthenticationCompleted(ITDSServerSessi`
`578`	`575`	`featureExtAckToken.Options.Add(jsonSupportOption);`
`579`	`576`	`}`
`580`	`577`	`}`
`581`		`-#endif`
`582`	`578`
`583`	`579`	`// Create DONE token`
`584`	`580`	`TDSDoneToken doneToken = new TDSDoneToken(TDSDoneTokenStatusType.Final);`