<!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>[14506] CalendarServer/trunk</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/14506">14506</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-04 14:48:03 -0800 (Wed, 04 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of importFileName argument to PostgresService's init.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunkconfcaldavdappleplist">CalendarServer/trunk/conf/caldavd-apple.plist</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktxdavbasedatastoresubpostgrespy">CalendarServer/trunk/txdav/base/datastore/subpostgres.py</a></li>
<li><a href="#CalendarServertrunktxdavbasedatastoretesttest_subpostgrespy">CalendarServer/trunk/txdav/base/datastore/test/test_subpostgres.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (14505 => 14506)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2015-03-04 22:44:38 UTC (rev 14505)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2015-03-04 22:48:03 UTC (rev 14506)
</span><span class="lines">@@ -150,7 +150,6 @@
</span><span class="cx"> options=config.Postgres.Options,
</span><span class="cx"> uid=uid, gid=gid,
</span><span class="cx"> spawnedDBUser=config.SpawnedDBUser,
</span><del>- importFileName=config.DBImportFile,
</del><span class="cx"> pgCtl=config.Postgres.Ctl,
</span><span class="cx"> initDB=config.Postgres.Init,
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdappleplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-apple.plist (14505 => 14506)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-apple.plist 2015-03-04 22:44:38 UTC (rev 14505)
+++ CalendarServer/trunk/conf/caldavd-apple.plist 2015-03-04 22:48:03 UTC (rev 14506)
</span><span class="lines">@@ -99,8 +99,6 @@
</span><span class="cx"> <string></string>
</span><span class="cx"> <key>DSN</key>
</span><span class="cx"> <string></string>
</span><del>- <key>DBImportFile</key>
- <string>/Library/Server/Calendar and Contacts/DataDump.sql</string>
</del><span class="cx"> <key>Postgres</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>Ctl</key>
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (14505 => 14506)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-03-04 22:44:38 UTC (rev 14505)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-03-04 22:48:03 UTC (rev 14506)
</span><span class="lines">@@ -202,8 +202,6 @@
</span><span class="cx">
</span><span class="cx"> "SpawnedDBUser": "caldav", # The username to use when DBType is empty
</span><span class="cx">
</span><del>- "DBImportFile": "", # File path to SQL file to import at startup (includes schema)
-
</del><span class="cx"> "DSN": "", # Data Source Name. Used to connect to an external
</span><span class="cx"> # database if DBType is non-empty. Format varies
</span><span class="cx"> # depending on database type.
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasedatastoresubpostgrespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/subpostgres.py (14505 => 14506)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/datastore/subpostgres.py 2015-03-04 22:44:38 UTC (rev 14505)
+++ CalendarServer/trunk/txdav/base/datastore/subpostgres.py 2015-03-04 22:48:03 UTC (rev 14506)
</span><span class="lines">@@ -186,7 +186,6 @@
</span><span class="cx"> testMode=False,
</span><span class="cx"> uid=None, gid=None,
</span><span class="cx"> spawnedDBUser="caldav",
</span><del>- importFileName=None,
</del><span class="cx"> pgCtl="pg_ctl",
</span><span class="cx"> initDB="initdb",
</span><span class="cx"> reactor=None,
</span><span class="lines">@@ -203,9 +202,6 @@
</span><span class="cx">
</span><span class="cx"> @param spawnedDBUser: the postgres role
</span><span class="cx"> @type spawnedDBUser: C{str}
</span><del>- @param importFileName: path to SQL file containing previous data to
- import
- @type importFileName: C{str}
</del><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> # FIXME: By default there is very little (4MB) shared memory available,
</span><span class="lines">@@ -269,7 +265,6 @@
</span><span class="cx"> self.uid = uid
</span><span class="cx"> self.gid = gid
</span><span class="cx"> self.spawnedDBUser = spawnedDBUser
</span><del>- self.importFileName = importFileName
</del><span class="cx"> self.schema = schema
</span><span class="cx"> self.monitor = None
</span><span class="cx"> self.openConnections = []
</span><span class="lines">@@ -422,10 +417,6 @@
</span><span class="cx"> # otherwise execute schema
</span><span class="cx"> executeSQL = True
</span><span class="cx"> sqlToExecute = self.schema
</span><del>- if self.importFileName:
- importFilePath = CachingFilePath(self.importFileName)
- if importFilePath.exists():
- sqlToExecute = importFilePath.getContent()
</del><span class="cx">
</span><span class="cx"> createDatabaseCursor.close()
</span><span class="cx"> createDatabaseConn.close()
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasedatastoretesttest_subpostgrespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/test/test_subpostgres.py (14505 => 14506)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/datastore/test/test_subpostgres.py 2015-03-04 22:44:38 UTC (rev 14505)
+++ CalendarServer/trunk/txdav/base/datastore/test/test_subpostgres.py 2015-03-04 22:48:03 UTC (rev 14506)
</span><span class="lines">@@ -139,61 +139,3 @@
</span><span class="cx"> cursor.execute("select * from test_dummy_table")
</span><span class="cx"> values = cursor.fetchall()
</span><span class="cx"> self.assertEquals(map(list, values), [["dummy"]])
</span><del>-
-
- @inlineCallbacks
- def test_startService_withDumpFile(self):
- """
- Assuming a properly configured environment ($PATH points at an 'initdb'
- and 'postgres', $PYTHONPATH includes pgdb), starting a
- L{PostgresService} will start the service passed to it, after importing
- an existing dump file.
- """
-
- test = self
-
- class SimpleService1(Service):
-
- instances = []
- ready = Deferred()
-
- def __init__(self, connectionFactory, storageService):
- self.connection = connectionFactory()
- test.addCleanup(self.connection.close)
- self.instances.append(self)
-
-
- def startService(self):
- cursor = self.connection.cursor()
- try:
- cursor.execute(
- "insert into import_test_table values ('value2')"
- )
- except:
- self.ready.errback()
- else:
- self.ready.callback(None)
- finally:
- cursor.close()
-
- # The SQL in importFile.sql will get executed, including the insertion
- # of "value1"
- importFileName = (
- CachingFilePath(__file__).parent().child("importFile.sql").path
- )
- svc = PostgresService(
- CachingFilePath("postgres_3.pgdb"),
- SimpleService1,
- "",
- databaseName="dummy_db",
- testMode=True,
- importFileName=importFileName
- )
- svc.startService()
- self.addCleanup(svc.stopService)
- yield SimpleService1.ready
- connection = SimpleService1.instances[0].connection
- cursor = connection.cursor()
- cursor.execute("select * from import_test_table")
- values = cursor.fetchall()
- self.assertEquals(map(list, values), [["value1"], ["value2"]])
</del></span></pre>
</div>
</div>
</body>
</html>