[CalendarServer-changes] [15492] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Thu Mar 31 10:48:33 PDT 2016


Revision: 15492
          http://trac.calendarserver.org//changeset/15492
Author:   cdaboo at apple.com
Date:     2016-03-31 10:48:33 -0700 (Thu, 31 Mar 2016)
Log Message:
-----------
Fix old work item upgrade priority/weight default values during schema upgrade. Pull in latest twext.

Modified Paths:
--------------
    CalendarServer/trunk/requirements-cs.txt
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_36_to_37.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_36_to_37.sql

Modified: CalendarServer/trunk/requirements-cs.txt
===================================================================
--- CalendarServer/trunk/requirements-cs.txt	2016-03-31 17:43:21 UTC (rev 15491)
+++ CalendarServer/trunk/requirements-cs.txt	2016-03-31 17:48:33 UTC (rev 15492)
@@ -7,7 +7,7 @@
     zope.interface==4.1.3
 	    setuptools==18.5
 
-    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15423#egg=twextpy
+    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15491#egg=twextpy
         cffi==1.3.0
             pycparser==2.14
         #twisted

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_36_to_37.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_36_to_37.sql	2016-03-31 17:43:21 UTC (rev 15491)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_36_to_37.sql	2016-03-31 17:48:33 UTC (rev 15492)
@@ -40,8 +40,8 @@
 update IMIP_INVITATION_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'IMIP_INVITATION_WORK', NOT_BEFORE from IMIP_INVITATION_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'IMIP_INVITATION_WORK', 0, 5, NOT_BEFORE from IMIP_INVITATION_WORK);
 
 alter table IMIP_INVITATION_WORK
     drop column NOT_BEFORE;
@@ -59,8 +59,8 @@
 update IMIP_POLLING_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'IMIP_POLLING_WORK', NOT_BEFORE from IMIP_POLLING_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'IMIP_POLLING_WORK', 0, 5, NOT_BEFORE from IMIP_POLLING_WORK);
 
 alter table IMIP_POLLING_WORK
     drop column NOT_BEFORE;
@@ -78,8 +78,8 @@
 update IMIP_REPLY_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'IMIP_REPLY_WORK', NOT_BEFORE from IMIP_REPLY_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'IMIP_REPLY_WORK', 0, 5, NOT_BEFORE from IMIP_REPLY_WORK);
 
 alter table IMIP_REPLY_WORK
     drop column NOT_BEFORE;
@@ -99,8 +99,8 @@
     rename column "PRIORITY" to "PUSH_PRIORITY";
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'PUSH_NOTIFICATION_WORK', NOT_BEFORE from PUSH_NOTIFICATION_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'PUSH_NOTIFICATION_WORK', 2, 1, NOT_BEFORE from PUSH_NOTIFICATION_WORK);
 
 alter table PUSH_NOTIFICATION_WORK
     drop column NOT_BEFORE;
@@ -118,8 +118,8 @@
 update GROUP_CACHER_POLLING_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'GROUP_CACHER_POLLING_WORK', NOT_BEFORE from GROUP_CACHER_POLLING_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'GROUP_CACHER_POLLING_WORK', 0, 5, NOT_BEFORE from GROUP_CACHER_POLLING_WORK);
 
 alter table GROUP_CACHER_POLLING_WORK
     drop column NOT_BEFORE;
@@ -137,8 +137,8 @@
 update GROUP_REFRESH_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'GROUP_REFRESH_WORK', NOT_BEFORE from GROUP_REFRESH_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'GROUP_REFRESH_WORK', 0, 5, NOT_BEFORE from GROUP_REFRESH_WORK);
 
 alter table GROUP_REFRESH_WORK
     drop column NOT_BEFORE;
@@ -156,8 +156,8 @@
 update GROUP_ATTENDEE_RECONCILIATION_ set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'GROUP_ATTENDEE_RECONCILIATION_', NOT_BEFORE from GROUP_ATTENDEE_RECONCILIATION_);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'GROUP_ATTENDEE_RECONCILIATION_', 0, 5, NOT_BEFORE from GROUP_ATTENDEE_RECONCILIATION_);
 
 alter table GROUP_ATTENDEE_RECONCILIATION_
     drop column NOT_BEFORE;
@@ -175,8 +175,8 @@
 update CALENDAR_OBJECT_SPLITTER_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'CALENDAR_OBJECT_SPLITTER_WORK', NOT_BEFORE from CALENDAR_OBJECT_SPLITTER_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'CALENDAR_OBJECT_SPLITTER_WORK', 0, 5, NOT_BEFORE from CALENDAR_OBJECT_SPLITTER_WORK);
 
 alter table CALENDAR_OBJECT_SPLITTER_WORK
     drop column NOT_BEFORE;
@@ -194,8 +194,8 @@
 update FIND_MIN_VALID_REVISION_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'FIND_MIN_VALID_REVISION_WORK', NOT_BEFORE from FIND_MIN_VALID_REVISION_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'FIND_MIN_VALID_REVISION_WORK', 0, 5, NOT_BEFORE from FIND_MIN_VALID_REVISION_WORK);
 
 alter table FIND_MIN_VALID_REVISION_WORK
     drop column NOT_BEFORE;
@@ -213,8 +213,8 @@
 update REVISION_CLEANUP_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'REVISION_CLEANUP_WORK', NOT_BEFORE from REVISION_CLEANUP_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'REVISION_CLEANUP_WORK', 0, 5, NOT_BEFORE from REVISION_CLEANUP_WORK);
 
 alter table REVISION_CLEANUP_WORK
     drop column NOT_BEFORE;
@@ -232,8 +232,8 @@
 update INBOX_CLEANUP_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'INBOX_CLEANUP_WORK', NOT_BEFORE from INBOX_CLEANUP_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'INBOX_CLEANUP_WORK', 0, 5, NOT_BEFORE from INBOX_CLEANUP_WORK);
 
 alter table INBOX_CLEANUP_WORK
     drop column NOT_BEFORE;
@@ -251,8 +251,8 @@
 update CLEANUP_ONE_INBOX_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'CLEANUP_ONE_INBOX_WORK', NOT_BEFORE from CLEANUP_ONE_INBOX_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'CLEANUP_ONE_INBOX_WORK', 0, 5, NOT_BEFORE from CLEANUP_ONE_INBOX_WORK);
 
 alter table CLEANUP_ONE_INBOX_WORK
     drop column NOT_BEFORE;
@@ -270,8 +270,8 @@
 update SCHEDULE_REFRESH_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'SCHEDULE_REFRESH_WORK', NOT_BEFORE from SCHEDULE_REFRESH_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_REFRESH_WORK', 1, 5, NOT_BEFORE from SCHEDULE_REFRESH_WORK);
 
 alter table SCHEDULE_REFRESH_WORK
     drop column NOT_BEFORE;
@@ -289,8 +289,8 @@
 update SCHEDULE_AUTO_REPLY_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'SCHEDULE_AUTO_REPLY_WORK', NOT_BEFORE from SCHEDULE_AUTO_REPLY_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_AUTO_REPLY_WORK', 1, 5, NOT_BEFORE from SCHEDULE_AUTO_REPLY_WORK);
 
 alter table SCHEDULE_AUTO_REPLY_WORK
     drop column NOT_BEFORE;
@@ -308,8 +308,8 @@
 update SCHEDULE_ORGANIZER_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'SCHEDULE_ORGANIZER_WORK', NOT_BEFORE from SCHEDULE_ORGANIZER_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_ORGANIZER_WORK', 1, 5, NOT_BEFORE from SCHEDULE_ORGANIZER_WORK);
 
 alter table SCHEDULE_ORGANIZER_WORK
     drop column NOT_BEFORE;
@@ -327,8 +327,8 @@
 update SCHEDULE_REPLY_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'SCHEDULE_REPLY_WORK', NOT_BEFORE from SCHEDULE_REPLY_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_REPLY_WORK', 1, 5, NOT_BEFORE from SCHEDULE_REPLY_WORK);
 
 alter table SCHEDULE_REPLY_WORK
     drop column NOT_BEFORE;
@@ -346,8 +346,8 @@
 update SCHEDULE_REPLY_CANCEL_WORK set JOB_ID = JOB_SEQ.nextval;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'SCHEDULE_REPLY_CANCEL_WORK', NOT_BEFORE from SCHEDULE_REPLY_CANCEL_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_REPLY_CANCEL_WORK', 1, 5, NOT_BEFORE from SCHEDULE_REPLY_CANCEL_WORK);
 
 alter table SCHEDULE_REPLY_CANCEL_WORK
     drop column NOT_BEFORE;

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_36_to_37.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_36_to_37.sql	2016-03-31 17:43:21 UTC (rev 15491)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_36_to_37.sql	2016-03-31 17:48:33 UTC (rev 15492)
@@ -48,8 +48,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'IMIP_INVITATION_WORK', NOT_BEFORE from IMIP_INVITATION_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'IMIP_INVITATION_WORK', 0, 5, NOT_BEFORE from IMIP_INVITATION_WORK);
 
 alter table IMIP_INVITATION_WORK
     drop column NOT_BEFORE,
@@ -64,8 +64,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'IMIP_POLLING_WORK', NOT_BEFORE from IMIP_POLLING_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'IMIP_POLLING_WORK', 0, 5, NOT_BEFORE from IMIP_POLLING_WORK);
 
 alter table IMIP_POLLING_WORK
     drop column NOT_BEFORE,
@@ -80,8 +80,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'IMIP_REPLY_WORK', NOT_BEFORE from IMIP_REPLY_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'IMIP_REPLY_WORK', 0, 5, NOT_BEFORE from IMIP_REPLY_WORK);
 
 alter table IMIP_REPLY_WORK
     drop column NOT_BEFORE,
@@ -98,8 +98,8 @@
     rename PRIORITY to PUSH_PRIORITY;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'PUSH_NOTIFICATION_WORK', NOT_BEFORE from PUSH_NOTIFICATION_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'PUSH_NOTIFICATION_WORK', 2, 1, NOT_BEFORE from PUSH_NOTIFICATION_WORK);
 
 alter table PUSH_NOTIFICATION_WORK
     drop column NOT_BEFORE,
@@ -114,8 +114,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'GROUP_CACHER_POLLING_WORK', NOT_BEFORE from GROUP_CACHER_POLLING_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'GROUP_CACHER_POLLING_WORK', 0, 5, NOT_BEFORE from GROUP_CACHER_POLLING_WORK);
 
 alter table GROUP_CACHER_POLLING_WORK
     drop column NOT_BEFORE,
@@ -130,8 +130,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'GROUP_REFRESH_WORK', NOT_BEFORE from GROUP_REFRESH_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'GROUP_REFRESH_WORK', 0, 5, NOT_BEFORE from GROUP_REFRESH_WORK);
 
 alter table GROUP_REFRESH_WORK
     drop column NOT_BEFORE,
@@ -146,8 +146,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'GROUP_ATTENDEE_RECONCILIATION_WORK', NOT_BEFORE from GROUP_ATTENDEE_RECONCILIATION_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'GROUP_ATTENDEE_RECONCILIATION_WORK', 0, 5, NOT_BEFORE from GROUP_ATTENDEE_RECONCILIATION_WORK);
 
 alter table GROUP_ATTENDEE_RECONCILIATION_WORK
     drop column NOT_BEFORE,
@@ -162,8 +162,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'CALENDAR_OBJECT_SPLITTER_WORK', NOT_BEFORE from CALENDAR_OBJECT_SPLITTER_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'CALENDAR_OBJECT_SPLITTER_WORK', 0, 5, NOT_BEFORE from CALENDAR_OBJECT_SPLITTER_WORK);
 
 alter table CALENDAR_OBJECT_SPLITTER_WORK
     drop column NOT_BEFORE,
@@ -178,8 +178,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'FIND_MIN_VALID_REVISION_WORK', NOT_BEFORE from FIND_MIN_VALID_REVISION_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'FIND_MIN_VALID_REVISION_WORK', 0, 5, NOT_BEFORE from FIND_MIN_VALID_REVISION_WORK);
 
 alter table FIND_MIN_VALID_REVISION_WORK
     drop column NOT_BEFORE,
@@ -194,8 +194,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'REVISION_CLEANUP_WORK', NOT_BEFORE from REVISION_CLEANUP_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'REVISION_CLEANUP_WORK', 0, 5, NOT_BEFORE from REVISION_CLEANUP_WORK);
 
 alter table REVISION_CLEANUP_WORK
     drop column NOT_BEFORE,
@@ -210,8 +210,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'INBOX_CLEANUP_WORK', NOT_BEFORE from INBOX_CLEANUP_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'INBOX_CLEANUP_WORK', 0, 5, NOT_BEFORE from INBOX_CLEANUP_WORK);
 
 alter table INBOX_CLEANUP_WORK
     drop column NOT_BEFORE,
@@ -226,8 +226,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'CLEANUP_ONE_INBOX_WORK', NOT_BEFORE from CLEANUP_ONE_INBOX_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'CLEANUP_ONE_INBOX_WORK', 0, 5, NOT_BEFORE from CLEANUP_ONE_INBOX_WORK);
 
 alter table CLEANUP_ONE_INBOX_WORK
     drop column NOT_BEFORE,
@@ -242,8 +242,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'SCHEDULE_REFRESH_WORK', NOT_BEFORE from SCHEDULE_REFRESH_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_REFRESH_WORK', 1, 5, NOT_BEFORE from SCHEDULE_REFRESH_WORK);
 
 alter table SCHEDULE_REFRESH_WORK
     drop column NOT_BEFORE,
@@ -258,8 +258,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'SCHEDULE_AUTO_REPLY_WORK', NOT_BEFORE from SCHEDULE_AUTO_REPLY_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_AUTO_REPLY_WORK', 1, 5, NOT_BEFORE from SCHEDULE_AUTO_REPLY_WORK);
 
 alter table SCHEDULE_AUTO_REPLY_WORK
     drop column NOT_BEFORE,
@@ -274,8 +274,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'SCHEDULE_ORGANIZER_WORK', NOT_BEFORE from SCHEDULE_ORGANIZER_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_ORGANIZER_WORK', 1, 5, NOT_BEFORE from SCHEDULE_ORGANIZER_WORK);
 
 alter table SCHEDULE_ORGANIZER_WORK
     drop column NOT_BEFORE,
@@ -290,8 +290,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'SCHEDULE_REPLY_WORK', NOT_BEFORE from SCHEDULE_REPLY_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_REPLY_WORK', 1, 5, NOT_BEFORE from SCHEDULE_REPLY_WORK);
 
 alter table SCHEDULE_REPLY_WORK
     drop column NOT_BEFORE,
@@ -306,8 +306,8 @@
     add JOB_ID  integer default nextval('JOB_SEQ') not null;
 
 insert into JOB
-  (JOB_ID, WORK_TYPE, NOT_BEFORE)
-  (select JOB_ID, 'SCHEDULE_REPLY_CANCEL_WORK', NOT_BEFORE from SCHEDULE_REPLY_CANCEL_WORK);
+  (JOB_ID, WORK_TYPE, PRIORITY, WEIGHT, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_REPLY_CANCEL_WORK', 1, 5, NOT_BEFORE from SCHEDULE_REPLY_CANCEL_WORK);
 
 alter table SCHEDULE_REPLY_CANCEL_WORK
     drop column NOT_BEFORE,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160331/82fcd5c4/attachment-0001.html>


More information about the calendarserver-changes mailing list