We had a case where one of my team members added a column to a table and data was lost du to merge conflict "VCS version". Please make sure that no data is lost when this happens. This can happen in several different ways, below is an example that reproduces the problem each time for us.
Steps to reproduce.
-
Log in to Team coding and pull from remote
-
CREATE TABLE t_test_example_toad_vcs ( idno NUMBER PRIMARY KEY, firstname VARCHAR2(50) );
INSERT INTO t_test_example_toad_vcs (idno, firstname) VALUES (1, 'Alice');
INSERT INTO t_test_example_toad_vcs (idno, firstname) VALUES (2, 'Bob');
commit; -
Check in table into Team coding and push to remote
-
Check-out the table again.
-
Add columns to the table using this script
ALTER TABLE t_test_example_toad_vcs ADD (shoe_size NUMBER(3,1));
UPDATE t_test_example_toad_vcs SET shoe_size = 9.5 WHERE idno = 1;
UPDATE t_test_example_toad_vcs SET shoe_size = 8.0 WHERE idno = 2;
commit; -
Undo the check out
-
check out the table again
-
Merge warning is shown
-
select Open VCS version
-
A prompt asking if you want to recompile the table is shown. Selecting yes will recompile the table and this will cause all data in it to be removed. The problem is that there is no warning that data will be lost.
