Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Reader IA] Fix ReaderPostTable sorting date as string #19949

Merged
merged 9 commits into from
Jan 16, 2024
+8 −8
Merged

[Reader IA] Fix ReaderPostTable sorting date as string #19949

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a7a7730
Add datetime function to liked feed local database sorting
RenanLukas Jan 15, 2024
ee1744c
Add datetime function to subscriptions feed local database sorting
RenanLukas Jan 15, 2024
6585b19
Add datetime function to Saved feed local database sorting
RenanLukas Jan 15, 2024
9571c59
Add datetime function to getOldestPubDateInBlog sorting
RenanLukas Jan 15, 2024
417de07
Add datetime function to getOldestPubDateInFeed sorting
RenanLukas Jan 15, 2024
10b9f80
Add datetime function to getPostsInBlog sorting
RenanLukas Jan 15, 2024
bbe0fe9
Add datetime function to getPostsInFeed sorting
RenanLukas Jan 15, 2024
c14d457
Add datetime function to getBlogIdPostIdsInBlog sorting
RenanLukas Jan 15, 2024
6ecdb71
Merge branch 'feature/reader-ia' into issue/19897-fix-readerposttable…
RenanLukas Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions WordPress/src/main/java/org/wordpress/android/datasets/ReaderPostTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,14 +658,14 @@ public static String getOldestDateWithTag(final ReaderTag tag) {
public static String getOldestPubDateInBlog(long blogId) {
String sql = "SELECT date_published FROM tbl_posts"
+ " WHERE blog_id=? AND tag_name='' AND tag_type=0"
+ " ORDER BY date_published LIMIT 1";
+ " ORDER BY datetime(date_published) LIMIT 1";
return SqlUtils.stringForQuery(ReaderDatabase.getReadableDb(), sql, new String[]{Long.toString(blogId)});
}

public static String getOldestPubDateInFeed(long feedId) {
String sql = "SELECT date_published FROM tbl_posts"
+ " WHERE feed_id=? AND tag_name='' AND tag_type=0"
+ " ORDER BY date_published LIMIT 1";
+ " ORDER BY datetime(date_published) LIMIT 1";
return SqlUtils.stringForQuery(ReaderDatabase.getReadableDb(), sql, new String[]{Long.toString(feedId)});
}

Expand Down Expand Up @@ -743,13 +743,13 @@ public static String getGapMarkerDateForTag(ReaderTag tag) {
*/
private static String getSortColumnForTag(ReaderTag tag) {
if (tag.isPostsILike()) {
return "date_liked";
return "datetime(date_liked)";
} else if (tag.isFollowedSites()) {
return "date_published";
return "datetime(date_published)";
} else if (tag.tagType == ReaderTagType.SEARCH) {
return "score";
} else if (tag.isTagTopic() || tag.isBookmarked()) {
return "date_tagged";
return "datetime(date_tagged)";
} else {
return "datetime(date_published)";
}
Expand Down Expand Up @@ -982,7 +982,7 @@ public static ReaderPostList getPostsInBlog(long blogId, int maxPosts, boolean e
String columns = (excludeTextColumn ? COLUMN_NAMES_NO_TEXT : "*");
String sql =
"SELECT " + columns + " FROM tbl_posts WHERE blog_id=? AND tag_name='' AND tag_type=0"
+ " ORDER BY date_published DESC";
+ " ORDER BY datetime(date_published) DESC";

if (maxPosts > 0) {
sql += " LIMIT " + maxPosts;
Expand Down Expand Up @@ -1020,7 +1020,7 @@ public static ReaderPostList getPostsInFeed(long feedId, int maxPosts, boolean e
String columns = (excludeTextColumn ? COLUMN_NAMES_NO_TEXT : "*");
String sql =
"SELECT " + columns + " FROM tbl_posts WHERE feed_id=? AND tag_name='' AND tag_type=0"
+ " ORDER BY date_published DESC";
+ " ORDER BY datetime(date_published) DESC";

if (maxPosts > 0) {
sql += " LIMIT " + maxPosts;
Expand Down Expand Up @@ -1097,7 +1097,7 @@ private static ReaderBlogIdPostIdList getBlogIdPostIds(@NonNull String sql, @Non
*/
public static ReaderBlogIdPostIdList getBlogIdPostIdsInBlog(long blogId, int maxPosts) {
String sql = "SELECT post_id FROM tbl_posts WHERE blog_id=? AND tag_name='' AND tag_type=0"
+ " ORDER BY date_published DESC";
+ " ORDER BY datetime(date_published) DESC";

if (maxPosts > 0) {
sql += " LIMIT " + maxPosts;
Expand Down
Loading