Removed some reserved words that are not actually reserved (was conflicting with Quartz.Net)

bittercoder · bittercoder · commit 28a1e12afd75 · 2012-08-31T10:47:32.000+12:00
diff --git a/src/Migrator.Framework/Maximums.cs b/src/Migrator.Framework/Maximums.cs
@@ -8,5 +8,6 @@ namespace Migrator.Framework
 	public static class Maximums
 	{
 		public const int NTextLength = 1073741823;
+	    public const int BlobLength = 2147483647;
 	}
 }
diff --git a/src/Migrator.Providers/Impl/Mysql/MySqlTransformationProvider.cs b/src/Migrator.Providers/Impl/Mysql/MySqlTransformationProvider.cs
@@ -165,7 +165,8 @@ public override void RemoveIndex(string table, string name)
 		{
 			if (IndexExists(table, name))
 			{
-				ExecuteNonQuery(String.Format("DROP INDEX {1} ON {0}", table, _dialect.Quote(name)));
+
+                ExecuteNonQuery(String.Format("DROP INDEX {1} ON {0}", QuoteTableNameIfRequired(table), _dialect.Quote(name)));
 			}
 		}
 
diff --git a/src/Migrator.Providers/Impl/Mysql/MysqlDialect.cs b/src/Migrator.Providers/Impl/Mysql/MysqlDialect.cs
@@ -60,7 +60,7 @@ public MysqlDialect()
 			RegisterUnsignedCompatible(DbType.Single);
 
 			AddReservedWords("KEY");
-		}
+	   }
 
 		public override string QuoteTemplate
 		{
diff --git a/src/Migrator.Providers/Impl/Oracle/OracleDialect.cs b/src/Migrator.Providers/Impl/Oracle/OracleDialect.cs
@@ -75,11 +75,11 @@ public OracleDialect()
 			                 "RETURNED_LENGTH", "RETURNED_OCTET_LENGTH", "RETURNED_SQLSTATE", "RETURNS", "REVOKE", "RIGHT", "ROLE", "ROLLBACK", "ROLLUP", "ROUTINE", "ROUTINE_CATALOG", "ROUTINE_NAME",
 			                 "ROUTINE_SCHEMA", "ROW", "ROWS", "ROW_COUNT", "RULE", "SAVEPOINT", "SCALE", "SCHEMA", "SCHEMA_NAME", "SCOPE", "SCROLL", "SEARCH", "SECOND", "SECTION", "SECURITY", "SELECT",
 			                 "SELF", "SENSITIVE", "SEQUENCE", "SERIALIZABLE", "SERVER_NAME", "SESSION", "SESSION_USER", "SET", "SETOF", "SETS", "SHARE", "SHOW", "SIMILAR", "SIMPLE", "SIZE", "SMALLINT",
-			                 "SOME", "SOURCE", "SPACE", "SPECIFIC", "SPECIFICTYPE", "SPECIFIC_NAME", "SQL", "SQLCODE", "SQLERROR", "SQLEXCEPTION", "SQLSTATE", "SQLWARNING", "STABLE", "START", "STATE",
+			                 "SOME", "SOURCE", "SPACE", "SPECIFIC", "SPECIFICTYPE", "SPECIFIC_NAME", "SQL", "SQLCODE", "SQLERROR", "SQLEXCEPTION", "SQLSTATE", "SQLWARNING", "STABLE", "START",
 			                 "STATEMENT", "STATIC", "STATISTICS", "STDIN", "STDOUT", "STORAGE", "STRICT", "STRUCTURE", "STYLE", "SUBCLASS_ORIGIN", "SUBLIST", "SUBSTRING", "SUM", "SYMMETRIC", "SYSID",
 			                 "SYSTEM", "SYSTEM_USER", "TABLE", "TABLE_NAME", "TEMP", "TEMPLATE", "TEMPORARY", "TERMINATE", "THAN", "THEN", "TIME", "TIMESTAMP", "TIMEZONE_HOUR", "TIMEZONE_MINUTE", "TO",
 			                 "TOAST", "TRAILING", "TRANSACTION", "TRANSACTIONS_COMMITTED", "TRANSACTIONS_ROLLED_BACK", "TRANSACTION_ACTIVE", "TRANSFORM", "TRANSFORMS", "TRANSLATE", "TRANSLATION", "TREAT",
-			                 "TRIGGER", "TRIGGER_CATALOG", "TRIGGER_NAME", "TRIGGER_SCHEMA", "TRIM", "TRUE", "TRUNCATE", "TRUSTED", "TYPE", "UNCOMMITTED", "UNDER", "UNENCRYPTED", "UNION", "UNIQUE",
+			                 "TRIGGER", "TRIGGER_CATALOG", "TRIGGER_SCHEMA", "TRIM", "TRUE", "TRUNCATE", "TRUSTED", "TYPE", "UNCOMMITTED", "UNDER", "UNENCRYPTED", "UNION", "UNIQUE",
 			                 "UNKNOWN", "UNLISTEN", "UNNAMED", "UNNEST", "UNTIL", "UPDATE", "UPPER", "USAGE", "USER", "USER_DEFINED_TYPE_CATALOG", "USER_DEFINED_TYPE_NAME", "USER_DEFINED_TYPE_SCHEMA",
 			                 "USING", "VACUUM", "VALID", "VALIDATOR", "VALUE", "VALUES", "VARCHAR", "VARIABLE", "VARYING", "VERBOSE", "VERSION", "VIEW", "VOLATILE", "WHEN", "WHENEVER", "WHERE", "WITH",
 			                 "WITHOUT", "WORK", "WRITE", "YEAR", "ZONE");
diff --git a/src/Migrator.Providers/Impl/PostgreSQL/PostgreSQLDialect.cs b/src/Migrator.Providers/Impl/PostgreSQL/PostgreSQLDialect.cs
@@ -64,11 +64,11 @@ public PostgreSQLDialect()
 			                 "RETURNED_LENGTH", "RETURNED_OCTET_LENGTH", "RETURNED_SQLSTATE", "RETURNS", "REVOKE", "RIGHT", "ROLE", "ROLLBACK", "ROLLUP", "ROUTINE", "ROUTINE_CATALOG", "ROUTINE_NAME",
 			                 "ROUTINE_SCHEMA", "ROW", "ROWS", "ROW_COUNT", "RULE", "SAVEPOINT", "SCALE", "SCHEMA", "SCHEMA_NAME", "SCOPE", "SCROLL", "SEARCH", "SECOND", "SECTION", "SECURITY", "SELECT",
 			                 "SELF", "SENSITIVE", "SEQUENCE", "SERIALIZABLE", "SERVER_NAME", "SESSION", "SESSION_USER", "SET", "SETOF", "SETS", "SHARE", "SHOW", "SIMILAR", "SIMPLE", "SIZE", "SMALLINT",
-			                 "SOME", "SOURCE", "SPACE", "SPECIFIC", "SPECIFICTYPE", "SPECIFIC_NAME", "SQL", "SQLCODE", "SQLERROR", "SQLEXCEPTION", "SQLSTATE", "SQLWARNING", "STABLE", "START", "STATE",
+			                 "SOME", "SOURCE", "SPACE", "SPECIFIC", "SPECIFICTYPE", "SPECIFIC_NAME", "SQL", "SQLCODE", "SQLERROR", "SQLEXCEPTION", "SQLSTATE", "SQLWARNING", "STABLE", "START", 
 			                 "STATEMENT", "STATIC", "STATISTICS", "STDIN", "STDOUT", "STORAGE", "STRICT", "STRUCTURE", "STYLE", "SUBCLASS_ORIGIN", "SUBLIST", "SUBSTRING", "SUM", "SYMMETRIC", "SYSID",
 			                 "SYSTEM", "SYSTEM_USER", "TABLE", "TABLE_NAME", "TEMP", "TEMPLATE", "TEMPORARY", "TERMINATE", "THAN", "THEN", "TIME", "TIMESTAMP", "TIMEZONE_HOUR", "TIMEZONE_MINUTE", "TO",
 			                 "TOAST", "TRAILING", "TRANSACTION", "TRANSACTIONS_COMMITTED", "TRANSACTIONS_ROLLED_BACK", "TRANSACTION_ACTIVE", "TRANSFORM", "TRANSFORMS", "TRANSLATE", "TRANSLATION", "TREAT",
-			                 "TRIGGER", "TRIGGER_CATALOG", "TRIGGER_NAME", "TRIGGER_SCHEMA", "TRIM", "TRUE", "TRUNCATE", "TRUSTED", "TYPE", "UNCOMMITTED", "UNDER", "UNENCRYPTED", "UNION", "UNIQUE",
+			                 "TRIGGER", "TRIGGER_CATALOG", "TRIGGER_SCHEMA", "TRIM", "TRUE", "TRUNCATE", "TRUSTED", "TYPE", "UNCOMMITTED", "UNDER", "UNENCRYPTED", "UNION", "UNIQUE",
 			                 "UNKNOWN", "UNLISTEN", "UNNAMED", "UNNEST", "UNTIL", "UPDATE", "UPPER", "USAGE", "USER", "USER_DEFINED_TYPE_CATALOG", "USER_DEFINED_TYPE_NAME", "USER_DEFINED_TYPE_SCHEMA",
 			                 "USING", "VACUUM", "VALID", "VALIDATOR", "VALUE", "VALUES", "VARCHAR", "VARIABLE", "VARYING", "VERBOSE", "VERSION", "VIEW", "VOLATILE", "WHEN", "WHENEVER", "WHERE", "WITH",
 			                 "WITHOUT", "WORK", "WRITE", "YEAR", "ZONE");
diff --git a/src/Migrator.Providers/Impl/SqlServer/SqlServerDialect.cs b/src/Migrator.Providers/Impl/SqlServer/SqlServerDialect.cs
@@ -39,6 +39,8 @@ public SqlServerDialect()
 			RegisterColumnType(DbType.Time, "DATETIME");
 
 			RegisterProperty(ColumnProperty.Identity, "IDENTITY");
+
+            AddReservedWords("ADD", "EXCEPT", "PERCENT", "ALL", "EXEC", "PLAN", "ALTER", "EXECUTE", "PRECISION", "AND", "EXISTS", "PRIMARY", "ANY", "EXIT", "PRINT", "AS", "FETCH", "PROC", "ASC", "FILE", "PROCEDURE", "AUTHORIZATION", "FILLFACTOR", "PUBLIC", "BACKUP", "FOR", "RAISERROR", "BEGIN", "FOREIGN", "READ", "BETWEEN", "FREETEXT", "READTEXT", "BREAK", "FREETEXTTABLE", "RECONFIGURE", "BROWSE", "FROM", "REFERENCES", "BULK", "FULL", "REPLICATION", "BY", "FUNCTION", "RESTORE", "CASCADE", "GOTO", "RESTRICT", "CASE", "GRANT", "RETURN", "CHECK", "GROUP", "REVOKE", "CHECKPOINT", "HAVING", "RIGHT", "CLOSE", "HOLDLOCK", "ROLLBACK", "CLUSTERED", "IDENTITY", "ROWCOUNT", "COALESCE", "IDENTITY_INSERT", "ROWGUIDCOL", "COLLATE", "IDENTITYCOL", "RULE", "COLUMN", "IF", "SAVE", "COMMIT", "IN", "SCHEMA", "COMPUTE", "INDEX", "SELECT", "CONSTRAINT", "INNER", "SESSION_USER", "CONTAINS", "INSERT", "SET", "CONTAINSTABLE", "INTERSECT", "SETUSER", "CONTINUE", "INTO", "SHUTDOWN", "CONVERT", "IS", "SOME", "CREATE", "JOIN", "STATISTICS", "CROSS", "KEY", "SYSTEM_USER", "CURRENT", "KILL", "TABLE", "CURRENT_DATE", "LEFT", "TEXTSIZE", "CURRENT_TIME", "LIKE", "THEN", "CURRENT_TIMESTAMP", "LINENO", "TO", "CURRENT_USER", "LOAD", "TOP", "CURSOR", "NATIONAL", "TRAN", "DATABASE", "NOCHECK", "TRANSACTION", "DBCC", "NONCLUSTERED", "TRIGGER", "DEALLOCATE", "NOT", "TRUNCATE", "DECLARE", "NULL", "TSEQUAL", "DEFAULT", "NULLIF", "UNION", "DELETE", "OF", "UNIQUE", "DENY", "OFF", "UPDATE", "DESC", "OFFSETS", "UPDATETEXT", "DISK", "ON", "USE", "DISTINCT", "OPEN", "USER", "DISTRIBUTED", "OPENDATASOURCE", "VALUES", "DOUBLE", "OPENQUERY", "VARYING", "DROP", "OPENROWSET", "VIEW", "DUMMY", "OPENXML", "WAITFOR", "DUMP", "OPTION", "WHEN", "ELSE", "OR", "WHERE", "END", "ORDER", "WHILE", "ERRLVL", "OUTER", "WITH", "ESCAPE", "OVER", "WRITETEXT");
 		}
 
 		public override bool SupportsIndex
diff --git a/src/Migrator.Providers/TransformationProvider.cs b/src/Migrator.Providers/TransformationProvider.cs
@@ -1041,7 +1041,7 @@ public virtual void RemoveIndex(string table, string name)
 		{
 			if (TableExists(table) && IndexExists(table, name))
 			{
-				name = _dialect.ConstraintNameNeedsQuote ? _dialect.Quote(name) : name;
+			    name = QuoteConstraintNameIfRequired(name);
 				ExecuteNonQuery(String.Format("DROP INDEX {0}", name));
 			}
 		}
@@ -1053,9 +1053,21 @@ public virtual void AddIndex(string name, string table, params string[] columns)
 				Logger.Warn("Index {0} already exists", name);
 				return;
 			}
-			ExecuteNonQuery(String.Format("CREATE INDEX {0} ON {1} ({2}) ", name, table, string.Join(", ", columns)));
+
+            name = QuoteConstraintNameIfRequired(name);
+
+            table = QuoteTableNameIfRequired(table);
+
+            columns = QuoteColumnNamesIfRequired(columns);
+
+            ExecuteNonQuery(String.Format("CREATE INDEX {0} ON {1} ({2}) ", name, table, string.Join(", ", columns)));
 		}
 
-        public abstract bool IndexExists(string table, string name);
+	    protected string QuoteConstraintNameIfRequired(string name)
+	    {
+	        return _dialect.ConstraintNameNeedsQuote ? _dialect.Quote(name) : name;
+	    }
+
+	    public abstract bool IndexExists(string table, string name);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@ namespace Migrator.Framework`
`8`	`8`	`public static class Maximums`
`9`	`9`	`{`
`10`	`10`	`public const int NTextLength = 1073741823;`
	`11`	`+ public const int BlobLength = 2147483647;`
`11`	`12`	`}`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,8 @@ public override void RemoveIndex(string table, string name)`
`165`	`165`	`{`
`166`	`166`	`if (IndexExists(table, name))`
`167`	`167`	`{`
`168`		`- ExecuteNonQuery(String.Format("DROP INDEX {1} ON {0}", table, _dialect.Quote(name)));`
	`168`	`+`
	`169`	`+ ExecuteNonQuery(String.Format("DROP INDEX {1} ON {0}", QuoteTableNameIfRequired(table), _dialect.Quote(name)));`
`169`	`170`	`}`
`170`	`171`	`}`
`171`	`172`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public MysqlDialect()`
`60`	`60`	`RegisterUnsignedCompatible(DbType.Single);`
`61`	`61`
`62`	`62`	`AddReservedWords("KEY");`
`63`		`- }`
	`63`	`+ }`
`64`	`64`
`65`	`65`	`public override string QuoteTemplate`
`66`	`66`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ public SqlServerDialect()`
`39`	`39`	`RegisterColumnType(DbType.Time, "DATETIME");`
`40`	`40`
`41`	`41`	`RegisterProperty(ColumnProperty.Identity, "IDENTITY");`
	`42`	`+`
	`43`	+ AddReservedWords("ADD", "EXCEPT", "PERCENT", "ALL", "EXEC", "PLAN", "ALTER", "EXECUTE", "PRECISION", "AND", "EXISTS", "PRIMARY", "ANY", "EXIT", "PRINT", "AS", "FETCH", "PROC", "ASC", "FILE", "PROCEDURE", "AUTHORIZATION", "FILLFACTOR", "PUBLIC", "BACKUP", "FOR", "RAISERROR", "BEGIN", "FOREIGN", "READ", "BETWEEN", "FREETEXT", "READTEXT", "BREAK", "FREETEXTTABLE", "RECONFIGURE", "BROWSE", "FROM", "REFERENCES", "BULK", "FULL", "REPLICATION", "BY", "FUNCTION", "RESTORE", "CASCADE", "GOTO", "RESTRICT", "CASE", "GRANT", "RETURN", "CHECK", "GROUP", "REVOKE", "CHECKPOINT", "HAVING", "RIGHT", "CLOSE", "HOLDLOCK", "ROLLBACK", "CLUSTERED", "IDENTITY", "ROWCOUNT", "COALESCE", "IDENTITY_INSERT", "ROWGUIDCOL", "COLLATE", "IDENTITYCOL", "RULE", "COLUMN", "IF", "SAVE", "COMMIT", "IN", "SCHEMA", "COMPUTE", "INDEX", "SELECT", "CONSTRAINT", "INNER", "SESSION_USER", "CONTAINS", "INSERT", "SET", "CONTAINSTABLE", "INTERSECT", "SETUSER", "CONTINUE", "INTO", "SHUTDOWN", "CONVERT", "IS", "SOME", "CREATE", "JOIN", "STATISTICS", "CROSS", "KEY", "SYSTEM_USER", "CURRENT", "KILL", "TABLE", "CURRENT_DATE", "LEFT", "TEXTSIZE", "CURRENT_TIME", "LIKE", "THEN", "CURRENT_TIMESTAMP", "LINENO", "TO", "CURRENT_USER", "LOAD", "TOP", "CURSOR", "NATIONAL", "TRAN", "DATABASE", "NOCHECK", "TRANSACTION", "DBCC", "NONCLUSTERED", "TRIGGER", "DEALLOCATE", "NOT", "TRUNCATE", "DECLARE", "NULL", "TSEQUAL", "DEFAULT", "NULLIF", "UNION", "DELETE", "OF", "UNIQUE", "DENY", "OFF", "UPDATE", "DESC", "OFFSETS", "UPDATETEXT", "DISK", "ON", "USE", "DISTINCT", "OPEN", "USER", "DISTRIBUTED", "OPENDATASOURCE", "VALUES", "DOUBLE", "OPENQUERY", "VARYING", "DROP", "OPENROWSET", "VIEW", "DUMMY", "OPENXML", "WAITFOR", "DUMP", "OPTION", "WHEN", "ELSE", "OR", "WHERE", "END", "ORDER", "WHILE", "ERRLVL", "OUTER", "WITH", "ESCAPE", "OVER", "WRITETEXT");
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`public override bool SupportsIndex`
Original file line number	Diff line number	Diff line change
`@@ -1041,7 +1041,7 @@ public virtual void RemoveIndex(string table, string name)`
`1041`	`1041`	`{`
`1042`	`1042`	`if (TableExists(table) && IndexExists(table, name))`
`1043`	`1043`	`{`
`1044`		`- name = _dialect.ConstraintNameNeedsQuote ? _dialect.Quote(name) : name;`
	`1044`	`+ name = QuoteConstraintNameIfRequired(name);`
`1045`	`1045`	`ExecuteNonQuery(String.Format("DROP INDEX {0}", name));`
`1046`	`1046`	`}`
`1047`	`1047`	`}`
`@@ -1053,9 +1053,21 @@ public virtual void AddIndex(string name, string table, params string[] columns)`
`1053`	`1053`	`Logger.Warn("Index {0} already exists", name);`
`1054`	`1054`	`return;`
`1055`	`1055`	`}`
`1056`		`- ExecuteNonQuery(String.Format("CREATE INDEX {0} ON {1} ({2}) ", name, table, string.Join(", ", columns)));`
	`1056`	`+`
	`1057`	`+ name = QuoteConstraintNameIfRequired(name);`
	`1058`	`+`
	`1059`	`+ table = QuoteTableNameIfRequired(table);`
	`1060`	`+`
	`1061`	`+ columns = QuoteColumnNamesIfRequired(columns);`
	`1062`	`+`
	`1063`	`+ ExecuteNonQuery(String.Format("CREATE INDEX {0} ON {1} ({2}) ", name, table, string.Join(", ", columns)));`
`1057`	`1064`	`}`
`1058`	`1065`
`1059`		`- public abstract bool IndexExists(string table, string name);`
	`1066`	`+ protected string QuoteConstraintNameIfRequired(string name)`
	`1067`	`+ {`
	`1068`	`+ return _dialect.ConstraintNameNeedsQuote ? _dialect.Quote(name) : name;`
	`1069`	`+ }`
	`1070`	`+`
	`1071`	`+ public abstract bool IndexExists(string table, string name);`
`1060`	`1072`	`}`
`1061`	`1073`	`}`