Commit954879a

committed

Added options_string() func

1 parentb1cba73 commit954879aCopy full SHA for 954879a

File tree

+25

-20

lines changed

+25

-20

lines changed

Lines changed: 10 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,8 @@`
`63`	`63`	`pg_version_ge, \`
`64`	`64`	`reserve_port, \`
`65`	`65`	`release_port, \`
`66`		`-execute_utility`
	`66`	`+execute_utility, \`
	`67`	`+options_string`
`67`	`68`
`68`	`69`	`from .backupimportNodeBackup`
`69`	`70`
`@@ -288,25 +289,25 @@ def _create_recovery_conf(self, username):`
`288`	`289`	`assertmasterisnotNone`
`289`	`290`
`290`	`291`	`# yapf: disable`
`291`		`-conninfo=(`
`292`		`-u"application_name={} "`
`293`		`-u"port={} "`
`294`		`-u"user={} "`
`295`		`-).format(self.name,master.port,username)`
	`292`	`+conninfo={`
	`293`	`+"application_name":self.name,`
	`294`	`+"port":master.port,`
	`295`	`+"user":username`
	`296`	`+}`
`296`	`297`
`297`	`298`	`# host is tricky`
`298`	`299`	`try:`
`299`	`300`	`importipaddress`
`300`	`301`	`ipaddress.ip_address(master.host)`
`301`		`-conninfo+=u"hostaddr={}".format(master.host)`
	`302`	`+conninfo["hostaddr"]=master.host`
`302`	`303`	`exceptValueError:`
`303`		`-conninfo+=u"host={}".format(master.host)`
	`304`	`+conninfo["host"]=master.host`
`304`	`305`
`305`	`306`	`# yapf: disable`
`306`	`307`	`line= (`
`307`	`308`	`"primary_conninfo='{}'\n"`
`308`	`309`	`"standby_mode=on\n"`
`309`		`- ).format(conninfo)`
	`310`	`+ ).format(options_string(**conninfo))`
`310`	`311`
`311`	`312`	`self.append_conf(RECOVERY_CONF_FILE,line)`
`312`	`313`

Lines changed: 10 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`# coding: utf-8`
`2`	`2`
`3`		`-fromsiximportraise_from,iteritems`
	`3`	`+fromsiximportraise_from`
`4`	`4`
`5`	`5`	`from .defaultsimportdefault_dbname,default_username`
`6`	`6`	`from .exceptionsimportCatchUpException`
`7`		`-from .utilsimportpg_version_ge`
	`7`	`+from .utilsimportoptions_string`
`8`	`8`
`9`	`9`
`10`	`10`	`classPublication(object):`
`@@ -79,21 +79,20 @@ def __init__(self,`
`79`	`79`	`self.pub=publication`
`80`	`80`
`81`	`81`	`# connection info`
`82`		`-conninfo=(`
`83`		`-u"dbname={} user={} host={} port={}"`
`84`		`-).format(self.pub.dbname,`
`85`		`-self.pub.username,`
`86`		`-self.pub.node.host,`
`87`		`-self.pub.node.port)`
	`82`	`+conninfo={`
	`83`	`+"dbname":self.pub.dbname,`
	`84`	`+"user":self.pub.username,`
	`85`	`+"host":self.pub.node.host,`
	`86`	`+"port":self.pub.node.port`
	`87`	`+}`
`88`	`88`
`89`	`89`	`query= (`
`90`	`90`	`"create subscription {} connection '{}' publication {}"`
`91`		`- ).format(subname,conninfo,self.pub.name)`
	`91`	`+ ).format(subname,options_string(**conninfo),self.pub.name)`
`92`	`92`
`93`	`93`	`# additional parameters`
`94`	`94`	`ifkwargs:`
`95`		`-params=','.join('{}={}'.format(k,v)fork,viniteritems(kwargs))`
`96`		`-query+=" with ({})".format(params)`
	`95`	`+query+=" with ({})".format(options_string(**kwargs))`
`97`	`96`
`98`	`97`	`node.safe_psql(query,dbname=dbname,username=username)`
`99`	`98`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`importsys`
`11`	`11`
`12`	`12`	`fromdistutils.versionimportLooseVersion`
	`13`	`+fromsiximportiteritems`
`13`	`14`
`14`	`15`	`from .configimporttestgres_config`
`15`	`16`	`from .exceptionsimportExecUtilException`
`@@ -218,3 +219,7 @@ def file_tail(f, num_lines):`
`218`	`219`
`219`	`220`	`defeprint(args,*kwargs):`
`220`	`221`	`print(args,file=sys.stderr,*kwargs)`
	`222`	`+`
	`223`	`+`
	`224`	`+defoptions_string(separator=u" ",**kwargs):`
	`225`	`+returnseparator.join(u"{}={}".format(k,v)fork,viniteritems(kwargs))`

Comments

(0)