56 Commits

Author SHA1 Message Date
cc98e6aab6 forward environment variables to osm2pgsql in test
Windows needs external setup to function properly.
2025-12-03 13:24:09 +01:00
c342e13a39 avoid run-test-bdd script in ctest
Windows can't handle the paths properly.
2025-12-03 13:24:09 +01:00
88e263ebf3 allow selected PG* env variables so that pg_virtualenv works 2025-12-03 13:24:09 +01:00
195529a29f add parameters for lua and themepark path 2025-12-03 13:24:09 +01:00
b2765aca4a introduce osm2pgsql-test-style for BDD testing 2025-12-03 13:24:09 +01:00
f2f2808fee fix grammar issues in osm2pgsql-replication docs
Thanks to @SergeCroise for spotting those.
2025-07-19 14:48:37 +02:00
1c5a607890 correct log message (to→from)
The order of “previous seq num” & “current seq num” were incorrect
2025-07-07 14:47:54 +02:00
4be9356a8a Log message improvement
This log message implies all these changes will be applied.
But with high lag, that might not happen.
Clarify the log message
2025-07-07 14:43:04 +02:00
c56a935567 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
2025-06-05 10:43:38 +02:00
da5a1d51ea prepare relase 2.1.1 2025-04-14 09:52:23 +02:00
ede8880e72 Update copyright date 2025-01-13 09:07:30 +01:00
b30d7e2e1b properly forward schema parameters from replication script 2024-09-30 17:33:51 +02:00
b2b5cc77c5 Merge pull request #2212 from lonvia/check-date-on-replication-init
Replication: make sure that the computed start state is valid
2024-07-13 16:44:09 +02:00
e934f2087d replication: guess state from file when state info is not available 2024-07-12 16:59:33 +02:00
b13126a9db make sure diffs are recent enough when initialising replication 2024-07-12 11:49:18 +02:00
41b069e0d3 return a 3 error code in osm2pgsql-replication on exception 2024-07-10 14:17:31 +02:00
ff91d49869 Update copyright date 2024-01-26 16:45:53 +01:00
32e560fd63 avoid get_dsn_parameters which no longer exists in psycopg3
Fixes #2040.
2023-08-16 18:00:01 +02:00
93adda7f24 add --schema option to osm2pgsql-replication 2023-08-15 10:51:35 +02:00
1dcdf3f9bd fix branching 2023-08-10 22:13:25 +02:00
efe911ef12 osm2pgsql-replication: reintroduce default default rollback 2023-08-10 10:43:31 +02:00
ecda8156ba adapt documentation of osm2pgsql-replication 2023-08-10 10:43:31 +02:00
dbac88f43e add tests for osm2pgsql-replication
Needs mocking of replication functions and url accesses.
2023-08-10 10:43:31 +02:00
9985d70825 run osm2pgsql-replication in BDD tests as a module
This gives us the possibility to monkeypatch parts of the code.
2023-08-10 10:43:31 +02:00
deae7e003e osm2pgsql-replication: switch to proper use of exceptions 2023-08-10 10:43:31 +02:00
6b48926300 osm2pgsql-replication: add support for new propoerties table 2023-08-10 10:43:31 +02:00
0337f95be3 replication: remove code duplication 2023-08-10 10:43:31 +02:00
c3fbb1e4e4 Make the display of time intervals show seconds.
Rather than rounding down to nearest minute.
2023-07-03 10:30:15 +02:00
e998bb7e0d Improve human-readability of logging output in replication
• No OSM server does subminutely data updates, so don't include seconds
  in outputted timestamps.
• Pretty format the interval, rather than just numbers.
• Show the local & remote status of replication
• Show how long it took to apply the changed & the rate
2023-06-27 16:57:40 +02:00
9ab3f894fd Merge pull request #1979 from geofabrik/osm2pgsql-repl-no-db-error-msg
If there's an init error, and no -d option specified, use the actual database name, rather than "None"
2023-06-26 16:58:32 +02:00
f1ef19529a osm2pgsql-replication will now use postgresql's application_name 2023-06-26 14:45:07 +02:00
04dab0e047 If there's an init error, and no -d option specified, use the actual database name, rather than "None" 2023-06-20 13:37:12 +02:00
cd0eab7614 If there is a network error when trying to get replication status, print a more useful error message, and tell exit 2023-06-05 11:41:31 +02:00
21e57df940 Fix missing argument 2023-02-27 19:05:56 +01:00
2cf1d077b4 the middle parameter needs to be forwarded to osm2pgsql 2023-02-02 11:36:13 +01:00
34ae427a27 fix database computation with middle with schema 2023-02-02 10:32:28 +01:00
7ba523ba37 Update copyright date to 2023 2023-01-15 16:13:42 +01:00
80835baa87 osm2pgsql-replication: add '--middle-schema' 2022-11-05 19:08:07 +01:00
f7b99c1692 always expect osm2pgsql in same path as osm2pgsql-replication
Anything else causes issues with the installation process of cmake.
2022-10-22 14:23:48 +02:00
2a878f86ba osm2pgsql-replication: add hint about pqlib environment parameters. 2022-09-07 21:26:13 +02:00
46b682fc52 osm2pgsql-replication: allow empty database parameter
The parameter may be empty when connection parameters are
supplied via environment variables.
2022-09-07 21:26:13 +02:00
b3e94d26ab osm2pgsql-replication: run against installed osm2pgsql
When installing osm2pgsql-replication run the script per default
against osm2pgsql in the same directory. This avoids potential
security issues through PATH manipulation.
2022-09-07 21:26:13 +02:00
8760df7e0b osm2pgsql-replication: meaningful error when middle tables do not exist
... or the prefix is a bad one. There is no way to distinguish that.
2022-09-07 21:26:13 +02:00
49f1868f05 use psycopg SQL module for correct quoting
Resolves a potentional SQL injection issue with the prefix parameter.
2022-09-07 21:26:13 +02:00
7f2ade00bf Allow conninfo string with osm2pgsql-replication 2022-02-27 10:50:59 -07:00
103e72b8c2 correctly quote single quote in manpage 2022-02-13 13:52:09 +01:00
25a1e9d14b replication script: enable psycopg3 2022-01-20 09:48:30 +01:00
d7291e4624 replication script: check for external libraries
Prints a helpful error message, when the required libraries
psycopg2 or osmium are not installed.
2022-01-20 09:48:30 +01:00
16d7f7b2c3 minor linting fixes for osm2pgsql-replication 2022-01-19 10:32:31 +01:00
56d5145615 Updates copyright date to 2022 in all files 2022-01-11 14:30:34 +01:00