[CalendarServer-changes] [9373] CalendarServer/trunk/txdav/common/datastore/upgrade/sql

source_changes at macosforge.org source_changes at macosforge.org
Tue Jun 19 13:47:19 PDT 2012


Revision: 9373
          http://trac.macosforge.org/projects/calendarserver/changeset/9373
Author:   cdaboo at apple.com
Date:     2012-06-19 13:47:18 -0700 (Tue, 19 Jun 2012)
Log Message:
-----------
Handle schema versions with two or more digits.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py
    CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py

Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py	2012-06-19 00:23:13 UTC (rev 9372)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py	2012-06-19 20:47:18 UTC (rev 9373)
@@ -34,7 +34,7 @@
 
     def _getSchemaVersion(self, fp, versionKey):
         schema = fp.getContent()
-        found = re.search("insert into CALENDARSERVER (\(NAME, VALUE\) )?values \('%s', '(\d)+'\);" % (versionKey,), schema)
+        found = re.search("insert into CALENDARSERVER (\(NAME, VALUE\) )?values \('%s', '(\d+)'\);" % (versionKey,), schema)
         if found is None:
             if versionKey == "VERSION":
                 self.fail("Could not determine schema version for: %s" % (fp,))

Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py	2012-06-19 00:23:13 UTC (rev 9372)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py	2012-06-19 20:47:18 UTC (rev 9373)
@@ -133,7 +133,7 @@
 
         # Retrieve the version number from the schema file
         current_schema = self.schemaLocation.child("current.sql").getContent()
-        found = re.search("insert into CALENDARSERVER values \('%s', '(\d)+'\);" % (self.versionKey,), current_schema)
+        found = re.search("insert into CALENDARSERVER values \('%s', '(\d+)'\);" % (self.versionKey,), current_schema)
         if found is None:
             msg = "Schema is missing required database key %s insert statement: %s" % (self.versionKey, current_schema,)
             self.log_error(msg)
@@ -199,7 +199,7 @@
         
         fp = self.getPathToUpgrades(dialect)
         upgrades = []
-        regex = re.compile("upgrade_from_(\d)+_to_(\d)+%s" % (self.upgradeFileSuffix,))
+        regex = re.compile("upgrade_from_(\d+)_to_(\d+)%s" % (self.upgradeFileSuffix,))
         for child in fp.globChildren("upgrade_*%s" % (self.upgradeFileSuffix,)):
             matched = regex.match(child.basename())
             if matched is not None:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120619/11ad68a8/attachment.html>


More information about the calendarserver-changes mailing list