update schema

plugins/2_today.sh

@@ -26,7 +26,7 @@ SELECT
 FROM $TASKTABLE as TASK
 LEFT OUTER JOIN $TASKTABLE PROJECT ON TASK.project = PROJECT.uuid
 LEFT OUTER JOIN $AREATABLE AREA ON TASK.area = AREA.uuid
-LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.actionGroup = HEADING.uuid
+LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.heading = HEADING.uuid
 WHERE TASK.$ISNOTTRASHED AND TASK.$ISOPEN AND TASK.$ISTASK
 AND TASK.$ISSTARTED
 AND TASK.startdate is NOT NULL

plugins/3_upcoming.sh

@@ -30,9 +30,9 @@ SELECT
 FROM $TASKTABLE as TASK
 LEFT OUTER JOIN $TASKTABLE PROJECT ON TASK.project = PROJECT.uuid
 LEFT OUTER JOIN $AREATABLE AREA ON TASK.area = AREA.uuid
-LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.actionGroup = HEADING.uuid
+LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.heading = HEADING.uuid
 WHERE TASK.$ISNOTTRASHED AND TASK.$ISOPEN AND TASK.$ISTASK
-AND TASK.$ISPOSTPONED AND (TASK.startDate NOT NULL OR TASK.recurrenceRule NOT NULL)
+AND TASK.$ISPOSTPONED AND (TASK.startDate NOT NULL OR TASK.rt1_recurrenceRule NOT NULL)
 ORDER BY TASK.startdate, TASK.todayIndex
 LIMIT $LIMIT_BY
 SQL

plugins/4_next.sh

@@ -26,15 +26,15 @@ SELECT
 FROM $TASKTABLE TASK
 LEFT OUTER JOIN $TASKTABLE PROJECT ON TASK.project = PROJECT.uuid
 LEFT OUTER JOIN $AREATABLE AREA ON TASK.area = AREA.uuid
-LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.actionGroup = HEADING.uuid
+LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.heading = HEADING.uuid
 WHERE TASK.$ISNOTTRASHED AND TASK.$ISOPEN AND TASK.$ISTASK AND TASK.$ISSTARTED
 AND (
   TASK.area NOT NULL
   OR
   TASK.project in (SELECT uuid FROM $TASKTABLE WHERE uuid=TASK.project AND $ISSTARTED AND $ISNOTTRASHED) 
   OR
-  TASK.actionGroup in 
-    (SELECT uuid FROM TMTask heading WHERE uuid=TASK.actionGroup 
+  TASK.heading in 
+    (SELECT uuid FROM TMTask heading WHERE uuid=TASK.heading 
       AND $ISSTARTED 
       AND $ISNOTTRASHED
       AND heading.project in (SELECT uuid FROM TMTask WHERE uuid=heading.project AND $ISSTARTED AND $ISNOTTRASHED)

plugins/5_someday.sh

@@ -26,7 +26,7 @@ SELECT
 FROM $TASKTABLE as TASK
 LEFT OUTER JOIN $TASKTABLE PROJECT ON TASK.project = PROJECT.uuid
 LEFT OUTER JOIN $AREATABLE AREA ON TASK.area = AREA.uuid
-LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.actionGroup = HEADING.uuid
+LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.heading = HEADING.uuid
 WHERE TASK.$ISNOTTRASHED AND TASK.$ISTASK
 AND TASK.$ISPOSTPONED AND TASK.$ISOPEN
 ORDER BY TASK.$ORDER_BY

plugins/6_completed.sh

@@ -25,7 +25,7 @@ SELECT
 FROM $TASKTABLE TASK
 LEFT OUTER JOIN $TASKTABLE PROJECT ON TASK.project = PROJECT.uuid
 LEFT OUTER JOIN $AREATABLE AREA ON TASK.area = AREA.uuid
-LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.actionGroup = HEADING.uuid
+LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.heading = HEADING.uuid
 WHERE TASK.$ISNOTTRASHED AND TASK.$ISTASK
 AND TASK.$ISCOMPLETED
 ORDER BY TASK.$ORDER_BY

plugins/7_cancelled.sh

@@ -27,7 +27,7 @@ SELECT
 FROM $TASKTABLE as TASK
 LEFT OUTER JOIN $TASKTABLE PROJECT ON TASK.project = PROJECT.uuid
 LEFT OUTER JOIN $AREATABLE AREA ON TASK.area = AREA.uuid
-LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.actionGroup = HEADING.uuid
+LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.heading = HEADING.uuid
 WHERE TASK.$ISNOTTRASHED AND TASK.$ISCANCELLED AND TASK.$ISTASK
 ORDER BY StopDate
 LIMIT $LIMIT_BY

plugins/ical.sh

@@ -30,17 +30,17 @@ queryIcal() {
 getIcalQuery() {
   read -rd '' query <<-SQL || true
 SELECT
-  date(TASK.dueDate,"unixepoch"),
+  date(TASK.deadline,"unixepoch"),
   "" || TASK.title,
   "things:///show?id=" || TASK.uuid,
   "" || REPLACE(REPLACE(TASK.notes, CHAR(13), ', '), CHAR(10), ', ')
 FROM $TASKTABLE as TASK
 LEFT OUTER JOIN $TASKTABLE PROJECT ON TASK.project = PROJECT.uuid
 LEFT OUTER JOIN $AREATABLE AREA ON TASK.area = AREA.uuid
-LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.actionGroup = HEADING.uuid
+LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.heading = HEADING.uuid
 WHERE TASK.$ISNOTTRASHED AND TASK.$ISOPEN
-AND TASK.dueDate NOT NULL
-ORDER BY TASK.dueDate
+AND TASK.deadline NOT NULL
+ORDER BY TASK.deadline
 LIMIT $LIMIT_BY
 SQL
   echo "$query"

plugins/old.sh

@@ -28,7 +28,7 @@ FROM $TASKTABLE as TASK
 LEFT OUTER JOIN $TASKTABLE PROJECT ON TASK.project = PROJECT.uuid
 LEFT OUTER JOIN $AREATABLE AREA ON TASK.area = AREA.uuid
 LEFT OUTER JOIN $TASKTABLE HEADING ON TASK.heading = HEADING.uuid
-WHERE TASK.$ISNOTTRASHED AND TASK.$ISOPEN AND TASK.$ISTASK AND TASK.recurrenceRule IS NULL
+WHERE TASK.$ISNOTTRASHED AND TASK.$ISOPEN AND TASK.$ISTASK AND TASK.rt1_recurrenceRule IS NULL
 ORDER BY TASK.$ORDER_BY
 LIMIT $LIMIT_BY
 SQL

plugins/repeating.sh

@@ -18,7 +18,7 @@ SELECT title,
   "things:///show?id=" || TASK.uuid
 FROM $TASKTABLE as TASK
 WHERE $ISNOTTRASHED AND $ISOPEN AND $ISPOSTPONED
-AND recurrenceRule NOT NULL
+AND rt1_recurrenceRule NOT NULL
 ORDER BY $ORDER_BY
 LIMIT $LIMIT_BY
 SQL