Commit3224e21

authored

Merge pull request#168 from dmitry-lipetsk/D20241224_002--psql_and_dbname

PSQL passes a database name through the explicit '-d <dbname>' parameter

2 parents2fa4426 +a33860d commit3224e21Copy full SHA for 3224e21

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1107,13 +1107,12 @@ def _psql(`
`1107`	`1107`	`else:`
`1108`	`1108`	`raiseException("Input data must be None or bytes.")`
`1109`	`1109`
`1110`		`-dbname=dbnameordefault_dbname()`
`1111`		`-`
`1112`	`1110`	`psql_params= [`
`1113`	`1111`	`self._get_bin_path("psql"),`
`1114`	`1112`	`"-p",str(self.port),`
`1115`	`1113`	`"-h",self.host,`
`1116`	`1114`	`"-U",usernameorself.os_ops.username,`
	`1115`	`+"-d",dbnameordefault_dbname(),`
`1117`	`1116`	`"-X",# no .psqlrc`
`1118`	`1117`	`"-A",# unaligned output`
`1119`	`1118`	`"-t",# print rows only`
`@@ -1135,9 +1134,6 @@ def _psql(`
`1135`	`1134`	`else:`
`1136`	`1135`	`raiseQueryException('Query or filename must be provided')`
`1137`	`1136`
`1138`		`-# should be the last one`
`1139`		`-psql_params.append(dbname)`
`1140`		`-`
`1141`	`1137`	`returnself.os_ops.exec_command(`
`1142`	`1138`	`psql_params,`
`1143`	`1139`	`verbose=True,`

Comments

(0)