Fixed column properties mapper up to apply reserved word rules as part of migration.

Added some hacks to deal with existing migrations where we have length 256 strings, when it should be 255 (will address this properly with a MySql51Dialect that allows larger varchar(n) values, at which point they can actually be length 256 or greater.

Author: bittercoder

src/Migrator.Providers/ColumnPropertiesMapper.cs

@@ -10,28 +10,28 @@ namespace Migrator.Providers
 	/// </summary>
 	public class ColumnPropertiesMapper
 	{
+		protected Dialect dialect;
+
+		/// <summary>The SQL type</summary>
+		protected string type;
+
+		/// <summary>The name of the column</summary>
+		protected string name;
+
 		/// <summary>
 		/// the type of the column
 		/// </summary>
 		protected string columnSql;
 
 		/// <summary>
-		/// Sql if this column has a default value
+		/// Sql if This column is Indexed
 		/// </summary>
-		protected object defaultVal;
-
-		protected Dialect dialect;
+		protected bool indexed = false;
 
 		/// <summary>
-		/// Sql if This column is Indexed
+		/// Sql if this column has a default value
 		/// </summary>
-		protected bool indexed;
-
-		/// <summary>The name of the column</summary>
-		protected string name;
-
-		/// <summary>The SQL type</summary>
-		protected string type;
+		protected object defaultVal;
 
 		public ColumnPropertiesMapper(Dialect dialect, string type)
 		{
@@ -79,18 +79,18 @@ public void MapColumnProperties(Column column)
 			Name = column.Name;
 			indexed = PropertySelected(column.ColumnProperty, ColumnProperty.Indexed);
 
-			var vals = new List<string>();
-			vals.Add(dialect.ColumnNameNeedsQuote ? QuotedName : Name);
+			List<string> vals = new List<string>();
+			vals.Add(dialect.ColumnNameNeedsQuote || dialect.IsReservedWord(Name) ? QuotedName : Name);
 
 			vals.Add(type);
 
-			if (! dialect.IdentityNeedsType)
+			if (!dialect.IdentityNeedsType)
 				AddValueIfSelected(column, ColumnProperty.Identity, vals);
 
 			if (dialect.IsUnsignedCompatible(column.Type))
 				AddValueIfSelected(column, ColumnProperty.Unsigned, vals);
 
-			if (! PropertySelected(column.ColumnProperty, ColumnProperty.PrimaryKey) || dialect.NeedsNotNullForIdentity)
+			if (!PropertySelected(column.ColumnProperty, ColumnProperty.PrimaryKey) || dialect.NeedsNotNullForIdentity)
 				AddValueIfSelected(column, ColumnProperty.NotNull, vals);
 
 			AddValueIfSelected(column, ColumnProperty.PrimaryKey, vals);
@@ -107,7 +107,7 @@ public void MapColumnProperties(Column column)
 			columnSql = String.Join(" ", vals.ToArray());
 		}
 
-		void AddValueIfSelected(Column column, ColumnProperty property, ICollection<string> vals)
+		private void AddValueIfSelected(Column column, ColumnProperty property, ICollection<string> vals)
 		{
 			if (PropertySelected(column.ColumnProperty, property))
 				vals.Add(dialect.SqlForProperty(property));
@@ -118,4 +118,4 @@ public static bool PropertySelected(ColumnProperty source, ColumnProperty compar
 			return (source & comparison) == comparison;
 		}
 	}
-}
+}

src/Migrator.Providers/Impl/Mysql/MysqlDialect.cs

@@ -8,12 +8,16 @@ public class MysqlDialect : Dialect
 	{
 		public MysqlDialect()
 		{
+			// TODO: As per http://dev.mysql.com/doc/refman/5.0/en/char.html 5.0.3 and above
+			// can handle varchar(n) up to a length OF 65,535 - so the limit of 255 should no longer apply.
+
 			RegisterColumnType(DbType.AnsiStringFixedLength, "CHAR(255)");
 			RegisterColumnType(DbType.AnsiStringFixedLength, 255, "CHAR($l)");
 			RegisterColumnType(DbType.AnsiStringFixedLength, 65535, "TEXT");
 			RegisterColumnType(DbType.AnsiStringFixedLength, 16777215, "MEDIUMTEXT");
 			RegisterColumnType(DbType.AnsiString, "VARCHAR(255)");
 			RegisterColumnType(DbType.AnsiString, 255, "VARCHAR($l)");
+			RegisterColumnType(DbType.AnsiString, 256, "VARCHAR(255)");
 			RegisterColumnType(DbType.AnsiString, 65535, "TEXT");
 			RegisterColumnType(DbType.AnsiString, 16777215, "MEDIUMTEXT");
 			RegisterColumnType(DbType.Binary, "LONGBLOB");
@@ -39,8 +43,10 @@ public MysqlDialect()
 			RegisterColumnType(DbType.StringFixedLength, 16777215, "MEDIUMTEXT");
 			RegisterColumnType(DbType.String, "VARCHAR(255)");
 			RegisterColumnType(DbType.String, 255, "VARCHAR($l)");
+			RegisterColumnType(DbType.String, 256, "VARCHAR(255)");
 			RegisterColumnType(DbType.String, 65535, "TEXT");
 			RegisterColumnType(DbType.String, 16777215, "MEDIUMTEXT");
+			RegisterColumnType(DbType.String, 1073741823, "LONGTEXT");
 			RegisterColumnType(DbType.Time, "TIME");
 
 			RegisterProperty(ColumnProperty.Unsigned, "UNSIGNED");