Fix "IS NOT NULL"

pull/848/head 6.9
Alex Baker 6 years ago
parent 9b56ce582c
commit e92bc29cfb

@ -1,6 +1,6 @@
Change Log Change Log
--- ---
### 6.9 (unreleased) ### 6.9 (2019-09-23)
* Synchronize tags with CalDAV * Synchronize tags with CalDAV
* Target Android 10 * Target Android 10

@ -34,7 +34,7 @@ android {
defaultConfig { defaultConfig {
testApplicationId = "org.tasks.test" testApplicationId = "org.tasks.test"
applicationId = "org.tasks" applicationId = "org.tasks"
versionCode = 612 versionCode = 613
versionName = "6.9" versionName = "6.9"
targetSdkVersion(Versions.targetSdk) targetSdkVersion(Versions.targetSdk)
minSdkVersion(Versions.minSdk) minSdkVersion(Versions.minSdk)

@ -86,7 +86,7 @@ public abstract class TaskDao {
@Query( @Query(
"SELECT * FROM tasks WHERE remoteId IN (:remoteIds) " "SELECT * FROM tasks WHERE remoteId IN (:remoteIds) "
+ "AND recurrence NOT NULL AND LENGTH(recurrence) > 0") + "AND recurrence IS NOT NULL AND LENGTH(recurrence) > 0")
public abstract List<Task> getRecurringTasks(List<String> remoteIds); public abstract List<Task> getRecurringTasks(List<String> remoteIds);
@Query("UPDATE tasks SET completed = :completionDate " + "WHERE remoteId = :remoteId") @Query("UPDATE tasks SET completed = :completionDate " + "WHERE remoteId = :remoteId")
@ -120,20 +120,20 @@ public abstract class TaskDao {
@Query("SELECT * FROM tasks") @Query("SELECT * FROM tasks")
public abstract List<Task> getAll(); public abstract List<Task> getAll();
@Query("SELECT calendarUri FROM tasks " + "WHERE calendarUri NOT NULL AND calendarUri != ''") @Query("SELECT calendarUri FROM tasks " + "WHERE calendarUri IS NOT NULL AND calendarUri != ''")
public abstract List<String> getAllCalendarEvents(); public abstract List<String> getAllCalendarEvents();
@Query("UPDATE tasks SET calendarUri = '' " + "WHERE calendarUri NOT NULL AND calendarUri != ''") @Query("UPDATE tasks SET calendarUri = '' " + "WHERE calendarUri IS NOT NULL AND calendarUri != ''")
public abstract int clearAllCalendarEvents(); public abstract int clearAllCalendarEvents();
@Query( @Query(
"SELECT calendarUri FROM tasks " "SELECT calendarUri FROM tasks "
+ "WHERE completed > 0 AND calendarUri NOT NULL AND calendarUri != ''") + "WHERE completed > 0 AND calendarUri IS NOT NULL AND calendarUri != ''")
public abstract List<String> getCompletedCalendarEvents(); public abstract List<String> getCompletedCalendarEvents();
@Query( @Query(
"UPDATE tasks SET calendarUri = '' " "UPDATE tasks SET calendarUri = '' "
+ "WHERE completed > 0 AND calendarUri NOT NULL AND calendarUri != ''") + "WHERE completed > 0 AND calendarUri IS NOT NULL AND calendarUri != ''")
public abstract int clearCompletedCalendarEvents(); public abstract int clearCompletedCalendarEvents();
@RawQuery @RawQuery

@ -67,7 +67,7 @@ public interface CaldavDao {
@Query( @Query(
"SELECT task.*, caldav_task.* FROM tasks AS task " "SELECT task.*, caldav_task.* FROM tasks AS task "
+ "INNER JOIN caldav_tasks AS caldav_task ON _id = cd_task " + "INNER JOIN caldav_tasks AS caldav_task ON _id = cd_task "
+ "WHERE cd_deleted = 0 AND cd_vtodo NOT NULL AND cd_vtodo != ''") + "WHERE cd_deleted = 0 AND cd_vtodo IS NOT NULL AND cd_vtodo != ''")
List<CaldavTaskContainer> getTasks(); List<CaldavTaskContainer> getTasks();
@Query("SELECT * FROM caldav_lists ORDER BY cdl_name COLLATE NOCASE") @Query("SELECT * FROM caldav_lists ORDER BY cdl_name COLLATE NOCASE")

Loading…
Cancel
Save