From c56a935567d02a08ddda97e853f53bba5a0ec5ee Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Thu, 5 Jun 2025 10:37:15 +0200 Subject: [PATCH] Allow --username and --user in osm2pgsql and osm2pgsql-replication This was inconsistent and documented wrong. We prefer the --username variant, because that is consistent with psql, but both work now everwhere. See #2342 --- man/osm2pgsql.md | 2 +- scripts/osm2pgsql-replication | 2 +- src/command-line-app.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/osm2pgsql.md b/man/osm2pgsql.md index 19ea5b9c8..637191eea 100644 --- a/man/osm2pgsql.md +++ b/man/osm2pgsql.md @@ -79,7 +79,7 @@ mandatory for short options too. `postgres://`), it is treated as a conninfo string. See the PostgreSQL manual for details. --U, \--username=NAME +-U, \--username=NAME, \--user=NAME : Postgresql user name. -W, \--password diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication index 58e2215c6..297084140 100755 --- a/scripts/osm2pgsql-replication +++ b/scripts/osm2pgsql-replication @@ -627,7 +627,7 @@ def get_parser(): "see https://www.postgresql.org/docs/current/libpq-pgpass.html.") group.add_argument('-d', '--database', metavar='DB', help='Name of PostgreSQL database to connect to or conninfo string') - group.add_argument('-U', '--username', metavar='NAME', + group.add_argument('-U', '--username', '--user', metavar='NAME', help='PostgreSQL user name') group.add_argument('-H', '--host', metavar='HOST', help='Database server host name or socket location') diff --git a/src/command-line-app.cpp b/src/command-line-app.cpp index 8fd20d506..03e319ab0 100644 --- a/src/command-line-app.cpp +++ b/src/command-line-app.cpp @@ -41,7 +41,7 @@ void command_line_app_t::init_database_options() ->type_name("DB") ->group("Database options"); - add_option_function("-U,--user", + add_option_function("-U,--username,--user", [&](std::string const &value) { m_connection_params.set("user", value); })