Interfaces are back, simplifying code.

Related issue: DapperLib#520
pada57 · May 24, 2016 · 8e070dd · 8e070dd
1 parent 96e07ce
commit 8e070dd
Show file tree

Hide file tree

Showing 36 changed files with 11 additions and 366 deletions.
diff --git a/Dapper.Contrib/SqlMapperExtensions.Async.cs b/Dapper.Contrib/SqlMapperExtensions.Async.cs
@@ -1,19 +1,13 @@
 #if ASYNC
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Dapper;
 
-#if COREFX
-using IDbTransaction = System.Data.Common.DbTransaction;
-using IDbConnection = System.Data.Common.DbConnection;
-using DataException = System.InvalidOperationException;
-#else
-using System.Data;
-#endif
 
 namespace Dapper.Contrib.Extensions
 {

diff --git a/Dapper.Contrib/SqlMapperExtensions.cs b/Dapper.Contrib/SqlMapperExtensions.cs
@@ -10,8 +10,6 @@
 using Dapper;
 
 #if COREFX
-using IDbTransaction = System.Data.Common.DbTransaction;
-using IDbConnection = System.Data.Common.DbConnection;
 using DataException = System.InvalidOperationException;
 #else
 using System.Threading;

diff --git a/Dapper.Rainbow/Database.Async.cs b/Dapper.Rainbow/Database.Async.cs
@@ -6,10 +6,6 @@
 using System.Text;
 using System.Threading.Tasks;
 
-#if COREFX
-using IDbTransaction = System.Data.Common.DbTransaction;
-#endif
-
 namespace Dapper
 {
     public abstract partial class Database<TDatabase> where TDatabase : Database<TDatabase>, new()

diff --git a/Dapper.Rainbow/Database.cs b/Dapper.Rainbow/Database.cs
@@ -8,10 +8,6 @@
 using System.Data.Common;
 using System.Reflection.Emit;
 
-#if COREFX
-using IDbTransaction = System.Data.Common.DbTransaction;
-#endif
-
 namespace Dapper
 {
     /// <summary>

diff --git a/Dapper.Tests.Contrib/TestSuite.cs b/Dapper.Tests.Contrib/TestSuite.cs
@@ -5,10 +5,7 @@
 
 using Dapper.Contrib.Extensions;
 
-#if COREFX
-using System.Reflection;
-using IDbConnection = System.Data.Common.DbConnection;
-#else
+#if !COREFX
 using System.Data.SqlServerCe;
 using System.Transactions;
 #endif

diff --git a/Dapper.Tests.Contrib/TestSuites.cs b/Dapper.Tests.Contrib/TestSuites.cs
@@ -6,7 +6,6 @@
 using Xunit.Sdk;
 #if COREFX
 using Microsoft.Data.Sqlite;
-using IDbConnection = System.Data.Common.DbConnection;
 #else
 using System.Data.SQLite;
 using System.Data.SqlServerCe;

diff --git a/Dapper.Tests/Tests.Async.cs b/Dapper.Tests/Tests.Async.cs
@@ -8,10 +8,6 @@
 using System.Data.SqlClient;
 using Xunit;
 
-#if COREFX
-using IDbConnection = System.Data.Common.DbConnection;
-#endif
-
 namespace Dapper.Tests
 {
     public partial class TestSuite

diff --git a/Dapper.Tests/Tests.Constructors.cs b/Dapper.Tests/Tests.Constructors.cs
@@ -4,14 +4,6 @@
 using System.Linq;
 using Xunit;
 
-#if COREFX
-using IDbCommand = System.Data.Common.DbCommand;
-using IDbDataParameter = System.Data.Common.DbParameter;
-using IDbConnection = System.Data.Common.DbConnection;
-using IDbTransaction = System.Data.Common.DbTransaction;
-using IDataReader = System.Data.Common.DbDataReader;
-#endif
-
 namespace Dapper.Tests
 {
     public partial class TestSuite

diff --git a/Dapper.Tests/Tests.Enums.cs b/Dapper.Tests/Tests.Enums.cs
@@ -4,14 +4,6 @@
 using System.Linq;
 using Xunit;
 
-#if COREFX
-using IDbCommand = System.Data.Common.DbCommand;
-using IDbDataParameter = System.Data.Common.DbParameter;
-using IDbConnection = System.Data.Common.DbConnection;
-using IDbTransaction = System.Data.Common.DbTransaction;
-using IDataReader = System.Data.Common.DbDataReader;
-#endif
-
 namespace Dapper.Tests
 {
     public partial class TestSuite

diff --git a/Dapper.Tests/Tests.MultiMap.cs b/Dapper.Tests/Tests.MultiMap.cs
@@ -5,14 +5,6 @@
 using System.Linq;
 using Xunit;
 
-#if COREFX
-using IDbCommand = System.Data.Common.DbCommand;
-using IDbDataParameter = System.Data.Common.DbParameter;
-using IDbConnection = System.Data.Common.DbConnection;
-using IDbTransaction = System.Data.Common.DbTransaction;
-using IDataReader = System.Data.Common.DbDataReader;
-#endif
-
 namespace Dapper.Tests
 {
     public partial class TestSuite

diff --git a/Dapper.Tests/Tests.Parameters.cs b/Dapper.Tests/Tests.Parameters.cs
@@ -14,14 +14,6 @@
 using Microsoft.SqlServer.Types;
 #endif
 
-#if COREFX
-using IDbCommand = System.Data.Common.DbCommand;
-using IDbDataParameter = System.Data.Common.DbParameter;
-using IDbConnection = System.Data.Common.DbConnection;
-using IDbTransaction = System.Data.Common.DbTransaction;
-using IDataReader = System.Data.Common.DbDataReader;
-#endif
-
 namespace Dapper.Tests
 {
     public partial class TestSuite

diff --git a/Dapper.Tests/Tests.QueryMultiple.cs b/Dapper.Tests/Tests.QueryMultiple.cs
@@ -4,14 +4,6 @@
 using System.Linq;
 using Xunit;
 
-#if COREFX
-using IDbCommand = System.Data.Common.DbCommand;
-using IDbDataParameter = System.Data.Common.DbParameter;
-using IDbConnection = System.Data.Common.DbConnection;
-using IDbTransaction = System.Data.Common.DbTransaction;
-using IDataReader = System.Data.Common.DbDataReader;
-#endif
-
 namespace Dapper.Tests
 {
     public partial class TestSuite
@@ -48,7 +40,6 @@ public void TestQueryMultipleNonBufferedIncorrectOrder()
                 {
                     // that's expected
                 }
-
             }
         }
 

diff --git a/Dapper.Tests/Tests.cs b/Dapper.Tests/Tests.cs
@@ -1,13 +1,5 @@
 //#define POSTGRESQL // uncomment to run postgres tests
 
-#if COREFX
-using IDbCommand = System.Data.Common.DbCommand;
-using IDbDataParameter = System.Data.Common.DbParameter;
-using IDbConnection = System.Data.Common.DbConnection;
-using IDbTransaction = System.Data.Common.DbTransaction;
-using IDataReader = System.Data.Common.DbDataReader;
-#endif
-
 #if SQLITE && (NET40 || NET45)
 using SqliteConnection = System.Data.SQLite.SQLiteConnection;
 #endif
@@ -1847,60 +1839,6 @@ public void TestChangingDefaultStringTypeMappingToAnsiStringFirstOrDefault()
             Dapper.SqlMapper.AddTypeMap(typeof(string), DbType.String);  // Restore Default to Unicode String
         }
 
-#if COREFX
-        class TransactedConnection : IDbConnection
-        {
-            IDbConnection _conn;
-            IDbTransaction _tran;
-
-            public TransactedConnection(IDbConnection conn, IDbTransaction tran)
-            {
-                _conn = conn;
-                _tran = tran;
-            }
-
-            public override string ConnectionString { get { return _conn.ConnectionString; } set { _conn.ConnectionString = value; } }
-            public override int ConnectionTimeout => _conn.ConnectionTimeout;
-            public override string Database => _conn.Database;
-            public override ConnectionState State => _conn.State;
-
-            protected override IDbTransaction BeginDbTransaction(IsolationLevel isolationLevel)
-            {
-                return _tran;
-            }
-
-            public override void ChangeDatabase(string databaseName)
-            {
-                _conn.ChangeDatabase(databaseName);
-            }
-            public override string DataSource => _conn.DataSource;
-
-            public override string ServerVersion => _conn.ServerVersion;
-
-            public override void Close()
-            {
-                _conn.Close();
-            }
-            protected override IDbCommand CreateDbCommand()
-            {
-                // The command inherits the "current" transaction.
-                var command = _conn.CreateCommand();
-                command.Transaction = _tran;
-                return command;
-            }
-
-            protected override void Dispose(bool disposing)
-            {
-                if(disposing) _conn.Dispose();
-                base.Dispose(disposing);
-            }
-
-            public override void Open()
-            {
-                _conn.Open();
-            }
-        }
-#else
         class TransactedConnection : IDbConnection
         {
             IDbConnection _conn;
@@ -1955,7 +1893,6 @@ public void Open()
                 _conn.Open();
             }
         }
-#endif
 
         [Fact]
         public void TestDapperTableMetadataRetrieval()

diff --git a/Dapper/CommandDefinition.cs b/Dapper/CommandDefinition.cs
@@ -4,12 +4,6 @@
 using System.Reflection.Emit;
 using System.Threading;
 
-#if COREFX
-using IDbTransaction = System.Data.Common.DbTransaction;
-using IDbConnection = System.Data.Common.DbConnection;
-using IDbCommand = System.Data.Common.DbCommand;
-#endif
-
 namespace Dapper
 {
     /// <summary>

diff --git a/Dapper/DbString.cs b/Dapper/DbString.cs
@@ -1,10 +1,6 @@
 using System;
 using System.Data;
 
-#if COREFX
-using IDbCommand = System.Data.Common.DbCommand;
-#endif
-
 namespace Dapper
 {
     /// <summary>

diff --git a/Dapper/DefaultTypeMap.cs b/Dapper/DefaultTypeMap.cs
@@ -195,6 +195,9 @@ public SqlMapper.IMemberMap GetMember(string columnName)
         /// </summary>
         public static bool MatchNamesWithUnderscores { get; set; }
 
+        /// <summary>
+        /// The settable properties for this typemap
+        /// </summary>
         public List<PropertyInfo> Properties { get; }
     }
 }
diff --git a/Dapper/DynamicParameters.ParamInfo.cs b/Dapper/DynamicParameters.ParamInfo.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Data;
 
-#if COREFX
-using IDbDataParameter = System.Data.Common.DbParameter;
-#endif
 namespace Dapper
 {
     partial class DynamicParameters

diff --git a/Dapper/DynamicParameters.cs b/Dapper/DynamicParameters.cs
@@ -7,8 +7,6 @@
 using System.Reflection.Emit;
 
 #if COREFX
-using IDbDataParameter = System.Data.Common.DbParameter;
-using IDbCommand = System.Data.Common.DbCommand;
 using ApplicationException = System.InvalidOperationException;
 #endif
 

diff --git a/Dapper/FeatureSupport.cs b/Dapper/FeatureSupport.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Data;
 
-#if COREFX
-using IDbConnection = System.Data.Common.DbConnection;
-#endif
 namespace Dapper
 {
     /// <summary>

diff --git a/Dapper/SqlMapper.Async.cs b/Dapper/SqlMapper.Async.cs
@@ -9,13 +9,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-#if COREFX
-using IDbTransaction = System.Data.Common.DbTransaction;
-using IDbConnection = System.Data.Common.DbConnection;
-using IDbCommand = System.Data.Common.DbCommand;
-using IDataReader = System.Data.Common.DbDataReader;
-#endif
-
 namespace Dapper
 {
     public static partial class SqlMapper

diff --git a/Dapper/SqlMapper.CacheInfo.cs b/Dapper/SqlMapper.CacheInfo.cs
@@ -2,11 +2,6 @@
 using System.Data;
 using System.Threading;
 
-#if COREFX
-using IDbCommand = System.Data.Common.DbCommand;
-using IDataReader = System.Data.Common.DbDataReader;
-#endif
-
 namespace Dapper
 {
     partial class SqlMapper

diff --git a/Dapper/SqlMapper.DeserializerState.cs b/Dapper/SqlMapper.DeserializerState.cs
@@ -1,10 +1,6 @@
 using System;
 using System.Data;
 
-#if COREFX
-using IDataReader = System.Data.Common.DbDataReader;
-#endif
-
 namespace Dapper
 {
     partial class SqlMapper

diff --git a/Dapper/SqlMapper.GridReader.Async.cs b/Dapper/SqlMapper.GridReader.Async.cs
@@ -6,10 +6,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-#if COREFX
-using IDbCommand = System.Data.Common.DbCommand;
-using IDataReader = System.Data.Common.DbDataReader;
-#endif
+
 namespace Dapper
 {
     partial class SqlMapper

diff --git a/Dapper/SqlMapper.GridReader.cs b/Dapper/SqlMapper.GridReader.cs
@@ -3,11 +3,6 @@
 using System.Data;
 using System.Linq;
 
-#if COREFX
-using IDbCommand = System.Data.Common.DbCommand;
-using IDataReader = System.Data.Common.DbDataReader;
-#endif
-
 namespace Dapper
 {
     partial class SqlMapper

diff --git a/Dapper/SqlMapper.ICustomQueryParameter.cs b/Dapper/SqlMapper.ICustomQueryParameter.cs
@@ -1,8 +1,5 @@
 using System.Data;
 
-#if COREFX
-using IDbCommand = System.Data.Common.DbCommand;
-#endif
 namespace Dapper
 {
     partial class SqlMapper

diff --git a/Dapper/SqlMapper.IDataReader.cs b/Dapper/SqlMapper.IDataReader.cs
@@ -2,10 +2,6 @@
 using System.Collections.Generic;
 using System.Data;
 
-#if COREFX
-using IDataReader = System.Data.Common.DbDataReader;
-#endif
-
 namespace Dapper
 {
     partial class SqlMapper