Merge branch 'u4-6003b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-6003b
Conflicts: src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs src/Umbraco.Core/Services/ContentService.cs src/Umbraco.Core/Services/IContentService.cs src/Umbraco.Core/Services/IMediaService.cs src/Umbraco.Core/Services/IMemberService.cs src/Umbraco.Core/Services/MediaService.cs src/Umbraco.Core/Services/MemberService.cs src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html src/Umbraco.Web/Editors/MemberController.cs src/UmbracoExamine/UmbracoMemberIndexer.cs
This commit is contained in:
@@ -361,6 +361,10 @@ ORDER BY TABLE_NAME, INDEX_NAME",
|
||||
|
||||
public override string RenameColumn { get { return "ALTER TABLE {0} CHANGE {1} {2}"; } }
|
||||
|
||||
public override string IsNull { get { return "IFNULL({0},{1})"; } }
|
||||
public override string ConvertIntegerToOrderableString { get { return "LPAD({0}, 8, '0')"; } }
|
||||
public override string ConvertDateToOrderableString { get { return "DATE_FORMAT({0}, '%Y%m%d')"; } }
|
||||
|
||||
public override bool? SupportsCaseInsensitiveQueries(Database db)
|
||||
{
|
||||
bool? supportsCaseInsensitiveQueries = null;
|
||||
|
||||
Reference in New Issue
Block a user