[CalendarServer-changes] [14253] CalendarServer/trunk/txdav/common/datastore

source_changes at macosforge.org source_changes at macosforge.org
Tue Jan 6 13:46:11 PST 2015


Revision: 14253
          http://trac.calendarserver.org//changeset/14253
Author:   cdaboo at apple.com
Date:     2015-01-06 13:46:11 -0800 (Tue, 06 Jan 2015)
Log Message:
-----------
Undo the previous schema upgrade change, and change the unit test instead.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_6_to_7.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_6_to_7.sql
    CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_6_to_7.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_6_to_7.sql	2015-01-06 21:36:43 UTC (rev 14252)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_6_to_7.sql	2015-01-06 21:46:11 UTC (rev 14253)
@@ -20,7 +20,7 @@
 
 -- Just need to add one column
 alter table CALENDAR_HOME
- add ("DATAVERSION" integer default 1 not null);
+ add ("DATAVERSION" integer default 1 null);
  
 -- Need to add timestamp columns
 alter table CALENDAR_HOME_METADATA
@@ -34,7 +34,7 @@
 
 -- Just need to add one column
 alter table ADDRESSBOOK_HOME
- add ("DATAVERSION" integer default 1 not null);
+ add ("DATAVERSION" integer default 1 null);
  
 -- Need to add timestamp columns
 alter table ADDRESSBOOK_HOME_METADATA

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_6_to_7.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_6_to_7.sql	2015-01-06 21:36:43 UTC (rev 14252)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_6_to_7.sql	2015-01-06 21:46:11 UTC (rev 14253)
@@ -20,7 +20,7 @@
 
 -- Just need to add one column
 alter table CALENDAR_HOME
- add column DATAVERSION integer default 1 not null;
+ add column DATAVERSION integer default 1 null;
  
 -- Need to add timestamp columns
 alter table CALENDAR_HOME_METADATA
@@ -33,7 +33,7 @@
 
 -- Just need to add one column
 alter table ADDRESSBOOK_HOME
- add column DATAVERSION integer default 1 not null;
+ add column DATAVERSION integer default 1 null;
  
 -- Need to add timestamp columns
 alter table ADDRESSBOOK_HOME_METADATA

Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py	2015-01-06 21:36:43 UTC (rev 14252)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py	2015-01-06 21:46:11 UTC (rev 14253)
@@ -212,9 +212,9 @@
         # These are special case exceptions
         for i in (
             "Table: CALENDAR_HOME, column name DATAVERSION default mismatch",
-            "Table: CALENDAR_HOME, mismatched constraints: set([<Constraint: (NOT NULL ['DATAVERSION'] None)>])",
+            "Table: CALENDAR_HOME, mismatched constraints: set([<Constraint: (NOT NULL ('DATAVERSION',) None)>])",
             "Table: ADDRESSBOOK_HOME, column name DATAVERSION default mismatch",
-            "Table: ADDRESSBOOK_HOME, mismatched constraints: set([<Constraint: (NOT NULL ['DATAVERSION'] None)>])",
+            "Table: ADDRESSBOOK_HOME, mismatched constraints: set([<Constraint: (NOT NULL ('DATAVERSION',) None)>])",
             "Table: PUSH_NOTIFICATION_WORK, column name PUSH_PRIORITY default mismatch",
         ):
             try:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150106/2261f2c4/attachment.html>


More information about the calendarserver-changes mailing list