Rebase: a field update of a row deleted in the database is dropped without any record; and the conflicts file is per project, not per connection

Aperta
#195 0 commenti 0 reazioni 0 assegnatari Vedi su GitHub

@NicklasBlidmo ci sta già lavorando.

Dal 27/10/2026.

  • #196 di @NicklasBlidmo — aperta

Valutazione

Difficoltà
4/5
Tempo stimato
3-5 giorni
Idoneità per principianti
48/100
Tipo di issue
Bug
Chiarezza
Abbastanza chiara
Stato di attività
Attiva
Stack tecnologico
postgresql, python
Ambito
backend, database

Direzione di ricerca

Start by tracing pull() and the rebase handling described in the issue, especially _handle_delete, then inspect how conflict and base2our/base2their filenames are built. Reproduce the delete-versus-update case and a cycle with multiple connections. Done means lost field updates are recorded and each connection's conflict and rebase files retain distinct names.

Scritto dal modello di indicizzazione a partire dal testo della issue.

Descrizione

We ran the concurrent-edit cases of a two-way setup (db-sync 2.4.0,
geodiff 2.3.0, PostgreSQL driver, one GeoPackage, edits in the database
by SQL and in the field through the QGIS plugin, the daemon paused to
create the window). Outcomes:

database field result record
update column B update column A, same row both values on both sides —
update value D update same column, value F D on both sides (the database syncs last and wins) conflicts file, old = F, new = D
update row delete row row gone on both sides, the update dropped conflicts file (entry without old)
delete row update row row gone on both sides, the field's update lost nothing

Two things we would like to change:

  1. The last case leaves no record. geodiff rebase-db keeps our
    delete over their update (consistent with "a delete wins", fine) but
    writes nothing to the conflicts file for it, so the field crew's edit
    disappears without a trace: not in the database, not in the file, not
    in the log. The information is available in pull() before the
    rebase: base2our (computed before mc.pull_project) holds our
    delete, base2their (computed after) holds their update. Matching the
    two by row key and logging one WARNING per lost update is a small
    change in db-sync; PR follows. Recording it in the conflicts file
    instead would be a geodiff change (the rebase's _handle_delete
    records only the opposite direction), which we can propose there if
    you prefer.

  2. The conflicts file is named per project:
    <tmp>/<project name>-dbsync-pull-conflicts. With several connections
    (several GeoPackages of one project, which 2.4.0 supports with one
    working directory per connection), a second rebase in the same cycle
    overwrites the first connection's file before anyone can read it.
    Naming it <project name>-<modified schema>-dbsync-pull-conflicts,
    like the working directory, keeps every connection's record. We read
    these files (dbsync-manager keeps them and shows them per project), so
    the name matters to us; the same goes for -dbsync-pull-base2our /
    -base2their.

Lingua principale
Python
Stelle
55
Fork
25
Merge medio
3g 22h
PR unite (30g)
1

Preparare l'ambiente

Come iniziare

  1. Leggi tutta la issue e poi la guida ai contributi del progetto.
  2. Commenta sulla issue per dire che te ne occupi tu — evita che due persone facciano lo stesso lavoro.
  3. Fai un fork del repository e lavora su un branch.
  4. Apri una pull request che faccia riferimento al numero della issue.

Altre issue di MerginMaps/db-sync

Tutte le issue di MerginMaps/db-sync

Issue simili

Altre issue su Python

Ricevi le nuove issue nella tua casella

Un breve riepilogo di issue GitHub adatte ai principianti.