psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-22 08:56:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use parse_dsn in ReplicationConnectionBase

Browse Source
This commit is contained in:
Oleksandr Shulgin 2015-10-01 16:04:19 +02:00
parent 95ee218c6d
commit cac83da5db
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/extras.py
View File

@ -449,7 +449,7 @@ class ReplicationConnectionBase(_connection):
classes. Uses `ReplicationCursor` automatically.
"""
def __init__(self, *args, **kwargs):
def __init__(self, dsn, **kwargs):
"""
Initializes a replication connection by adding appropriate
parameters to the provided DSN and tweaking the connection
@ -466,21 +466,16 @@ class ReplicationConnectionBase(_connection):
else:
raise psycopg2.ProgrammingError("unrecognized replication type: %s" % self.replication_type)
# FIXME: could really use parse_dsn here
dsn = args[0]
if dsn.startswith('postgres://') or dsn.startswith('postgresql://'):
# poor man's url parsing
if dsn.rfind('?') > 0:
if not dsn.endswith('?'):
dsn += '&'
else:
dsn += '?'
else:
dsn += ' '
dsn += 'replication=%s' % replication
args = [dsn] + list(args[1:])
items = _ext.parse_dsn(dsn)
super(ReplicationConnectionBase, self).__init__(*args, **kwargs)
# we add an appropriate replication keyword parameter, unless
# user has specified one explicitly in the DSN
items.setdefault('replication', replication)
dsn = " ".join(["%s=%s" % (k, psycopg2._param_escape(str(v)))
for (k, v) in items.iteritems()])
super(ReplicationConnectionBase, self).__init__(dsn, **kwargs)
# prevent auto-issued BEGIN statements
if not self.async: