R# fixes

ErikEJ · Mar 31, 2017 · 3cdec47 · 3cdec47
1 parent cca05a6
commit 3cdec47
Show file tree

Hide file tree

Showing 18 changed files with 135 additions and 162 deletions.
diff --git a/src/DestinationTableDefaultMetadata.cs b/src/DestinationTableDefaultMetadata.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Data;
 using System.Data.SqlServerCe;
 using System.Globalization;
@@ -30,9 +29,9 @@ public bool HasDefault
 
 		public DestinationTableDefaultMetadata(IDataReader reader)
 		{
-			this.ColumnName = (reader.GetString(0) ?? string.Empty).ToUpper(CultureInfo.InvariantCulture);
-			this.IsNullable = reader.GetString(1).Equals("YES", StringComparison.OrdinalIgnoreCase) ? true : false;
-			this.HasDefault = reader.GetBoolean(2);
+			ColumnName = (reader.GetString(0) ?? string.Empty).ToUpper(CultureInfo.InvariantCulture);
+			IsNullable = reader.GetString(1).Equals("YES", StringComparison.OrdinalIgnoreCase);
+			HasDefault = reader.GetBoolean(2);
 		}
 
 		public static List<DestinationTableDefaultMetadata> GetDataForTable(SqlCeConnection conn, SqlCeTransaction transaction, string tableName)

diff --git a/src/ForeignKeyLib/ColumnList.cs b/src/ForeignKeyLib/ColumnList.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace ErikEJ.SqlCeScripting
+namespace ErikEJ.SqlCe.ForeignKeyLib
 {
     public class ColumnList : List<string>
     {

diff --git a/src/ForeignKeyLib/Constraint.cs b/src/ForeignKeyLib/Constraint.cs
@@ -1,4 +1,4 @@
-namespace ErikEJ.SqlCeScripting
+namespace ErikEJ.SqlCe.ForeignKeyLib
 {
     public class Constraint
     {

diff --git a/src/ForeignKeyLib/DBRepository.cs b/src/ForeignKeyLib/DBRepository.cs
@@ -1,32 +1,32 @@
 using System.Collections.Generic;
 using System.Data.SqlServerCe;
 
-namespace ErikEJ.SqlCeScripting
+namespace ErikEJ.SqlCe.ForeignKeyLib
 {
-    public sealed class DBRepository : IRepository
+    internal class DbRepository : IRepository
     {
-        private SqlCeConnection cn;
+        private SqlCeConnection _cn;
         private delegate void AddToListDelegate<T>(ref List<T> list, SqlCeDataReader dr);
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="DBRepository"/> class.
+        /// Initializes a new instance of the <see cref="DbRepository"/> class.
         /// </summary>
         /// <param name="connectionString">The connection string.</param>
-        public DBRepository(string connectionString)
+        public DbRepository(string connectionString)
         {
-            cn = new SqlCeConnection(connectionString);
-            cn.Open();
+            _cn = new SqlCeConnection(connectionString);
+            _cn.Open();
         }
 
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
-            if (cn != null)
+            if (_cn != null)
             {
-                cn.Close();
-                cn = null;
+                _cn.Close();
+                _cn = null;
             }
         }
 
@@ -55,7 +55,7 @@ private static void AddToListConstraints(ref List<Constraint> list, SqlCeDataRea
         private List<T> ExecuteReader<T>(string commandText, AddToListDelegate<T> AddToListMethod)
         {
             List<T> list = new List<T>();
-            using (var cmd = new SqlCeCommand(commandText, cn))
+            using (var cmd = new SqlCeCommand(commandText, _cn))
             {
                 using (var dr = cmd.ExecuteReader())
                 {
@@ -124,7 +124,7 @@ public void RunCommand(string sql)
 		{
 			using (SqlCeCommand cmd = new SqlCeCommand())
 			{
-				cmd.Connection = cn;
+				cmd.Connection = _cn;
 				cmd.CommandText = sql;
 				cmd.ExecuteNonQuery();
 			}

diff --git a/src/ForeignKeyLib/ForeignKeyRepository.cs b/src/ForeignKeyLib/ForeignKeyRepository.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
-using ErikEJ.SqlCeScripting;
 using System.Linq;
 
-namespace ErikEJ.SqlCeScripting
+namespace ErikEJ.SqlCe.ForeignKeyLib
 {
     public class ForeignKeyRepository
     {
@@ -21,20 +19,20 @@ protected ForeignKeyRepository() { }
 
         public List<Constraint> GetConstraints()
         {
-            using (var repo = new DBRepository(_connectionString))
+            using (var repo = new DbRepository(_connectionString))
             {
                 return repo.GetAllForeignKeys().Where(c => c.ConstraintTableName == _tableName).ToList();
             }
         }
 
         public void DropConstraints()
         {
-            using (var repo = new DBRepository(_connectionString))
+            using (var repo = new DbRepository(_connectionString))
             {
                 var constraints = repo.GetAllForeignKeys().Where(c => c.ConstraintTableName == _tableName).ToArray();
                 foreach (var constraint in constraints)
                 {
-                    var generator = new Generator(repo);
+                    var generator = new Generator();
                     generator.GenerateForeignKeyDrop(constraint);
                     repo.RunCommand(generator.GeneratedScript);
                 }
@@ -44,25 +42,22 @@ public void DropConstraints()
         public string GetAddConstraintStatements(List<Constraint> constraints)
         {
             var script = string.Empty;
-            using (var repo = new DBRepository(_connectionString))
+            foreach (var constraint in constraints)
             {
-                foreach (var constraint in constraints)
-                {
-                    var generator = new Generator(repo);
-                    generator.GenerateForeignKey(constraint);
-                    script = script + generator.GeneratedScript + Environment.NewLine;
-                }
+                var generator = new Generator();
+                generator.GenerateForeignKey(constraint);
+                script = script + generator.GeneratedScript + Environment.NewLine;
             }
             return script;
         }
 
         public void AddConstraints(List<Constraint> constraints)
         {
-            using (var repo = new DBRepository(_connectionString))
+            using (var repo = new DbRepository(_connectionString))
             {
                 foreach (var constraint in constraints)
                 {
-                    var generator = new Generator(repo);
+                    var generator = new Generator();
                     generator.GenerateForeignKey(constraint);
                     repo.RunCommand(generator.GeneratedScript);
                 }

diff --git a/src/ForeignKeyLib/Generator.cs b/src/ForeignKeyLib/Generator.cs
@@ -1,8 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 
-namespace ErikEJ.SqlCeScripting
+namespace ErikEJ.SqlCe.ForeignKeyLib
 {
     /// <summary>
     /// Class for generating scripts
@@ -11,12 +10,9 @@ namespace ErikEJ.SqlCeScripting
     public class Generator : IGenerator
     {
         private readonly StringBuilder _sbScript;
-        private readonly List<Constraint> _allForeignKeys;
-
-        public Generator(IRepository repository)
+        public Generator()
         {
 			_sbScript = new StringBuilder(10485760);
-			_allForeignKeys = repository.GetAllForeignKeys();
 		}
 
         public void GenerateForeignKey(Constraint constraint)

diff --git a/src/ForeignKeyLib/IGenerator.cs b/src/ForeignKeyLib/IGenerator.cs
@@ -1,4 +1,4 @@
-namespace ErikEJ.SqlCeScripting
+namespace ErikEJ.SqlCe.ForeignKeyLib
 {
     public interface IGenerator
     {

diff --git a/src/ForeignKeyLib/IRepository.cs b/src/ForeignKeyLib/IRepository.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ErikEJ.SqlCeScripting
+namespace ErikEJ.SqlCe.ForeignKeyLib
 {
 	public interface IRepository : IDisposable
 	{

diff --git a/src/ForeignKeyLib/RepositoryHelper.cs b/src/ForeignKeyLib/RepositoryHelper.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace ErikEJ.SqlCeScripting
+namespace ErikEJ.SqlCe.ForeignKeyLib
 {
-    public class RepositoryHelper
+    internal class RepositoryHelper
     {
         // Contrib from hugo on CodePlex - thanks!
         public static List<Constraint> GetGroupForeingKeys(List<Constraint> foreignKeys, List<string> allTables)

diff --git a/src/ISqlCeBulkCopyInsertAdapter.cs b/src/ISqlCeBulkCopyInsertAdapter.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ErikEJ.SqlCe
+namespace ErikEJ.SqlCe
 {
     /// <summary>
     /// Interface used by the adapters so we are able to remove the duplicate code.