[CalendarServer-changes] [14505] CalendarServer/trunk/txdav/base/datastore/subpostgres.py

[source_changes at macosforge.org]

Revision: 14505
          http://trac.calendarserver.org//changeset/14505
Author:   wsanchez at apple.com
Date:     2015-03-04 14:44:38 -0800 (Wed, 04 Mar 2015)
Log Message:
-----------
autocommit weirdness

Modified Paths:
--------------
    CalendarServer/trunk/txdav/base/datastore/subpostgres.py

Modified: CalendarServer/trunk/txdav/base/datastore/subpostgres.py
===================================================================
--- CalendarServer/trunk/txdav/base/datastore/subpostgres.py	2015-03-04 22:12:52 UTC (rev 14504)
+++ CalendarServer/trunk/txdav/base/datastore/subpostgres.py	2015-03-04 22:44:38 UTC (rev 14505)
@@ -484,10 +484,17 @@
                 )
                 raise
 
-            createDatabaseConn.realConnection.autocommit = True
+            createDatabaseCursor = createDatabaseConn.cursor()
 
-            createDatabaseCursor = createDatabaseConn.cursor()
-            createDatabaseCursor.execute("commit")
+            if postgres.__name__ == "pg8000":
+                createDatabaseConn.realConnection.autocommit = True
+            elif postgres.__name__ == "pgdb":
+                createDatabaseCursor.execute("commit")
+            else:
+                raise InternalDataStoreError(
+                    "Unknown Postgres DBM module: {}".format(postgres)
+                )
+
             return createDatabaseConn, createDatabaseCursor
 
         monitor = PostgresMonitor(self)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150304/d6b33bea/attachment-0001.html>