diff --git a/integration-tests/bats/back-compat.bats b/integration-tests/bats/back-compat.bats deleted file mode 100644 index 836cadf3b3..0000000000 --- a/integration-tests/bats/back-compat.bats +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env bats -load $BATS_TEST_DIRNAME/helper/common.bash - -setup() { - setup_common - cp -a $BATS_TEST_DIRNAME/helper/testdata/. ./ -} - -teardown() { - teardown_common -} - -@test "back-compat: data check" { - for testdir in */; do - cd "$testdir" - dolt status - run dolt migrate - [ "$status" -eq "0" ] - [[ "$output" =~ "Migrating database to the latest data format" ]] || false - run dolt branch - [ "$status" -eq "0" ] - [[ "$output" =~ "master" ]] || false - [[ "$output" =~ "conflict" ]] || false - [[ "$output" =~ "newcolumn" ]] || false - run dolt schema show - [ "$status" -eq "0" ] - [[ "$output" =~ "\`pk\` bigint NOT NULL" ]] || false - [[ "$output" =~ "\`a\` longtext" || "$output" =~ "\`a\` varchar(16383)" ]] || false - [[ "$output" =~ "\`b\` datetime" ]] || false - run dolt sql -q "select * from abc order by pk asc" - [ "$status" -eq "0" ] - [[ "${lines[3]}" =~ " 1 " ]] || false - [[ "${lines[3]}" =~ " data " ]] || false - [[ "${lines[3]}" =~ " 2020-01-13 20:45:18.53558 " ]] || false - dolt checkout conflict - run dolt schema show - [ "$status" -eq "0" ] - [[ "$output" =~ "\`pk\` bigint NOT NULL" ]] || false - [[ "$output" =~ "\`a\` longtext" || "$output" =~ "\`a\` varchar(16383)" ]] || false - [[ "$output" =~ "\`b\` datetime" ]] || false - run dolt sql -q "select * from abc order by pk asc" - [ "$status" -eq "0" ] - [[ "${lines[3]}" =~ " 1 " ]] || false - [[ "${lines[3]}" =~ " data " ]] || false - [[ "${lines[3]}" =~ " 2020-01-13 20:45:18.53558 " ]] || false - [[ "${lines[4]}" =~ " 2 " ]] || false - [[ "${lines[4]}" =~ " something " ]] || false - [[ "${lines[4]}" =~ " 2020-01-14 20:48:37.13061 " ]] || false - dolt checkout newcolumn - run dolt schema show - [ "$status" -eq "0" ] - [[ "$output" =~ "\`pk\` bigint NOT NULL" ]] || false - [[ "$output" =~ "\`a\` longtext" || "$output" =~ "\`a\` varchar(16383)" ]] || false - [[ "$output" =~ "\`b\` datetime" ]] || false - [[ "$output" =~ "\`c\` bigint unsigned" ]] || false - run dolt sql -q "select * from abc order by pk asc" - [ "$status" -eq "0" ] - [[ "${lines[3]}" =~ " 1 " ]] || false - [[ "${lines[3]}" =~ " data " ]] || false - [[ "${lines[3]}" =~ " 2020-01-13 20:45:18.53558 " ]] || false - [[ "${lines[3]}" =~ " 2133" ]] || false - [[ "${lines[4]}" =~ " 2 " ]] || false - [[ "${lines[4]}" =~ " something " ]] || false - [[ "${lines[4]}" =~ " 2020-01-13 20:48:37.13061 " ]] || false - [[ "${lines[4]}" =~ " 1132020" ]] || false - cd .. - done -} - -@test "back-compat: table operations" { - # Broken by dropped err fixed in https://github.com/dolthub/dolt/pull/1465 - skip - for testdir in */; do - cd "$testdir" - dolt table cp abc copy - dolt table mv abc move - run dolt ls - [ "$status" -eq "0" ] - [[ "$output" =~ "copy" ]] || false - [[ "$output" =~ "move" ]] || false - cd .. - done -} - -@test "back-compat: adding commits" { - for testdir in */; do - cd "$testdir" - run dolt migrate - [ "$status" -eq "0" ] - [[ "$output" =~ "Migrating database to the latest data format" ]] || false - dolt sql -q "insert into abc values (2, 'text', '2020-01-15 20:49:22.28427')" - dolt add . - dolt commit -m "Add value during test" - run dolt sql -q "select * from abc order by pk asc" - [ "$status" -eq "0" ] - [[ "${lines[4]}" =~ " 2 " ]] || false - [[ "${lines[4]}" =~ " text " ]] || false - [[ "${lines[4]}" =~ " 2020-01-15 20:49:22.28427 " ]] || false - dolt checkout newcolumn - dolt checkout -b testaddcommit - dolt sql -q "insert into abc values (3, 'text', '2020-01-15 20:49:22.28427', 9241)" - dolt add . - dolt commit -m "Add value during test" - run dolt sql -q "select * from abc order by pk asc" - [ "$status" -eq "0" ] - [[ "${lines[5]}" =~ " 3 " ]] || false - [[ "${lines[5]}" =~ " text " ]] || false - [[ "${lines[5]}" =~ " 2020-01-15 20:49:22.28427 " ]] || false - [[ "${lines[5]}" =~ " 9241 " ]] || false - cd .. - done -} - -@test "back-compat: merging" { - for testdir in */; do - cd "$testdir" - run dolt migrate - [ "$status" -eq "0" ] - run dolt merge newcolumn - [ "$status" -eq "0" ] - [[ "$output" =~ "Fast-forward" ]] || false - cd .. - done -} - -@test "back-compat: resolving conflicts" { - skip https://github.com/dolthub/dolt/issues/773 - for testdir in */; do - cd "$testdir" - run dolt migrate - [ "$status" -eq "0" ] - [[ "$output" =~ "Migrating database to the latest data format" ]] || false - dolt checkout conflict - run dolt merge newcolumn - [ "$status" -eq "0" ] - [[ "$output" =~ "CONFLICT" ]] || false - run dolt conflicts cat abc - [ "$status" -eq "0" ] - [[ "${lines[3]}" =~ " ours " ]] || false - [[ "${lines[3]}" =~ " 2 " ]] || false - [[ "${lines[3]}" =~ " something " ]] || false - [[ "${lines[3]}" =~ " 2020-01-14 20:48:37.13061 " ]] || false - [[ "${lines[3]}" =~ " NULL " ]] || false - [[ "${lines[4]}" =~ " theirs " ]] || false - [[ "${lines[4]}" =~ " 2 " ]] || false - [[ "${lines[4]}" =~ " something " ]] || false - [[ "${lines[4]}" =~ " 2020-01-13 20:48:37.13061 " ]] || false - [[ "${lines[4]}" =~ " 1132020 " ]] || false - dolt conflicts resolve --theirs abc - dolt add . - dolt commit -m "Merged newcolumn into conflict" - run dolt sql -q "select * from abc order by pk asc" - [ "$status" -eq "0" ] - [[ "${lines[3]}" =~ " 1 " ]] || false - [[ "${lines[3]}" =~ " data " ]] || false - [[ "${lines[3]}" =~ " 2020-01-13 20:45:18.53558 " ]] || false - [[ "${lines[3]}" =~ " 2133" ]] || false - [[ "${lines[4]}" =~ " 2 " ]] || false - [[ "${lines[4]}" =~ " something " ]] || false - [[ "${lines[4]}" =~ " 2020-01-13 20:48:37.13061 " ]] || false - [[ "${lines[4]}" =~ " 1132020" ]] || false - cd .. - done -} diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/config.json b/integration-tests/bats/helper/testdata/20200113/.dolt/config.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/integration-tests/bats/helper/testdata/20200113/.dolt/config.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/09hv7tllti9b3hfi7u5m3e7lpbne390a b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/09hv7tllti9b3hfi7u5m3e7lpbne390a deleted file mode 100644 index f8cb6d366e..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/09hv7tllti9b3hfi7u5m3e7lpbne390a and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/0kl39j0i7gljemj93loojdhdbsj9lb36 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/0kl39j0i7gljemj93loojdhdbsj9lb36 deleted file mode 100644 index 3fd040c1ed..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/0kl39j0i7gljemj93loojdhdbsj9lb36 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/1nrr0bod1960bccqc6c2med68hod5gc7 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/1nrr0bod1960bccqc6c2med68hod5gc7 deleted file mode 100644 index dfb3629497..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/1nrr0bod1960bccqc6c2med68hod5gc7 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/1rnurg4no9s6s23mdq8vvfmj0cik47db b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/1rnurg4no9s6s23mdq8vvfmj0cik47db deleted file mode 100644 index bb41e4f794..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/1rnurg4no9s6s23mdq8vvfmj0cik47db and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/3dsltc9vis2m6o89bv0dh482pfme30ss b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/3dsltc9vis2m6o89bv0dh482pfme30ss deleted file mode 100644 index be5db00dac..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/3dsltc9vis2m6o89bv0dh482pfme30ss and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt deleted file mode 100644 index c41b419f7c..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/5im08tb1mu140r7kvtrd04u8ub5qk607 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/5im08tb1mu140r7kvtrd04u8ub5qk607 deleted file mode 100644 index 5dd0d91692..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/5im08tb1mu140r7kvtrd04u8ub5qk607 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/6739m2utlhl1k98f4o2fqmgtm12ino4t b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/6739m2utlhl1k98f4o2fqmgtm12ino4t deleted file mode 100644 index 5aa5d5ace1..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/6739m2utlhl1k98f4o2fqmgtm12ino4t and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/6oc2i2n9ln25n8go78dalvo3e9er9mg3 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/6oc2i2n9ln25n8go78dalvo3e9er9mg3 deleted file mode 100644 index 494e64ddbc..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/6oc2i2n9ln25n8go78dalvo3e9er9mg3 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/7er6962c841ghn8j0a357ujde9daq3mu b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/7er6962c841ghn8j0a357ujde9daq3mu deleted file mode 100644 index f607eec0f8..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/7er6962c841ghn8j0a357ujde9daq3mu and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/7vu480853r3b0hitt89l7gc3r854fb53 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/7vu480853r3b0hitt89l7gc3r854fb53 deleted file mode 100644 index b552dd7404..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/7vu480853r3b0hitt89l7gc3r854fb53 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/89knkh4sejb7tf05gqq01osftlbsmdq1 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/89knkh4sejb7tf05gqq01osftlbsmdq1 deleted file mode 100644 index 14533fab40..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/89knkh4sejb7tf05gqq01osftlbsmdq1 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/9guvpb6l55h1t9aqaa9b7qnp1dnnelkd b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/9guvpb6l55h1t9aqaa9b7qnp1dnnelkd deleted file mode 100644 index 40bcbfc33b..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/9guvpb6l55h1t9aqaa9b7qnp1dnnelkd and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/9ibrf56gr6gsgr7cpnda4au9o0vd0412 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/9ibrf56gr6gsgr7cpnda4au9o0vd0412 deleted file mode 100644 index 704c6e00e8..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/9ibrf56gr6gsgr7cpnda4au9o0vd0412 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/LOCK b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/LOCK deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/a8hqijvam2c6r9qvbffsdj5r55bis0mn b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/a8hqijvam2c6r9qvbffsdj5r55bis0mn deleted file mode 100644 index 8669107b50..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/a8hqijvam2c6r9qvbffsdj5r55bis0mn and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/a9307merr53dd71vj459m7qo6rk435na b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/a9307merr53dd71vj459m7qo6rk435na deleted file mode 100644 index c53ae5121c..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/a9307merr53dd71vj459m7qo6rk435na and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ag7kv5tuc4jvovmas7r5kel32dd94g86 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ag7kv5tuc4jvovmas7r5kel32dd94g86 deleted file mode 100644 index 7887b2b599..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ag7kv5tuc4jvovmas7r5kel32dd94g86 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/c8a3b64elue3121ng0rgeagcnf48fbat b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/c8a3b64elue3121ng0rgeagcnf48fbat deleted file mode 100644 index 36f88b566d..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/c8a3b64elue3121ng0rgeagcnf48fbat and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/c8dirve58o6npl3aufbupn3c2pt55el4 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/c8dirve58o6npl3aufbupn3c2pt55el4 deleted file mode 100644 index d2c48a305f..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/c8dirve58o6npl3aufbupn3c2pt55el4 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ca9rtjbjd7n5pkodo3rsl6bon0s8qe4j b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ca9rtjbjd7n5pkodo3rsl6bon0s8qe4j deleted file mode 100644 index 68b8f7b692..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ca9rtjbjd7n5pkodo3rsl6bon0s8qe4j and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/csopsqdj2urggh85gbsfth4c9lf4r8vb b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/csopsqdj2urggh85gbsfth4c9lf4r8vb deleted file mode 100644 index 995b973c3d..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/csopsqdj2urggh85gbsfth4c9lf4r8vb and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/di7sdosugcarnn353e8ldbnlts9v42s5 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/di7sdosugcarnn353e8ldbnlts9v42s5 deleted file mode 100644 index 5cd10ff7db..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/di7sdosugcarnn353e8ldbnlts9v42s5 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/eiit9a47igil0id02vhgpq4g72ga3dha b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/eiit9a47igil0id02vhgpq4g72ga3dha deleted file mode 100644 index d4c2af4cfb..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/eiit9a47igil0id02vhgpq4g72ga3dha and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/es7vlqed0665gq9es3ns2uqeh75bkerc b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/es7vlqed0665gq9es3ns2uqeh75bkerc deleted file mode 100644 index 0e8915b9ff..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/es7vlqed0665gq9es3ns2uqeh75bkerc and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/fkes7bk2bl0p9cvfgk3dd7uf6p4cqcm1 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/fkes7bk2bl0p9cvfgk3dd7uf6p4cqcm1 deleted file mode 100644 index d13959d867..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/fkes7bk2bl0p9cvfgk3dd7uf6p4cqcm1 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/frc0ef452fhh97o534e7lol2b427lk56 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/frc0ef452fhh97o534e7lol2b427lk56 deleted file mode 100644 index 2f1f2ad24e..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/frc0ef452fhh97o534e7lol2b427lk56 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/g2slg3mhtfb5m2tk00t8mor5lkboqj2m b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/g2slg3mhtfb5m2tk00t8mor5lkboqj2m deleted file mode 100644 index e97b512aa3..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/g2slg3mhtfb5m2tk00t8mor5lkboqj2m and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/glc2mu652o0pt893a79j30tc6kgvk453 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/glc2mu652o0pt893a79j30tc6kgvk453 deleted file mode 100644 index 8012651d2d..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/glc2mu652o0pt893a79j30tc6kgvk453 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/hgsmoadjsib12ml6e05or4q5urv9lt7l b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/hgsmoadjsib12ml6e05or4q5urv9lt7l deleted file mode 100644 index 302f9e1e28..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/hgsmoadjsib12ml6e05or4q5urv9lt7l and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ie2tcnurro57vl8urvucbjdrmmf9bo0h b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ie2tcnurro57vl8urvucbjdrmmf9bo0h deleted file mode 100644 index bd0188ce0e..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ie2tcnurro57vl8urvucbjdrmmf9bo0h and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/iellg8am40vu2tf61hbe7i0anhm76gtv b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/iellg8am40vu2tf61hbe7i0anhm76gtv deleted file mode 100644 index e8dc480e6a..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/iellg8am40vu2tf61hbe7i0anhm76gtv and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/jji5lv8nq265dpk6r11ug3gb6ih81hdr b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/jji5lv8nq265dpk6r11ug3gb6ih81hdr deleted file mode 100644 index 47faecd508..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/jji5lv8nq265dpk6r11ug3gb6ih81hdr and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ju51cbttj99itbsbk2svu7sij2tu4rhl b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ju51cbttj99itbsbk2svu7sij2tu4rhl deleted file mode 100644 index 2820e12a57..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ju51cbttj99itbsbk2svu7sij2tu4rhl and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/k3ksuke2vcb2hgatpdqbhildb8raab5p b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/k3ksuke2vcb2hgatpdqbhildb8raab5p deleted file mode 100644 index 93eb4edd0e..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/k3ksuke2vcb2hgatpdqbhildb8raab5p and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/kmjfnt24t2vf8e58u3r5insr7tfohm2e b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/kmjfnt24t2vf8e58u3r5insr7tfohm2e deleted file mode 100644 index 11bb6a7b54..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/kmjfnt24t2vf8e58u3r5insr7tfohm2e and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/m297l94np7ub1bp8irhpf3eta6bpegr8 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/m297l94np7ub1bp8irhpf3eta6bpegr8 deleted file mode 100644 index 058cb989a5..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/m297l94np7ub1bp8irhpf3eta6bpegr8 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/m3sn7rmfc0lbis3codosl1k46hpv0kod b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/m3sn7rmfc0lbis3codosl1k46hpv0kod deleted file mode 100644 index 4c9f98d271..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/m3sn7rmfc0lbis3codosl1k46hpv0kod and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/manifest b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/manifest deleted file mode 100644 index 2fad5a48f5..0000000000 --- a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/manifest +++ /dev/null @@ -1 +0,0 @@ -4:__LD_1__:kgbtojhb52j8ni3hfrdnbntd2um8aetv:j88k1vjjvval95ejvp6ooq0vefc68h5c:m3sn7rmfc0lbis3codosl1k46hpv0kod:3:ml7hl70ar993tc32gla4ttjar0ogka86:1:5im08tb1mu140r7kvtrd04u8ub5qk607:4:ie2tcnurro57vl8urvucbjdrmmf9bo0h:1:9guvpb6l55h1t9aqaa9b7qnp1dnnelkd:1:k3ksuke2vcb2hgatpdqbhildb8raab5p:1:89knkh4sejb7tf05gqq01osftlbsmdq1:5:glc2mu652o0pt893a79j30tc6kgvk453:1:eiit9a47igil0id02vhgpq4g72ga3dha:1:jji5lv8nq265dpk6r11ug3gb6ih81hdr:1:c8dirve58o6npl3aufbupn3c2pt55el4:4:6oc2i2n9ln25n8go78dalvo3e9er9mg3:1:fkes7bk2bl0p9cvfgk3dd7uf6p4cqcm1:1:ojdo9hafo3mvlko0cefqcom7os26utln:1:c8a3b64elue3121ng0rgeagcnf48fbat:1:iellg8am40vu2tf61hbe7i0anhm76gtv:2:ju51cbttj99itbsbk2svu7sij2tu4rhl:4:9ibrf56gr6gsgr7cpnda4au9o0vd0412:2:srlc19tj78ldn4hbb8duso90i1vugc59:1:s69lvejsvg9so3l2nsquavmbai4dmu03:4:7er6962c841ghn8j0a357ujde9daq3mu:2:og4gt15c913id9e4iv7bcobjkn6aqn8d:1:7vu480853r3b0hitt89l7gc3r854fb53:1:rcksm0pvt2fop4deb2tf881mo0vj4ih8:1:0kl39j0i7gljemj93loojdhdbsj9lb36:1:u62g6ma6evirqjb11i0up0p1hppb50ou:1:4bujnjuatdli0klda7ucot0tl836jujt:1:m297l94np7ub1bp8irhpf3eta6bpegr8:4:rrbqpqt3l59s17rbva7pjrqhitbe4cc2:1:6739m2utlhl1k98f4o2fqmgtm12ino4t:1:di7sdosugcarnn353e8ldbnlts9v42s5:1:09hv7tllti9b3hfi7u5m3e7lpbne390a:1:qqc5268agbqc0nqdud6gn7m202teffnm:4:g2slg3mhtfb5m2tk00t8mor5lkboqj2m:1:ug6l7o53ntp50f252u65cj96om411v14:4:ca9rtjbjd7n5pkodo3rsl6bon0s8qe4j:1:q5eq2e7gn1osgqg6bdqctgi7o7lapsik:1:tmie2h7f80pblg0ojfk0v50qu8s97mpa:4:frc0ef452fhh97o534e7lol2b427lk56:1:es7vlqed0665gq9es3ns2uqeh75bkerc:4:os1po1dclurjkflegl02usl2r8rkg2cq:1:1rnurg4no9s6s23mdq8vvfmj0cik47db:1:oarahke38ufh3tmnfpafuvb51dfbhgmh:2:a9307merr53dd71vj459m7qo6rk435na:1:ag7kv5tuc4jvovmas7r5kel32dd94g86:1:csopsqdj2urggh85gbsfth4c9lf4r8vb:1:3dsltc9vis2m6o89bv0dh482pfme30ss:1:1nrr0bod1960bccqc6c2med68hod5gc7:2:miv7sdaoglrgfs2rgafm77kr6h9cbgvn:1:hgsmoadjsib12ml6e05or4q5urv9lt7l:4:a8hqijvam2c6r9qvbffsdj5r55bis0mn:2:naromh9oel8c6dmmg6lvg61ot3gvomkv:1:kmjfnt24t2vf8e58u3r5insr7tfohm2e:1 \ No newline at end of file diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/miv7sdaoglrgfs2rgafm77kr6h9cbgvn b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/miv7sdaoglrgfs2rgafm77kr6h9cbgvn deleted file mode 100644 index 3af2d2cd96..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/miv7sdaoglrgfs2rgafm77kr6h9cbgvn and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ml7hl70ar993tc32gla4ttjar0ogka86 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ml7hl70ar993tc32gla4ttjar0ogka86 deleted file mode 100644 index c52e51cf26..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ml7hl70ar993tc32gla4ttjar0ogka86 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/naromh9oel8c6dmmg6lvg61ot3gvomkv b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/naromh9oel8c6dmmg6lvg61ot3gvomkv deleted file mode 100644 index 96fb66dc97..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/naromh9oel8c6dmmg6lvg61ot3gvomkv and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/oarahke38ufh3tmnfpafuvb51dfbhgmh b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/oarahke38ufh3tmnfpafuvb51dfbhgmh deleted file mode 100644 index 0717c58dbe..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/oarahke38ufh3tmnfpafuvb51dfbhgmh and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/og4gt15c913id9e4iv7bcobjkn6aqn8d b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/og4gt15c913id9e4iv7bcobjkn6aqn8d deleted file mode 100644 index cd2e21ccc3..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/og4gt15c913id9e4iv7bcobjkn6aqn8d and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ojdo9hafo3mvlko0cefqcom7os26utln b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ojdo9hafo3mvlko0cefqcom7os26utln deleted file mode 100644 index f52f1557b3..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ojdo9hafo3mvlko0cefqcom7os26utln and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/os1po1dclurjkflegl02usl2r8rkg2cq b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/os1po1dclurjkflegl02usl2r8rkg2cq deleted file mode 100644 index d6e77f36f3..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/os1po1dclurjkflegl02usl2r8rkg2cq and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/q5eq2e7gn1osgqg6bdqctgi7o7lapsik b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/q5eq2e7gn1osgqg6bdqctgi7o7lapsik deleted file mode 100644 index 1ab53ad2dc..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/q5eq2e7gn1osgqg6bdqctgi7o7lapsik and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/qqc5268agbqc0nqdud6gn7m202teffnm b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/qqc5268agbqc0nqdud6gn7m202teffnm deleted file mode 100644 index ae28d8ca6d..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/qqc5268agbqc0nqdud6gn7m202teffnm and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/rcksm0pvt2fop4deb2tf881mo0vj4ih8 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/rcksm0pvt2fop4deb2tf881mo0vj4ih8 deleted file mode 100644 index 3bc9ec8ae2..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/rcksm0pvt2fop4deb2tf881mo0vj4ih8 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/rrbqpqt3l59s17rbva7pjrqhitbe4cc2 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/rrbqpqt3l59s17rbva7pjrqhitbe4cc2 deleted file mode 100644 index 71ffb97f2a..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/rrbqpqt3l59s17rbva7pjrqhitbe4cc2 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/s69lvejsvg9so3l2nsquavmbai4dmu03 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/s69lvejsvg9so3l2nsquavmbai4dmu03 deleted file mode 100644 index cf28c6f19d..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/s69lvejsvg9so3l2nsquavmbai4dmu03 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/srlc19tj78ldn4hbb8duso90i1vugc59 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/srlc19tj78ldn4hbb8duso90i1vugc59 deleted file mode 100644 index e094d57e4c..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/srlc19tj78ldn4hbb8duso90i1vugc59 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/tmie2h7f80pblg0ojfk0v50qu8s97mpa b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/tmie2h7f80pblg0ojfk0v50qu8s97mpa deleted file mode 100644 index ede082b09c..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/tmie2h7f80pblg0ojfk0v50qu8s97mpa and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/u62g6ma6evirqjb11i0up0p1hppb50ou b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/u62g6ma6evirqjb11i0up0p1hppb50ou deleted file mode 100644 index ca0a5d5761..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/u62g6ma6evirqjb11i0up0p1hppb50ou and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ug6l7o53ntp50f252u65cj96om411v14 b/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ug6l7o53ntp50f252u65cj96om411v14 deleted file mode 100644 index 50fc9117c9..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200113/.dolt/noms/ug6l7o53ntp50f252u65cj96om411v14 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200113/.dolt/repo_state.json b/integration-tests/bats/helper/testdata/20200113/.dolt/repo_state.json deleted file mode 100644 index 793216b5e2..0000000000 --- a/integration-tests/bats/helper/testdata/20200113/.dolt/repo_state.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "head": "refs/heads/master", - "staged": "hlgmnafjvlg8curcjc14dok7k1h3mqci", - "working": "hlgmnafjvlg8curcjc14dok7k1h3mqci", - "merge": null, - "remotes": null, - "branches": null -} \ No newline at end of file diff --git a/integration-tests/bats/helper/testdata/20200113/README.md b/integration-tests/bats/helper/testdata/20200113/README.md deleted file mode 100644 index 113afd10d3..0000000000 --- a/integration-tests/bats/helper/testdata/20200113/README.md +++ /dev/null @@ -1,75 +0,0 @@ -## Overview - -This is test data that captures a repository on January 13, 2020. This may be used to verify that any serialization/deserialization changes are compatible with people's pre-existing data. - -# Branch master - -## Schema - -``` -CREATE TABLE `abc` ( - `pk` BIGINT NOT NULL COMMENT 'tag:0', - `a` LONGTEXT COMMENT 'tag:694', - `b` DATETIME COMMENT 'tag:2902', - PRIMARY KEY (`pk`) -); -``` - -## Data - -``` -+----+------+---------------------------+ -| pk | a | b | -+----+------+---------------------------+ -| 1 | data | 2020-01-13 20:45:18.53558 | -+----+------+---------------------------+ -``` - -# Branch conflict - -## Schema - -``` -CREATE TABLE `abc` ( - `pk` BIGINT NOT NULL COMMENT 'tag:0', - `a` LONGTEXT COMMENT 'tag:694', - `b` DATETIME COMMENT 'tag:2902', - PRIMARY KEY (`pk`) -); -``` - -## Data - -``` -+----+-----------+---------------------------+ -| pk | a | b | -+----+-----------+---------------------------+ -| 1 | data | 2020-01-13 20:45:18.53558 | -| 2 | something | 2020-01-14 20:48:37.13061 | -+----+-----------+---------------------------+ -``` - -# Branch newcolumn - -## Schema - -``` -CREATE TABLE `abc` ( - `pk` BIGINT NOT NULL COMMENT 'tag:0', - `a` LONGTEXT COMMENT 'tag:694', - `b` DATETIME COMMENT 'tag:2902', - `c` BIGINT UNSIGNED COMMENT 'tag:4657', - PRIMARY KEY (`pk`) -); -``` - -## Data - -``` -+----+-----------+---------------------------+---------+ -| pk | a | b | c | -+----+-----------+---------------------------+---------+ -| 1 | data | 2020-01-13 20:45:18.53558 | 2133 | -| 2 | something | 2020-01-13 20:48:37.13061 | 1132020 | -+----+-----------+---------------------------+---------+ -``` diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/config.json b/integration-tests/bats/helper/testdata/20200225/.dolt/config.json deleted file mode 100755 index 9e26dfeeb6..0000000000 --- a/integration-tests/bats/helper/testdata/20200225/.dolt/config.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/01mcg27ngkhkrthdo0p1ogdti510ui2d b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/01mcg27ngkhkrthdo0p1ogdti510ui2d deleted file mode 100644 index c575c500e3..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/01mcg27ngkhkrthdo0p1ogdti510ui2d and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/0t63hbmjg0o2e0l2muvmpdt7clu931h9 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/0t63hbmjg0o2e0l2muvmpdt7clu931h9 deleted file mode 100644 index 3ff3784b79..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/0t63hbmjg0o2e0l2muvmpdt7clu931h9 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/0t9600cdhn6hoshofgps1e1qeipsj8dt b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/0t9600cdhn6hoshofgps1e1qeipsj8dt deleted file mode 100644 index e04573b4f8..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/0t9600cdhn6hoshofgps1e1qeipsj8dt and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/3f7h9ho7l4ltmil4ip6iv5csfjeqa8pe b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/3f7h9ho7l4ltmil4ip6iv5csfjeqa8pe deleted file mode 100644 index d0d6bac5e3..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/3f7h9ho7l4ltmil4ip6iv5csfjeqa8pe and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/3oobbccq8prr93u72rui774p5bddobss b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/3oobbccq8prr93u72rui774p5bddobss deleted file mode 100644 index 40be204c89..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/3oobbccq8prr93u72rui774p5bddobss and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/3skhauhatndqile2e7mqs6q25eoh4988 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/3skhauhatndqile2e7mqs6q25eoh4988 deleted file mode 100644 index b9041d2ad5..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/3skhauhatndqile2e7mqs6q25eoh4988 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/4ae47cm21t7cuq7vluh2ugosmv3djfii b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/4ae47cm21t7cuq7vluh2ugosmv3djfii deleted file mode 100644 index ea5a7a92d9..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/4ae47cm21t7cuq7vluh2ugosmv3djfii and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt deleted file mode 100644 index c41b419f7c..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/6bc0ms2gnjcepoup7ni9110khaljmu47 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/6bc0ms2gnjcepoup7ni9110khaljmu47 deleted file mode 100644 index 093593458f..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/6bc0ms2gnjcepoup7ni9110khaljmu47 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/77goep5rp0nmldp0pn8j66ria281d7tv b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/77goep5rp0nmldp0pn8j66ria281d7tv deleted file mode 100644 index af8b68850d..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/77goep5rp0nmldp0pn8j66ria281d7tv and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/7a407hfrv6mucer355itqg34lsui05ln b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/7a407hfrv6mucer355itqg34lsui05ln deleted file mode 100644 index 1a05400efb..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/7a407hfrv6mucer355itqg34lsui05ln and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/8gnmhsv44p0qfgi21hvq6ql0hvv4r7tr b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/8gnmhsv44p0qfgi21hvq6ql0hvv4r7tr deleted file mode 100644 index 9efb8174ff..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/8gnmhsv44p0qfgi21hvq6ql0hvv4r7tr and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/8q7v5097qicfnloaqc6roe05ef75428s b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/8q7v5097qicfnloaqc6roe05ef75428s deleted file mode 100644 index 50391cc33c..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/8q7v5097qicfnloaqc6roe05ef75428s and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/94tvddc0h23hi71m0ovp3emkdv8ko6uq b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/94tvddc0h23hi71m0ovp3emkdv8ko6uq deleted file mode 100644 index f561da6947..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/94tvddc0h23hi71m0ovp3emkdv8ko6uq and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/9657m1fpeclidkpn8g2h38594pht9jsq b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/9657m1fpeclidkpn8g2h38594pht9jsq deleted file mode 100644 index bdf7ad799a..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/9657m1fpeclidkpn8g2h38594pht9jsq and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/9hrkb1viqhe9iplh2b623i4g358tcn16 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/9hrkb1viqhe9iplh2b623i4g358tcn16 deleted file mode 100644 index 7e9117c1cd..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/9hrkb1viqhe9iplh2b623i4g358tcn16 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/LOCK b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/LOCK deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/a4ofkmekn2f0ih23dmqg9klvhr7caje8 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/a4ofkmekn2f0ih23dmqg9klvhr7caje8 deleted file mode 100644 index a4056a3262..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/a4ofkmekn2f0ih23dmqg9klvhr7caje8 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/cae69p9bv9qgk8gnmcetcrq6pb337bur b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/cae69p9bv9qgk8gnmcetcrq6pb337bur deleted file mode 100644 index 24d2337cfe..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/cae69p9bv9qgk8gnmcetcrq6pb337bur and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/cvk1s81mdeof0rnedr8vmk4f3qh91r2a b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/cvk1s81mdeof0rnedr8vmk4f3qh91r2a deleted file mode 100644 index 7cb32a497a..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/cvk1s81mdeof0rnedr8vmk4f3qh91r2a and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/fi3vd71upeqgs7ffmc198536l2ah2nem b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/fi3vd71upeqgs7ffmc198536l2ah2nem deleted file mode 100644 index 36571d4ea9..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/fi3vd71upeqgs7ffmc198536l2ah2nem and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/fjfk34olm8dg9f3l7u7sqk259allkpbq b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/fjfk34olm8dg9f3l7u7sqk259allkpbq deleted file mode 100644 index 19ee3dcab6..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/fjfk34olm8dg9f3l7u7sqk259allkpbq and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/fvv6ab1mar3engqa8aunlous38m1pbtd b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/fvv6ab1mar3engqa8aunlous38m1pbtd deleted file mode 100644 index f9ba317957..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/fvv6ab1mar3engqa8aunlous38m1pbtd and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/g1k00sceog5vkmf454dpcf5prg458vrh b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/g1k00sceog5vkmf454dpcf5prg458vrh deleted file mode 100644 index 418f0ac7ab..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/g1k00sceog5vkmf454dpcf5prg458vrh and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/g3n9nvmfponntake5r368lnlljmbidke b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/g3n9nvmfponntake5r368lnlljmbidke deleted file mode 100644 index 1bf86bda64..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/g3n9nvmfponntake5r368lnlljmbidke and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/gi9e8nmhav58f4vukca2vc2cd87u09af b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/gi9e8nmhav58f4vukca2vc2cd87u09af deleted file mode 100644 index 38876299d4..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/gi9e8nmhav58f4vukca2vc2cd87u09af and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/h16g5dvp5vkq837snpa8760ac8lhl4ad b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/h16g5dvp5vkq837snpa8760ac8lhl4ad deleted file mode 100644 index dabe01bfd6..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/h16g5dvp5vkq837snpa8760ac8lhl4ad and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/h463bia4dpvciqkm76vfj5qr4ed0l6k1 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/h463bia4dpvciqkm76vfj5qr4ed0l6k1 deleted file mode 100644 index b6848734a5..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/h463bia4dpvciqkm76vfj5qr4ed0l6k1 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/jff26llmtmj7ap2rtlc4g7v42bfmg8a7 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/jff26llmtmj7ap2rtlc4g7v42bfmg8a7 deleted file mode 100644 index b8205f5b07..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/jff26llmtmj7ap2rtlc4g7v42bfmg8a7 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/jqt5s1qs2g998ugg538u8l7c706it2cb b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/jqt5s1qs2g998ugg538u8l7c706it2cb deleted file mode 100644 index a950ed902c..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/jqt5s1qs2g998ugg538u8l7c706it2cb and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/lci84t6s7j5r171qn02dlr7aqns6549e b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/lci84t6s7j5r171qn02dlr7aqns6549e deleted file mode 100644 index 54a9af2d54..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/lci84t6s7j5r171qn02dlr7aqns6549e and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/manifest b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/manifest deleted file mode 100644 index 89b3c9970c..0000000000 --- a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/manifest +++ /dev/null @@ -1 +0,0 @@ -4:__LD_1__:c8vc329o1pc5bjh36rl7qk0jeuoj21ul:ugdi9lf0i1ej2ddddntu4gt148m7m1ft:fi3vd71upeqgs7ffmc198536l2ah2nem:1:9657m1fpeclidkpn8g2h38594pht9jsq:1:3f7h9ho7l4ltmil4ip6iv5csfjeqa8pe:1:h463bia4dpvciqkm76vfj5qr4ed0l6k1:1:7a407hfrv6mucer355itqg34lsui05ln:2:fjfk34olm8dg9f3l7u7sqk259allkpbq:1:g1k00sceog5vkmf454dpcf5prg458vrh:1:94tvddc0h23hi71m0ovp3emkdv8ko6uq:1:a4ofkmekn2f0ih23dmqg9klvhr7caje8:1:psdvh71n9e069pl01nkcg5aijos7k891:2:8q7v5097qicfnloaqc6roe05ef75428s:4:p3u6rb5hpkc8dcqfvlq3ptr2a0rsodu2:4:3skhauhatndqile2e7mqs6q25eoh4988:2:gi9e8nmhav58f4vukca2vc2cd87u09af:1:6bc0ms2gnjcepoup7ni9110khaljmu47:1:jff26llmtmj7ap2rtlc4g7v42bfmg8a7:4:cvk1s81mdeof0rnedr8vmk4f3qh91r2a:4:4ae47cm21t7cuq7vluh2ugosmv3djfii:1:cae69p9bv9qgk8gnmcetcrq6pb337bur:1:77goep5rp0nmldp0pn8j66ria281d7tv:1:01mcg27ngkhkrthdo0p1ogdti510ui2d:1:lci84t6s7j5r171qn02dlr7aqns6549e:1:n49314e2mcvrf6fi2g6s1s3dkv87e4i0:4:g3n9nvmfponntake5r368lnlljmbidke:1:0t9600cdhn6hoshofgps1e1qeipsj8dt:1:sfa54kk9itpahbnapbf56d6vue2b6iko:1:0t63hbmjg0o2e0l2muvmpdt7clu931h9:1:9hrkb1viqhe9iplh2b623i4g358tcn16:4:refbbl8digdrdb0mhrfk6a0mkuhb0ran:2:3oobbccq8prr93u72rui774p5bddobss:1:t9virrnc5olckgn23ok6cnak68ld8a29:5:fvv6ab1mar3engqa8aunlous38m1pbtd:1:vcgoj8o1malsol4avn930tpngsd4094u:1:u025c384nohd013tjaeq6c1vn6cj1v9r:2:rd6kqkaclph8l93js1f2h00pna5uuqif:1:4bujnjuatdli0klda7ucot0tl836jujt:1:jqt5s1qs2g998ugg538u8l7c706it2cb:4:8gnmhsv44p0qfgi21hvq6ql0hvv4r7tr:1:h16g5dvp5vkq837snpa8760ac8lhl4ad:1:vfm8fpknt3arl9rn73mh1nn0sk46olmo:2 \ No newline at end of file diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/n49314e2mcvrf6fi2g6s1s3dkv87e4i0 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/n49314e2mcvrf6fi2g6s1s3dkv87e4i0 deleted file mode 100644 index 70a40725bd..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/n49314e2mcvrf6fi2g6s1s3dkv87e4i0 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/p3u6rb5hpkc8dcqfvlq3ptr2a0rsodu2 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/p3u6rb5hpkc8dcqfvlq3ptr2a0rsodu2 deleted file mode 100644 index e387312ac1..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/p3u6rb5hpkc8dcqfvlq3ptr2a0rsodu2 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/psdvh71n9e069pl01nkcg5aijos7k891 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/psdvh71n9e069pl01nkcg5aijos7k891 deleted file mode 100644 index 76a7157d8b..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/psdvh71n9e069pl01nkcg5aijos7k891 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/rd6kqkaclph8l93js1f2h00pna5uuqif b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/rd6kqkaclph8l93js1f2h00pna5uuqif deleted file mode 100644 index c9d71e5866..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/rd6kqkaclph8l93js1f2h00pna5uuqif and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/refbbl8digdrdb0mhrfk6a0mkuhb0ran b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/refbbl8digdrdb0mhrfk6a0mkuhb0ran deleted file mode 100644 index fdb7428acc..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/refbbl8digdrdb0mhrfk6a0mkuhb0ran and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/sfa54kk9itpahbnapbf56d6vue2b6iko b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/sfa54kk9itpahbnapbf56d6vue2b6iko deleted file mode 100644 index 62de1f285c..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/sfa54kk9itpahbnapbf56d6vue2b6iko and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/t9virrnc5olckgn23ok6cnak68ld8a29 b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/t9virrnc5olckgn23ok6cnak68ld8a29 deleted file mode 100644 index 3105a1fa31..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/t9virrnc5olckgn23ok6cnak68ld8a29 and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/u025c384nohd013tjaeq6c1vn6cj1v9r b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/u025c384nohd013tjaeq6c1vn6cj1v9r deleted file mode 100644 index ffbf6eeb6a..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/u025c384nohd013tjaeq6c1vn6cj1v9r and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/vcgoj8o1malsol4avn930tpngsd4094u b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/vcgoj8o1malsol4avn930tpngsd4094u deleted file mode 100644 index 269234f038..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/vcgoj8o1malsol4avn930tpngsd4094u and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/vfm8fpknt3arl9rn73mh1nn0sk46olmo b/integration-tests/bats/helper/testdata/20200225/.dolt/noms/vfm8fpknt3arl9rn73mh1nn0sk46olmo deleted file mode 100644 index c2220676c1..0000000000 Binary files a/integration-tests/bats/helper/testdata/20200225/.dolt/noms/vfm8fpknt3arl9rn73mh1nn0sk46olmo and /dev/null differ diff --git a/integration-tests/bats/helper/testdata/20200225/.dolt/repo_state.json b/integration-tests/bats/helper/testdata/20200225/.dolt/repo_state.json deleted file mode 100755 index d3861ededf..0000000000 --- a/integration-tests/bats/helper/testdata/20200225/.dolt/repo_state.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "head": "refs/heads/master", - "staged": "7pkje2od877vsvi4ueaab27f0vr2alar", - "working": "7pkje2od877vsvi4ueaab27f0vr2alar", - "merge": null, - "remotes": {}, - "branches": {} -} \ No newline at end of file diff --git a/integration-tests/bats/helper/testdata/20200225/LICENSE.md b/integration-tests/bats/helper/testdata/20200225/LICENSE.md deleted file mode 100755 index f1d7767a10..0000000000 --- a/integration-tests/bats/helper/testdata/20200225/LICENSE.md +++ /dev/null @@ -1 +0,0 @@ -This is a repository level LICENSE. Either edit it, add it, and commit it, or remove the file. \ No newline at end of file diff --git a/integration-tests/bats/helper/testdata/20200225/README.md b/integration-tests/bats/helper/testdata/20200225/README.md deleted file mode 100755 index c9ee875eab..0000000000 --- a/integration-tests/bats/helper/testdata/20200225/README.md +++ /dev/null @@ -1 +0,0 @@ -This is a repository level README. Either edit it, add it, and commit it, or remove the file. \ No newline at end of file diff --git a/integration-tests/bats/helper/testdata/README.md b/integration-tests/bats/helper/testdata/README.md deleted file mode 100644 index 44092545b3..0000000000 --- a/integration-tests/bats/helper/testdata/README.md +++ /dev/null @@ -1,32 +0,0 @@ -## Overview - -This is a collection of repositories that are to be created whenever the on-disk format is changed in any way. This way, we can catch some errors that may arise from the new changes not properly reading the older formats. The test file is `back-compat.bats`, which loops over each directory and runs a set of basic tests to ensure that the latest code can both read and modify pre-existing data. Each repository will have the same branch names and same general schema. - -## Steps - -Whenever the format is updated, a new repository should be created from scratch with the new format. The following steps may be used to create a compatible repository: - -```bash -dolt init -"UPDATE README.md" -dolt sql -q "CREATE TABLE abc(pk BIGINT PRIMARY KEY, a LONGTEXT COMMENT 'tag:694', b DATETIME COMMENT 'tag:2902')" -dolt add . -dolt commit -m "Created table abc" -dolt sql -q "INSERT INTO abc VALUES (1, 'data', '2020-01-13 20:45:18.53558')" -dolt add . -dolt commit -m "Initial data" -dolt checkout -b conflict -dolt sql -q "INSERT INTO abc VALUES (2, 'something', '2020-01-14 20:48:37.13061')" -dolt add . -dolt commit -m "Added something row" -dolt checkout master -dolt checkout -b newcolumn -dolt sql -q "ALTER TABLE abc ADD COLUMN c BIGINT UNSIGNED COMMENT 'tag:4657'" -dolt sql -q "UPDATE abc SET c = 2133 WHERE c IS NULL" -dolt sql -q "INSERT INTO abc VALUES (2, 'something', '2020-01-13 20:48:37.13061', 1132020)" -dolt add . -dolt commit -m "Added something row and column c" -dolt checkout master -``` - -The generated `LICENSE.md` may be removed, and the `README.md` should be updated to reflect the information contained in the repository (this is assumed to be done immediately after `dolt init`). It is required for the repository to be on the `master` branch, as the tests assume this starting point. \ No newline at end of file diff --git a/integration-tests/bats/helper/testdata/new_repo.sh b/integration-tests/bats/helper/testdata/new_repo.sh deleted file mode 100644 index 10f9831e33..0000000000 --- a/integration-tests/bats/helper/testdata/new_repo.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -dolt init -dolt sql -q "CREATE TABLE abc(pk BIGINT PRIMARY KEY, a LONGTEXT COMMENT 'tag:694', b DATETIME COMMENT 'tag:2902')" -dolt add . -dolt commit -m "Created table abc" -dolt sql -q "INSERT INTO abc VALUES (1, 'data', '2020-01-13 20:45:18.53558')" -dolt add . -dolt commit -m "Initial data" -dolt checkout -b conflict -dolt sql -q "INSERT INTO abc VALUES (2, 'something', '2020-01-14 20:48:37.13061')" -dolt add . -dolt commit -m "Added something row" -dolt checkout master -dolt checkout -b newcolumn -dolt sql -q "ALTER TABLE abc ADD COLUMN c BIGINT UNSIGNED COMMENT 'tag:4657'" -dolt sql -q "UPDATE abc SET c = 2133 WHERE c IS NULL" -dolt sql -q "INSERT INTO abc VALUES (2, 'something', '2020-01-13 20:48:37.13061', 1132020)" -dolt add . -dolt commit -m "Added something row and column c" -dolt checkout master diff --git a/integration-tests/compatibility/test_files/backward_compatible_versions.txt b/integration-tests/compatibility/test_files/backward_compatible_versions.txt index 91ee273ace..2a607c8134 100644 --- a/integration-tests/compatibility/test_files/backward_compatible_versions.txt +++ b/integration-tests/compatibility/test_files/backward_compatible_versions.txt @@ -10,3 +10,10 @@ v0.25.0 v0.26.0 v0.27.0 v0.28.0 +v0.28.0 +v0.29.0 +v0.30.0 +v0.31.0 +v0.32.0 +v0.33.0 +v0.34.0