diff --git a/src/Migrator/Providers/TransformationProvider.cs b/src/Migrator/Providers/TransformationProvider.cs
index a44c25fc..969935ee 100644
--- a/src/Migrator/Providers/TransformationProvider.cs
+++ b/src/Migrator/Providers/TransformationProvider.cs
@@ -23,7 +23,6 @@
 using System.Data.Common;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 using ForeignKeyConstraint = DotNetProjects.Migrator.Framework.ForeignKeyConstraint;
 using ForeignKeyConstraintType = DotNetProjects.Migrator.Framework.ForeignKeyConstraintType;
@@ -725,6 +724,9 @@ public virtual void AddColumn(string table, string column, MigratorDbType type,
     /// <param name="columns">Primary column names</param>
     public virtual void AddPrimaryKey(string name, string table, params string[] columns)
     {
+        QuoteColumnNamesIfRequired(columns);
+        table = QuoteTableNameIfRequired(table);
+
         ExecuteNonQuery(
             string.Format("ALTER TABLE {0} ADD CONSTRAINT {1} PRIMARY KEY ({2}) ", table, name,
                           string.Join(",", QuoteColumnNamesIfRequired(columns))));
@@ -735,8 +737,7 @@ public virtual void AddPrimaryKeyNonClustered(string name, string table, params
     }
     public virtual void AddUniqueConstraint(string name, string table, params string[] columns)
     {
-        QuoteColumnNames(columns);
-
+        QuoteColumnNamesIfRequired(columns);
         table = QuoteTableNameIfRequired(table);
 
         ExecuteNonQuery(string.Format("ALTER TABLE {0} ADD CONSTRAINT {1} UNIQUE({2}) ", table, name, string.Join(", ", columns)));