<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14032] CalendarServer/trunk/twistedcaldav</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14032">14032</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-09-30 09:48:38 -0700 (Tue, 30 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove the sql augments implementations, and strip the <enable> element from augments.xml</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryaugmentpy">CalendarServer/trunk/twistedcaldav/directory/augment.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_augmentpy">CalendarServer/trunk/twistedcaldav/directory/test/test_augment.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_upgradepy">CalendarServer/trunk/twistedcaldav/test/test_upgrade.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavupgradepy">CalendarServer/trunk/twistedcaldav/upgrade.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavdirectoryaugmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/augment.py (14031 => 14032)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.config import fullServerPath, config
</span><del>-from twistedcaldav.database import AbstractADBAPIDatabase, ADBAPISqliteMixin, \
- ADBAPIPostgreSQLMixin
</del><span class="cx"> from twistedcaldav.directory import xmlaugmentsparser
</span><span class="cx"> from twistedcaldav.directory.xmlaugmentsparser import XMLAugmentsParser
</span><span class="cx"> from twistedcaldav.xmlutil import newElementTreeWithRoot, addSubElement, \
</span><span class="lines">@@ -554,230 +552,3 @@
</span><span class="cx"> self.xmlFileStats[xmlFile] = (newModTime, newSize)
</span><span class="cx">
</span><span class="cx"> return results
</span><del>-
-
-
-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,
- )
- )
</del></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_augmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_augment.py (14031 => 14032)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -15,8 +15,7 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.test.util import TestCase
</span><del>-from twistedcaldav.directory.augment import AugmentXMLDB, AugmentSqliteDB, \
- AugmentPostgreSQLDB, AugmentRecord
</del><ins>+from twistedcaldav.directory.augment import AugmentXMLDB, AugmentRecord
</ins><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twistedcaldav.directory.xmlaugmentsparser import XMLAugmentsParser
</span><span class="cx"> import cStringIO
</span><span class="lines">@@ -341,27 +340,3 @@
</span><span class="cx"> AugmentXMLDB((newxmlfile.path,))
</span><span class="cx"> uids = list(self.uidsFromFile(newxmlfile.path))
</span><span class="cx"> self.assertEquals(uids, ['AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA'])
</span><del>-
-
-
-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
</del></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_upgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py (14031 => 14032)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1596,7 +1596,7 @@
</span><span class="cx"> </augments>
</span><span class="cx"> """
</span><span class="cx">
</span><del>-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>"""
</del><ins>+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>"""
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> normalizeEvent = """BEGIN:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/upgrade.py (14031 => 14032)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -732,6 +732,7 @@
</span><span class="cx">
</span><span class="cx"> log.info("Converting augments.xml")
</span><span class="cx"> for recordNode in augmentsNode:
</span><ins>+
</ins><span class="cx"> autoScheduleElement = recordNode.find("auto-schedule")
</span><span class="cx"> if autoScheduleElement is not None:
</span><span class="cx"> if autoScheduleElement.text == "false":
</span><span class="lines">@@ -740,6 +741,10 @@
</span><span class="cx"> autoScheduleModeElement.text = "none"
</span><span class="cx"> recordNode.remove(autoScheduleElement)
</span><span class="cx">
</span><ins>+ enableElement = recordNode.find("enable")
+ if enableElement is not None:
+ recordNode.remove(enableElement)
+
</ins><span class="cx"> augmentsFilePath.setContent(etreeToString(augmentsNode, "utf-8"))
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>