[CalendarServer-changes] [14032] CalendarServer/trunk/twistedcaldav
source_changes at macosforge.org
source_changes at macosforge.org
Tue Sep 30 09:48:38 PDT 2014
Revision: 14032
http://trac.calendarserver.org//changeset/14032
Author: sagen at apple.com
Date: 2014-09-30 09:48:38 -0700 (Tue, 30 Sep 2014)
Log Message:
-----------
Remove the sql augments implementations, and strip the <enable> element from augments.xml
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/directory/augment.py
CalendarServer/trunk/twistedcaldav/directory/test/test_augment.py
CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
CalendarServer/trunk/twistedcaldav/upgrade.py
Modified: CalendarServer/trunk/twistedcaldav/directory/augment.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/augment.py 2014-09-30 16:22:02 UTC (rev 14031)
+++ CalendarServer/trunk/twistedcaldav/directory/augment.py 2014-09-30 16:48:38 UTC (rev 14032)
@@ -25,8 +25,6 @@
from twext.python.log import Logger
from twistedcaldav.config import fullServerPath, config
-from twistedcaldav.database import AbstractADBAPIDatabase, ADBAPISqliteMixin, \
- ADBAPIPostgreSQLMixin
from twistedcaldav.directory import xmlaugmentsparser
from twistedcaldav.directory.xmlaugmentsparser import XMLAugmentsParser
from twistedcaldav.xmlutil import newElementTreeWithRoot, addSubElement, \
@@ -554,230 +552,3 @@
self.xmlFileStats[xmlFile] = (newModTime, newSize)
return results
-
-
-
-class AugmentADAPI(AugmentDB, AbstractADBAPIDatabase):
- """
- DBAPI based augment database implementation.
- """
-
- schema_version = "3"
- schema_type = "AugmentDB"
-
- def __init__(self, dbID, dbapiName, dbapiArgs, **kwargs):
-
- AugmentDB.__init__(self)
- AbstractADBAPIDatabase.__init__(self, dbID, dbapiName, dbapiArgs, True, **kwargs)
-
-
- @inlineCallbacks
- def getAllUIDs(self):
- """
- Get all AugmentRecord UIDs.
-
- @return: L{Deferred}
- """
-
- # Query for the record information
- results = (yield self.queryList("select UID from AUGMENTS", ()))
- returnValue(results)
-
-
- @inlineCallbacks
- def _lookupAugmentRecord(self, uid):
- """
- Get an AugmentRecord for the specified UID.
-
- @param uid: directory UID to lookup
- @type uid: C{str}
-
- @return: L{Deferred}
- """
-
- # Query for the record information
- results = (yield self.query("select UID, ENABLED, SERVERID, CALENDARING, ADDRESSBOOKS, AUTOSCHEDULEMODE, AUTOACCEPTGROUP, LOGINENABLED from AUGMENTS where UID = :1", (uid,)))
- if not results:
- returnValue(None)
- else:
- uid, enabled, serverid, enabledForCalendaring, enabledForAddressBooks, autoScheduleMode, autoAcceptGroup, enabledForLogin = results[0]
-
- record = AugmentRecord(
- uid=uid,
- enabled=enabled == "T",
- serverID=serverid,
- enabledForCalendaring=enabledForCalendaring == "T",
- enabledForAddressBooks=enabledForAddressBooks == "T",
- enabledForLogin=enabledForLogin == "T",
- autoScheduleMode=autoScheduleMode,
- autoAcceptGroup=autoAcceptGroup,
- )
-
- returnValue(record)
-
-
- @inlineCallbacks
- def addAugmentRecords(self, records):
-
- for record in records:
-
- results = (yield self.query("select UID from AUGMENTS where UID = :1", (record.uid,)))
- update = len(results) > 0
-
- if update:
- yield self._modifyRecord(record)
- else:
- yield self._addRecord(record)
-
-
- @inlineCallbacks
- def removeAugmentRecords(self, uids):
- """
- Remove AugmentRecords with the specified UIDs.
-
- @param uids: list of uids to remove
- @type uids: C{list} of C{str}
-
- @return: L{Deferred}
- """
-
- for uid in uids:
- yield self.execute("delete from AUGMENTS where UID = :1", (uid,))
-
-
- def clean(self):
- """
- Remove all records.
- """
-
- return self.execute("delete from AUGMENTS", ())
-
-
- def _db_version(self):
- """
- @return: the schema version assigned to this index.
- """
- return AugmentADAPI.schema_version
-
-
- def _db_type(self):
- """
- @return: the collection type assigned to this index.
- """
- return AugmentADAPI.schema_type
-
-
- @inlineCallbacks
- def _db_init_data_tables(self):
- """
- Initialize the underlying database tables.
- """
-
- #
- # AUGMENTS table
- #
- yield self._create_table(
- "AUGMENTS",
- (
- ("UID", "text unique"),
- ("ENABLED", "text(1)"),
- ("SERVERID", "text"),
- ("CALENDARING", "text(1)"),
- ("ADDRESSBOOKS", "text(1)"),
- ("AUTOSCHEDULEMODE", "text"),
- ("AUTOACCEPTGROUP", "text"),
- ("LOGINENABLED", "text(1)"),
- ),
- ifnotexists=True,
- )
-
-
- @inlineCallbacks
- def _db_empty_data_tables(self):
- yield self._db_execute("delete from AUGMENTS")
-
-
-
-class AugmentSqliteDB(ADBAPISqliteMixin, AugmentADAPI):
- """
- Sqlite based augment database implementation.
- """
-
- def __init__(self, dbpath):
-
- ADBAPISqliteMixin.__init__(self)
- AugmentADAPI.__init__(self, "Augments", "sqlite3", (fullServerPath(config.DataRoot, dbpath),))
-
-
- @inlineCallbacks
- def _addRecord(self, record):
- yield self.execute(
- """insert or replace into AUGMENTS
- (UID, ENABLED, SERVERID, CALENDARING, ADDRESSBOOKS, AUTOSCHEDULEMODE, AUTOACCEPTGROUP, LOGINENABLED)
- values (:1, :2, :3, :4, :5, :6, :7, :8)""",
- (
- record.uid,
- "T" if record.enabled else "F",
- record.serverID,
- "T" if record.enabledForCalendaring else "F",
- "T" if record.enabledForAddressBooks else "F",
- record.autoScheduleMode if record.autoScheduleMode else "",
- record.autoAcceptGroup,
- "T" if record.enabledForLogin else "F",
- )
- )
-
-
- def _modifyRecord(self, record):
- return self._addRecord(record)
-
-
-
-class AugmentPostgreSQLDB(ADBAPIPostgreSQLMixin, AugmentADAPI):
- """
- PostgreSQL based augment database implementation.
- """
-
- def __init__(self, host, database, user=None, password=None):
-
- ADBAPIPostgreSQLMixin.__init__(self)
- AugmentADAPI.__init__(self, "Augments", "pgdb", (), host=host, database=database, user=user, password=password,)
-
-
- @inlineCallbacks
- def _addRecord(self, record):
- yield self.execute(
- """insert into AUGMENTS
- (UID, ENABLED, SERVERID, CALENDARING, ADDRESSBOOKS, AUTOSCHEDULEMODE, AUTOACCEPTGROUP, LOGINENABLED)
- values (:1, :2, :3, :4, :5, :6, :7, :8)""",
- (
- record.uid,
- "T" if record.enabled else "F",
- record.serverID,
- "T" if record.enabledForCalendaring else "F",
- "T" if record.enabledForAddressBooks else "F",
- record.autoScheduleMode if record.autoScheduleMode else "",
- record.autoAcceptGroup,
- "T" if record.enabledForLogin else "F",
- )
- )
-
-
- @inlineCallbacks
- def _modifyRecord(self, record):
- yield self.execute(
- """update AUGMENTS set
- (UID, ENABLED, SERVERID, CALENDARING, ADDRESSBOOKS, AUTOSCHEDULEMODE, AUTOACCEPTGROUP, LOGINENABLED) =
- (:1, :2, :3, :4, :5, :6, :7, :8) where UID = :9""",
- (
- record.uid,
- "T" if record.enabled else "F",
- record.serverID,
- "T" if record.enabledForCalendaring else "F",
- "T" if record.enabledForAddressBooks else "F",
- record.autoScheduleMode if record.autoScheduleMode else "",
- record.autoAcceptGroup,
- "T" if record.enabledForLogin else "F",
- record.uid,
- )
- )
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_augment.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_augment.py 2014-09-30 16:22:02 UTC (rev 14031)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_augment.py 2014-09-30 16:48:38 UTC (rev 14032)
@@ -15,8 +15,7 @@
##
from twistedcaldav.test.util import TestCase
-from twistedcaldav.directory.augment import AugmentXMLDB, AugmentSqliteDB, \
- AugmentPostgreSQLDB, AugmentRecord
+from twistedcaldav.directory.augment import AugmentXMLDB, AugmentRecord
from twisted.internet.defer import inlineCallbacks
from twistedcaldav.directory.xmlaugmentsparser import XMLAugmentsParser
import cStringIO
@@ -341,27 +340,3 @@
AugmentXMLDB((newxmlfile.path,))
uids = list(self.uidsFromFile(newxmlfile.path))
self.assertEquals(uids, ['AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA'])
-
-
-
-class AugmentSqliteTests(AugmentTests, AugmentTestsMixin):
-
- def _db(self, dbpath=None):
- return AugmentSqliteDB(dbpath if dbpath else os.path.abspath(self.mktemp()))
-
-
-
-class AugmentPostgreSQLTests(AugmentTests, AugmentTestsMixin):
-
- def _db(self, dbpath=None):
- return AugmentPostgreSQLDB("localhost", "augments")
-
-try:
- import pgdb
-except ImportError:
- AugmentPostgreSQLTests.skip = True
-else:
- try:
- db = pgdb.connect(host="localhost", database="augments")
- except:
- AugmentPostgreSQLTests.skip = True
Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_upgrade.py 2014-09-30 16:22:02 UTC (rev 14031)
+++ CalendarServer/trunk/twistedcaldav/test/test_upgrade.py 2014-09-30 16:48:38 UTC (rev 14032)
@@ -1596,7 +1596,7 @@
</augments>
"""
-newAugmentsFormat = """<augments>\n <record>\n <uid>9F3603DD-65D0-480D-A1D1-5D33CAC41A13</uid>\n <enable>true</enable>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n <auto-schedule-mode>none</auto-schedule-mode>\n </record>\n <record>\n <uid>6A49C436-4CDB-4184-AD87-6F945040E37A</uid>\n <enable>true</enable>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n </record>\n <record>\n <uid>60B771CC-D727-4453-ACE0-0FE13CD7445A</uid>\n <enable>true</enable>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n <auto-schedule-mode>none</auto-schedule-mode>\n </record>\n <record>\n <uid>E173AADC-4642-43CB-9745-8CE436A6FE4A</uid>\n <enable>false</enable>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n <auto-schedule-mode>none</auto-schedule-mode>\n </record>\n <record>\n <uid>FC9A7F56-CCCA-4401-9160-903902880A37</uid>\n <enable>false</enable>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n <auto-schedule-mode>accept-if-free</auto-schedule-mode>\n </record>\n</augments>"""
+newAugmentsFormat = """<augments>\n <record>\n <uid>9F3603DD-65D0-480D-A1D1-5D33CAC41A13</uid>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n <auto-schedule-mode>none</auto-schedule-mode>\n </record>\n <record>\n <uid>6A49C436-4CDB-4184-AD87-6F945040E37A</uid>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n </record>\n <record>\n <uid>60B771CC-D727-4453-ACE0-0FE13CD7445A</uid>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n <auto-schedule-mode>none</auto-schedule-mode>\n </record>\n <record>\n <uid>E173AADC-4642-43CB-9745-8CE436A6FE4A</uid>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n <auto-schedule-mode>none</auto-schedule-mode>\n </record>\n <record>\n <uid>FC9A7F56-CCCA-4401-9160-903902880A37</uid>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n <auto-schedule-mode>accept-if-free</auto-schedule-mode>\n </record>\n</augments>"""
normalizeEvent = """BEGIN:VCALENDAR
Modified: CalendarServer/trunk/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/upgrade.py 2014-09-30 16:22:02 UTC (rev 14031)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py 2014-09-30 16:48:38 UTC (rev 14032)
@@ -732,6 +732,7 @@
log.info("Converting augments.xml")
for recordNode in augmentsNode:
+
autoScheduleElement = recordNode.find("auto-schedule")
if autoScheduleElement is not None:
if autoScheduleElement.text == "false":
@@ -740,6 +741,10 @@
autoScheduleModeElement.text = "none"
recordNode.remove(autoScheduleElement)
+ enableElement = recordNode.find("enable")
+ if enableElement is not None:
+ recordNode.remove(enableElement)
+
augmentsFilePath.setContent(etreeToString(augmentsNode, "utf-8"))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140930/07f4c87e/attachment-0001.html>
More information about the calendarserver-changes
mailing list