Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
This commit is contained in:
Shannon
2014-03-13 11:11:51 +11:00
14 changed files with 227 additions and 117 deletions

View File

@@ -233,7 +233,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
"SELECT TABLE_NAME, INDEX_NAME, COLUMN_NAME, [UNIQUE] FROM INFORMATION_SCHEMA.INDEXES ORDER BY TABLE_NAME, INDEX_NAME");
return
items.Select(
item => new Tuple<string, string, string, bool>(item.TABLE_NAME, item.INDEX_NAME, item.COLUMN_NAME, item.UNIQUE == 1));
item => new Tuple<string, string, string, bool>(item.TABLE_NAME, item.INDEX_NAME, item.COLUMN_NAME, item.UNIQUE));
}
public override bool DoesTableExist(Database db, string tableName)