Complete removal of the System.Data.SqlClient.

- Enhancement: Remove `System.Data.SqlClient` reference from RepoDB.SqlServer [#857](#857) - Removed the `MicrosoftSqlServerTypeMapAttribute` attribute. - Removed the `SystemSqlServerTypeMapAttribute` attribute.
mikependon · Sep 24, 2021 · cadaf1e · cadaf1e
1 parent ccb38a8
commit cadaf1e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 195 deletions.
diff --git a/RepoDb.SqlServer/RepoDb.SqlServer.IntegrationTests/AttributeTest.cs b/RepoDb.SqlServer/RepoDb.SqlServer.IntegrationTests/AttributeTest.cs
@@ -1,6 +1,6 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using RepoDb.Attributes;
+using RepoDb.Attributes.Parameter.SqlServer;
 using RepoDb.Extensions;
 using RepoDb.SqlServer.IntegrationTests.Setup;
 using System;
@@ -35,40 +35,19 @@ public class MdsAttributeTable
         {
             public int Id { get; set; }
 
-            [MicrosoftSqlServerTypeMap(SqlDbType.UniqueIdentifier)]
+            [SqlDbType(SqlDbType.UniqueIdentifier)]
             public Guid SessionId { get; set; }
 
-            [MicrosoftSqlServerTypeMap(SqlDbType.Binary)]
+            [SqlDbType(SqlDbType.Binary)]
             public byte[] ColumnBinary { get; set; }
 
-            [MicrosoftSqlServerTypeMap(SqlDbType.BigInt)]
+            [SqlDbType(SqlDbType.BigInt)]
             public long ColumnBigInt { get; set; }
 
-            [MicrosoftSqlServerTypeMap(SqlDbType.DateTime2)]
+            [SqlDbType(SqlDbType.DateTime2)]
             public DateTime ColumnDateTime2 { get; set; }
 
-            [MicrosoftSqlServerTypeMap(SqlDbType.Text)]
-            public string ColumnNVarChar { get; set; }
-        }
-
-        [Table("CompleteTable")]
-        public class SdsAttributeTable
-        {
-            public int Id { get; set; }
-
-            [SystemSqlServerTypeMap(SqlDbType.UniqueIdentifier)]
-            public Guid SessionId { get; set; }
-
-            [SystemSqlServerTypeMap(SqlDbType.Binary)]
-            public byte[] ColumnBinary { get; set; }
-
-            [SystemSqlServerTypeMap(SqlDbType.BigInt)]
-            public long ColumnBigInt { get; set; }
-
-            [SystemSqlServerTypeMap(SqlDbType.DateTime2)]
-            public DateTime ColumnDateTime2 { get; set; }
-
-            [SystemSqlServerTypeMap(SqlDbType.Text)]
+            [SqlDbType(SqlDbType.Text)]
             public string ColumnNVarChar { get; set; }
         }
 
@@ -93,23 +72,6 @@ private IEnumerable<MdsAttributeTable> CreateMdsAttributeTables(int count = 10)
             }
         }
 
-        private IEnumerable<SdsAttributeTable> CreateSdsAttributeTables(int count = 10)
-        {
-            var random = new Random();
-            for (var i = 0; i < count; i++)
-            {
-                yield return new SdsAttributeTable
-                {
-                    Id = i,
-                    ColumnBigInt = Convert.ToInt64(random.Next(int.MaxValue)),
-                    ColumnBinary = Encoding.UTF8.GetBytes(Guid.NewGuid().ToString()),
-                    ColumnDateTime2 = DateTime.UtcNow.AddDays(-random.Next(100)),
-                    ColumnNVarChar = $"ColumnNVarChar-{i}-{Guid.NewGuid()}",
-                    SessionId = Guid.NewGuid()
-                };
-            }
-        }
-
         #endregion
 
         #region MDS
@@ -197,91 +159,5 @@ public void TestSqlConnectionForQueryAllForMicrosoftSqlServerTypeMapAttribute()
         }
 
         #endregion
-
-        #region SDS
-
-        [TestMethod]
-        public void TestSqlConnectionForInsertForSystemSqlServerTypeMapAttribute()
-        {
-            // Setup
-            var table = CreateSdsAttributeTables(1).First();
-
-            using (var connection = new System.Data.SqlClient.SqlConnection(Database.ConnectionString))
-            {
-                // Act
-                connection.Insert<SdsAttributeTable>(table);
-
-                // Assert
-                Assert.AreEqual(1, connection.CountAll<SdsAttributeTable>());
-
-                // Query
-                var queryResult = connection.QueryAll<SdsAttributeTable>().First();
-
-                // Assert
-                Helper.AssertPropertiesEquality(table, queryResult);
-            }
-        }
-
-        [TestMethod]
-        public void TestSqlConnectionForInsertAllForSystemSqlServerTypeMapAttribute()
-        {
-            // Setup
-            var tables = CreateSdsAttributeTables(10).AsList();
-
-            using (var connection = new System.Data.SqlClient.SqlConnection(Database.ConnectionString))
-            {
-                // Act
-                connection.InsertAll<SdsAttributeTable>(tables);
-
-                // Assert
-                Assert.AreEqual(tables.Count, connection.CountAll<SdsAttributeTable>());
-
-                // Query
-                var queryResult = connection.QueryAll<SdsAttributeTable>();
-
-                // Assert
-                tables.ForEach(table => Helper.AssertPropertiesEquality(table, queryResult.First(e => e.Id == table.Id)));
-            }
-        }
-
-        [TestMethod]
-        public void TestSqlConnectionForQueryForSystemSqlServerTypeMapAttribute()
-        {
-            // Setup
-            var table = CreateSdsAttributeTables(1).First();
-
-            using (var connection = new System.Data.SqlClient.SqlConnection(Database.ConnectionString))
-            {
-                // Act
-                var id = connection.Insert<SdsAttributeTable>(table);
-
-                // Query
-                var queryResult = connection.Query<SdsAttributeTable>(id).First();
-
-                // Assert
-                Helper.AssertPropertiesEquality(table, queryResult);
-            }
-        }
-
-        [TestMethod]
-        public void TestSqlConnectionForQueryAllForSystemSqlServerTypeMapAttribute()
-        {
-            // Setup
-            var tables = CreateSdsAttributeTables(10).AsList();
-
-            using (var connection = new System.Data.SqlClient.SqlConnection(Database.ConnectionString))
-            {
-                // Act
-                connection.InsertAll<SdsAttributeTable>(tables);
-
-                // Query
-                var queryResult = connection.QueryAll<SdsAttributeTable>();
-
-                // Assert
-                Assert.AreEqual(tables.Count, queryResult.Count());
-            }
-        }
-
-        #endregion
     }
 }
diff --git a/RepoDb.SqlServer/RepoDb.SqlServer.IntegrationTests/MaxSizesTest.cs b/RepoDb.SqlServer/RepoDb.SqlServer.IntegrationTests/MaxSizesTest.cs
@@ -1,10 +1,10 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.Data.SqlClient;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using RepoDb.Attributes;
 using RepoDb.Extensions;
 using RepoDb.SqlServer.IntegrationTests.Setup;
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
 

diff --git a/RepoDb.SqlServer/RepoDb.SqlServer/Attributes/MicrosoftSqlServerTypeMapAttribute.cs b/RepoDb.SqlServer/RepoDb.SqlServer/Attributes/MicrosoftSqlServerTypeMapAttribute.cs
diff --git a/RepoDb.SqlServer/RepoDb.SqlServer/Attributes/SystemSqlServerTypeMapAttribute.cs b/RepoDb.SqlServer/RepoDb.SqlServer/Attributes/SystemSqlServerTypeMapAttribute.cs
diff --git a/RepoDb.SqlServer/RepoDb.SqlServer/RepoDb.SqlServer.csproj b/RepoDb.SqlServer/RepoDb.SqlServer/RepoDb.SqlServer.csproj
@@ -17,7 +17,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" />
     <PackageReference Include="RepoDb" Version="1.12.8" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/RepoDb.SqlServer/RepoDb.SqlServer/SqlServerBootstrap.cs b/RepoDb.SqlServer/RepoDb.SqlServer/SqlServerBootstrap.cs
@@ -1,11 +1,12 @@
-using RepoDb.DbHelpers;
+using Microsoft.Data.SqlClient;
+using RepoDb.DbHelpers;
 using RepoDb.DbSettings;
 using RepoDb.StatementBuilders;
 
 namespace RepoDb
 {
     /// <summary>
-    /// A class that is used to initialize the necessary settings for both the <see cref="Microsoft.Data.SqlClient.SqlConnection"/> and <see cref="System.Data.SqlClient.SqlConnection"/> objects.
+    /// A class that is being used to initialize the necessary settings for the <see cref="SqlConnection"/> object.
     /// </summary>
     public static class SqlServerBootstrap
     {
@@ -21,7 +22,7 @@ public static class SqlServerBootstrap
         #region Methods
 
         /// <summary>
-        /// Initializes all necessary settings for SqlServer.
+        /// Initializes all the necessary settings for SQL Server.
         /// </summary>
         public static void Initialize()
         {
@@ -33,18 +34,15 @@ public static void Initialize()
 
             // Map the DbSetting
             var dbSetting = new SqlServerDbSetting();
-            DbSettingMapper.Add<Microsoft.Data.SqlClient.SqlConnection>(dbSetting, true);
-            DbSettingMapper.Add<System.Data.SqlClient.SqlConnection>(dbSetting, true);
+            DbSettingMapper.Add<SqlConnection>(dbSetting, true);
 
             // Map the DbHelper
             var dbHelper = new SqlServerDbHelper();
-            DbHelperMapper.Add<Microsoft.Data.SqlClient.SqlConnection>(dbHelper, true);
-            DbHelperMapper.Add<System.Data.SqlClient.SqlConnection>(dbHelper, true);
+            DbHelperMapper.Add<SqlConnection>(dbHelper, true);
 
             // Map the Statement Builder
             var statementBuilder = new SqlServerStatementBuilder(dbSetting);
-            StatementBuilderMapper.Add<Microsoft.Data.SqlClient.SqlConnection>(statementBuilder, true);
-            StatementBuilderMapper.Add<System.Data.SqlClient.SqlConnection>(statementBuilder, true);
+            StatementBuilderMapper.Add<SqlConnection>(statementBuilder, true);
 
             // Set the flag
             IsInitialized = true;