Jun 1, 2018 · Mar 16, 2018 · Mar 16, 2018 · Mar 16, 2018 · Mar 19, 2018 · Mar 22, 2018
diff --git a/testgres/node.py b/testgres/node.py
    pg_version_ge, \
    reserve_port, \
    release_port, \
    execute_utility
    execute_utility, \
    options_string

 from .backup import NodeBackup

        assert master is not None

        # yapf: disable
        conninfo =(
 u"application_name={} "
 u"port={} "
 u"user={} "
 ).format(self.name, master.port, username)
        conninfo ={
            "application_name": self.name,
            "port": master.port,
            "user": username
 }

        # host is tricky
        try:
            import ipaddress
            ipaddress.ip_address(master.host)
            conninfo += u"hostaddr={}".format(master.host)
            conninfo["hostaddr"] =master.host
        except ValueError:
            conninfo += u"host={}".format(master.host)
            conninfo["host"] =master.host

        # yapf: disable
        line = (
            "primary_conninfo='{}'\n"
            "standby_mode=on\n"
        ).format(conninfo)
        ).format(options_string(**conninfo))

        self.append_conf(RECOVERY_CONF_FILE, line)

diff --git a/testgres/pubsub.py b/testgres/pubsub.py
 # coding: utf-8

 from six import raise_from, iteritems
 from six import raise_from

 from .defaults import default_dbname, default_username
 from .exceptions import CatchUpException
 from .utils importpg_version_ge
 from .utils importoptions_string


 class Publication(object):
        self.pub = publication

        # connection info
        conninfo =(
 u"dbname={} user={} host={} port={}"
 ).format(self.pub.dbname,
 self.pub.username,
 self.pub.node.host,
         self.pub.node.port)
        conninfo ={
            "dbname": self.pub.dbname,
    "user":self.pub.username,
 "host":self.pub.node.host,
 "port":self.pub.node.port
 }

        query = (
            "create subscription {} connection '{}' publication {}"
        ).format(subname, conninfo, self.pub.name)
        ).format(subname,options_string(**conninfo), self.pub.name)

        # additional parameters
        if kwargs:
            params = ','.join('{}={}'.format(k, v) for k, v in iteritems(kwargs))
            query += " with ({})".format(params)
            query += " with ({})".format(options_string(**kwargs))

        node.safe_psql(query, dbname=dbname, username=username)

diff --git a/testgres/utils.py b/testgres/utils.py
 import sys

 from distutils.version import LooseVersion
 from six import iteritems

 from .config import testgres_config
 from .exceptions import ExecUtilException

 def eprint(*args, **kwargs):
    print(*args, file=sys.stderr, **kwargs)


 def options_string(separator=u" ", **kwargs):
    return separator.join(u"{}={}".format(k, v) for k, v in iteritems(kwargs))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,7 +63,8 @@
		pg_version_ge, \
		reserve_port, \
		release_port, \
		execute_utility
		execute_utility, \
		options_string

		from .backup import NodeBackup

Expand DownExpand Up		@@ -288,25 +289,25 @@ def _create_recovery_conf(self, username):
		assert master is not None

		# yapf: disable
		conninfo =(
		u"application_name={} "
		u"port={} "
		u"user={} "
		).format(self.name, master.port, username)
		conninfo ={
		"application_name": self.name,
		"port": master.port,
		"user": username
		}

		# host is tricky
		try:
		import ipaddress
		ipaddress.ip_address(master.host)
		conninfo += u"hostaddr={}".format(master.host)
		conninfo["hostaddr"] =master.host
		except ValueError:
		conninfo += u"host={}".format(master.host)
		conninfo["host"] =master.host

		# yapf: disable
		line = (
		"primary_conninfo='{}'\n"
		"standby_mode=on\n"
		).format(conninfo)
		).format(options_string(**conninfo))

		self.append_conf(RECOVERY_CONF_FILE, line)

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,10 +1,10 @@
		# coding: utf-8

		from six import raise_from, iteritems
		from six import raise_from

		from .defaults import default_dbname, default_username
		from .exceptions import CatchUpException
		from .utils importpg_version_ge
		from .utils importoptions_string


		class Publication(object):
Expand DownExpand Up		@@ -79,21 +79,20 @@ def __init__(self,
		self.pub = publication

		# connection info
		conninfo =(
		u"dbname={} user={} host={} port={}"
		).format(self.pub.dbname,
		self.pub.username,
		self.pub.node.host,
		self.pub.node.port)
		conninfo ={
		"dbname": self.pub.dbname,
		"user":self.pub.username,
		"host":self.pub.node.host,
		"port":self.pub.node.port
		}

		query = (
		"create subscription {} connection '{}' publication {}"
		).format(subname, conninfo, self.pub.name)
		).format(subname,options_string(**conninfo), self.pub.name)

		# additional parameters
		if kwargs:
		params = ','.join('{}={}'.format(k, v) for k, v in iteritems(kwargs))
		query += " with ({})".format(params)
		query += " with ({})".format(options_string(**kwargs))

		node.safe_psql(query, dbname=dbname, username=username)

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,6 +10,7 @@
		import sys

		from distutils.version import LooseVersion
		from six import iteritems

		from .config import testgres_config
		from .exceptions import ExecUtilException
Expand DownExpand Up		@@ -218,3 +219,7 @@ def file_tail(f, num_lines):

		def eprint(args, *kwargs):
		print(args, file=sys.stderr, *kwargs)


		def options_string(separator=u" ", **kwargs):
		return separator.join(u"{}={}".format(k, v) for k, v in iteritems(kwargs))