diff --git a/Dapper.Rainbow/Database.cs b/Dapper.Rainbow/Database.cs
index 1f40eec5a28afedf6ab090c8b571980d4e6e39bd..3f088e718da866c100a0d8e2c66723f7a4ae680e 100644
--- a/Dapper.Rainbow/Database.cs
+++ b/Dapper.Rainbow/Database.cs
@@ -56,7 +56,7 @@ public string TableName
                 List<string> paramNames = GetParamNames(o);
                 paramNames.Remove("Id");
 
-                string cols = string.Join(",", paramNames);
+                string cols = string.Join(",", paramNames.Select(p => "[" + p + "]"));
                 string cols_params = string.Join(",", paramNames.Select(p => "@" + p));
                 var sql = "set nocount on insert " + TableName + " (" + cols + ") values (" + cols_params + ") select cast(scope_identity() as int)";
 
@@ -75,7 +75,7 @@ public int Update(TId id, dynamic data)
 
                 var builder = new StringBuilder();
                 builder.Append("update ").Append(TableName).Append(" set ");
-                builder.AppendLine(string.Join(",", paramNames.Where(n => n != "Id").Select(p => p + "= @" + p)));
+                builder.AppendLine(string.Join(",", paramNames.Where(n => n != "Id").Select(p =>  "[" + p + "] = @" + p)));
                 builder.Append("where Id = @Id");
 
                 DynamicParameters parameters = new DynamicParameters(data);
diff --git a/Dapper.Rainbow/SqlCompactDatabase.cs b/Dapper.Rainbow/SqlCompactDatabase.cs
index e04633dd0c93f0be03ecb9d654dc18995df4298f..1cc0e41eceafad1825a23bb35af723ef6591d32a 100644
--- a/Dapper.Rainbow/SqlCompactDatabase.cs
+++ b/Dapper.Rainbow/SqlCompactDatabase.cs
@@ -25,7 +25,7 @@ public SqlCompactTable(Database<TDatabase> database, string likelyTableName)
                 List<string> paramNames = GetParamNames(o);
                 paramNames.Remove("Id");
 
-                string cols = string.Join(",", paramNames);
+                string cols = string.Join(",", paramNames.Select(p => "[" + p + "]"));
                 string cols_params = string.Join(",", paramNames.Select(p => "@" + p));
 
                 var sql = "insert " + TableName + " (" + cols + ") values (" + cols_params + ")";