<!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>[15350] CalendarServer/trunk/txdav/base/datastore</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/15350">15350</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-12-01 08:53:48 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure pg8000 type conversions are in place when using an externally launched DB.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavbasedatastoredbapiclientpy">CalendarServer/trunk/txdav/base/datastore/dbapiclient.py</a></li>
<li><a href="#CalendarServertrunktxdavbasedatastoresuboraclepy">CalendarServer/trunk/txdav/base/datastore/suboracle.py</a></li>
<li><a href="#CalendarServertrunktxdavbasedatastoresubpostgrespy">CalendarServer/trunk/txdav/base/datastore/subpostgres.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavbasedatastoredbapiclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/dbapiclient.py (15349 => 15350)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/datastore/dbapiclient.py 2015-11-30 22:52:34 UTC (rev 15349)
+++ CalendarServer/trunk/txdav/base/datastore/dbapiclient.py 2015-12-01 16:53:48 UTC (rev 15350)
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> dbkwargs["host"] = params.host
</span><span class="cx"> if params.port:
</span><span class="cx"> dbkwargs["port"] = int(params.port)
</span><del>- return DBAPIConnector(dbmodule, postgresPreflight, **dbkwargs)
</del><ins>+ return DBAPIConnector(dbmodule, pg8000Preflight, **dbkwargs)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="lines">@@ -406,3 +406,33 @@
</span><span class="cx"> # connection can safely be pooled without executing anything on it.
</span><span class="cx"> connection.commit()
</span><span class="cx"> c.close()
</span><ins>+
+
+
+def pg8000Preflight(connection):
+ """
+ Pre-flight function for pg8000/PostgreSQL connections: setup type mappings
+ in addition to the normal postgres preflight.
+ """
+
+ # Do the base PostgreSQL preflight
+ postgresPreflight(connection)
+
+ # Patch pg8000 behavior to match what we need wrt text processing
+ def my_text_out(v):
+ return v.encode("utf-8") if isinstance(v, unicode) else str(v)
+
+ connection.realConnection.py_types[str] = (705, postgres.core.FC_TEXT, my_text_out)
+ connection.realConnection.py_types[postgres.six.text_type] = (705, postgres.core.FC_TEXT, my_text_out)
+
+ def my_text_recv(data, offset, length):
+ return str(data[offset: offset + length])
+
+ connection.realConnection.default_factory = lambda: (postgres.core.FC_TEXT, my_text_recv)
+ connection.realConnection.pg_types[19] = (postgres.core.FC_BINARY, my_text_recv)
+ connection.realConnection.pg_types[25] = (postgres.core.FC_BINARY, my_text_recv)
+ connection.realConnection.pg_types[705] = (postgres.core.FC_BINARY, my_text_recv)
+ connection.realConnection.pg_types[829] = (postgres.core.FC_TEXT, my_text_recv)
+ connection.realConnection.pg_types[1042] = (postgres.core.FC_BINARY, my_text_recv)
+ connection.realConnection.pg_types[1043] = (postgres.core.FC_BINARY, my_text_recv)
+ connection.realConnection.pg_types[2275] = (postgres.core.FC_BINARY, my_text_recv)
</ins></span></pre></div>
<a id="CalendarServertrunktxdavbasedatastoresuboraclepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/suboracle.py (15349 => 15350)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/datastore/suboracle.py 2015-11-30 22:52:34 UTC (rev 15349)
+++ CalendarServer/trunk/txdav/base/datastore/suboracle.py 2015-12-01 16:53:48 UTC (rev 15350)
</span><span class="lines">@@ -31,6 +31,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class OracleService(MultiService):
</span><ins>+ """
+ A service for connecting to a locally running Oracle DB VM. This is only used
+ during unit tests.
+ """
</ins><span class="cx">
</span><span class="cx"> def __init__(
</span><span class="cx"> self, dataStoreDirectory, subServiceFactory,
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasedatastoresubpostgrespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/subpostgres.py (15349 => 15350)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/datastore/subpostgres.py 2015-11-30 22:52:34 UTC (rev 15349)
+++ CalendarServer/trunk/txdav/base/datastore/subpostgres.py 2015-12-01 16:53:48 UTC (rev 15350)
</span><span class="lines">@@ -350,30 +350,9 @@
</span><span class="cx"> """
</span><span class="cx"> Produce a DB-API 2.0 connection pointed at this database.
</span><span class="cx"> """
</span><del>- connection = self._connectorFor(databaseName).connect(label)
</del><ins>+ return self._connectorFor(databaseName).connect(label)
</ins><span class="cx">
</span><del>- if postgres.__name__ == "pg8000":
- # Patch pg8000 behavior to match what we need wrt text processing
</del><span class="cx">
</span><del>- def my_text_out(v):
- return v.encode("utf-8") if isinstance(v, unicode) else str(v)
- connection.realConnection.py_types[str] = (705, postgres.core.FC_TEXT, my_text_out)
- connection.realConnection.py_types[postgres.six.text_type] = (705, postgres.core.FC_TEXT, my_text_out)
-
- def my_text_recv(data, offset, length):
- return str(data[offset: offset + length])
- connection.realConnection.default_factory = lambda: (postgres.core.FC_TEXT, my_text_recv)
- connection.realConnection.pg_types[19] = (postgres.core.FC_BINARY, my_text_recv)
- connection.realConnection.pg_types[25] = (postgres.core.FC_BINARY, my_text_recv)
- connection.realConnection.pg_types[705] = (postgres.core.FC_BINARY, my_text_recv)
- connection.realConnection.pg_types[829] = (postgres.core.FC_TEXT, my_text_recv)
- connection.realConnection.pg_types[1042] = (postgres.core.FC_BINARY, my_text_recv)
- connection.realConnection.pg_types[1043] = (postgres.core.FC_BINARY, my_text_recv)
- connection.realConnection.pg_types[2275] = (postgres.core.FC_BINARY, my_text_recv)
-
- return connection
-
-
</del><span class="cx"> def ready(self, createDatabaseConn, createDatabaseCursor):
</span><span class="cx"> """
</span><span class="cx"> Subprocess is ready. Time to initialize the subservice.
</span></span></pre>
</div>
</div>
</body>
</html>