projects / skytools.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3c77b8a) | patch
sql/conflicthandler: experimental conflict handler.
authorMarko Kreen <markokr@gmail.com>
Tue, 12 Jul 2011 11:17:49 +0000 (14:17 +0300)
committerMarko Kreen <markokr@gmail.com>
Tue, 12 Jul 2011 11:17:49 +0000 (14:17 +0300)
commit152b3de9c49364cb3454b0dfbe5d58da140a10b7
tree3e4b2f04b38c19b6bac9679bbb936007f908f9fftree
parent3c77b8a218c92cd2fb8126112f599a67f7f48e92commit | diff
sql/conflicthandler: experimental conflict handler.

skytools.plpy_applyrow: low-level helper module

conflicthandler/merge_on_time.sql: sample time-based conflict handler
python/skytools/plpy_applyrow.py [new file with mode: 0644] blob
sql/conflicthandler/Makefile [new file with mode: 0644] blob
sql/conflicthandler/README [new file with mode: 0644] blob
sql/conflicthandler/expected/test_merge.out [new file with mode: 0644] blob
sql/conflicthandler/merge_on_time.sql [new file with mode: 0644] blob
sql/conflicthandler/sql/test_merge.sql [new file with mode: 0644] blob
Skytools master repo.