Skip to content

Commit ad21cb6

Browse files
authored
Merge pull request #2039 from joto/man-page-schema
Update documentation of schema options in man page
2 parents 45ea63d + a65f4f2 commit ad21cb6

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

docs/osm2pgsql-gen.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ mandatory for short options too.
4444
Setting this to the number of available CPU cores is a reasonable starting
4545
point.
4646

47-
\--middle-schema=SCHEMA
48-
: Database schema where the `osm2pgsql_properties` table is to be found.
49-
Default `public`. Set to the same value as on the `osm2pgsql` command
50-
line.
51-
5247
# HELP/VERSION OPTIONS
5348

5449
-h, \--help
@@ -85,6 +80,16 @@ mandatory for short options too.
8580
-P, \--port=PORT
8681
: Database server port.
8782

83+
\--schema=SCHEMA
84+
: Default for various schema settings throughout osm2pgsql-gen
85+
(default: `public`). The schema must exist in the database and be writable
86+
by the database user. It must be the same as used with `osm2pgsql`.
87+
88+
\--middle-schema=SCHEMA
89+
: Database schema where the `osm2pgsql_properties` table is to be found.
90+
Default set with `--schema`. Set to the same value as on the `osm2pgsql`
91+
command line.
92+
8893
# SEE ALSO
8994

9095
* [osm2pgsql website](https://osm2pgsql.org)

docs/osm2pgsql.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ mandatory for short options too.
9191
-P, \--port=PORT
9292
: Database server port.
9393

94+
\--schema=SCHEMA
95+
: Default for various schema settings throughout osm2pgsql (default: `public`).
96+
The schema must exist in the database and be writable by the database user.
97+
9498
# INPUT OPTIONS
9599

96100
-r, \--input-reader=FORMAT
@@ -164,8 +168,10 @@ mandatory for short options too.
164168
as it doesn't work well with small imports. The default is disabled.
165169

166170
\--middle-schema=SCHEMA
167-
: Use PostgreSQL schema SCHEMA for all tables, indexes, and functions in
168-
the middle (default is `public`).
171+
: Use PostgreSQL schema SCHEMA for all tables, indexes, and functions in the
172+
middle. The schema must exist in the database and be writable by the
173+
database user. By default the schema set with `--schema` is used, or
174+
`public` if that is not set.
169175

170176
\--middle-way-node-index-id-shift=SHIFT
171177
: Set ID shift for way node bucket index in middle. Experts only. See
@@ -274,8 +280,10 @@ mandatory for short options too.
274280
different projection is used for the geometries.
275281

276282
\--output-pgsql-schema=SCHEMA
277-
: Use PostgreSQL schema SCHEMA for all tables, indexes, and functions in
278-
the pgsql output (default is `public`).
283+
: Use PostgreSQL schema SCHEMA for all tables, indexes, and functions in the
284+
pgsql output. The schema must exist in the database and be writable by the
285+
database user. By default the schema set with `--schema` is used, or
286+
`public` if that is not set.
279287

280288
# EXPIRE OPTIONS
281289

0 commit comments

Comments
 (0)