From 53194e37849dca4083cfddcdf07523133d7d440a Mon Sep 17 00:00:00 2001 From: Mariano Benedettini Date: Fri, 16 Jan 2015 13:52:25 +0100 Subject: [PATCH] Fix database dump when port is specified in db uri Since changeset 01399128964f, the uri port is an integer and so it must be convert to string for command line. issue4490 review6861002 --- trytond/backend/mysql/database.py | 4 ++-- trytond/backend/postgresql/database.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/trytond/backend/mysql/database.py b/trytond/backend/mysql/database.py index 38ef54ebb8..9f55458c6d 100644 --- a/trytond/backend/mysql/database.py +++ b/trytond/backend/mysql/database.py @@ -131,7 +131,7 @@ class Database(DatabaseInterface): if uri.hostname: cmd.append('--host=' + uri.hostname) if uri.port: - cmd.append('--port=' + uri.port) + cmd.append('--port=' + str(uri.port)) if uri.password: cmd.append('--password=' + uri.password) cmd.append(database_name) @@ -161,7 +161,7 @@ class Database(DatabaseInterface): if uri.hostname: cmd.append('--host=' + uri.hostname) if uri.port: - cmd.append('--port=' + uri.port) + cmd.append('--port=' + str(uri.port)) if uri.password: cmd.append('--password=' + uri.password) cmd.append(database_name) diff --git a/trytond/backend/postgresql/database.py b/trytond/backend/postgresql/database.py index c42e6cce14..2bbeca37af 100644 --- a/trytond/backend/postgresql/database.py +++ b/trytond/backend/postgresql/database.py @@ -117,7 +117,7 @@ class Database(DatabaseInterface): if uri.hostname: cmd.append('--host=' + uri.hostname) if uri.port: - cmd.append('--port=' + uri.port) + cmd.append('--port=' + str(uri.port)) if uri.password: # if db_password is set in configuration we should pass # an environment variable PGPASSWORD to our subprocess @@ -151,7 +151,7 @@ class Database(DatabaseInterface): if uri.hostname: cmd.append('--host=' + uri.hostname) if uri.port: - cmd.append('--port=' + uri.port) + cmd.append('--port=' + str(uri.port)) if uri.password: env['PGPASSWORD'] = uri.password cmd.append('--dbname=' + database_name)