Andy/write feature version

bats/1pk5col-ints.bats

@@ -17,6 +17,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/1pk5col-strings.bats

@@ -17,6 +17,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/1pksupportedtypes.bats

@@ -18,6 +18,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/2pk5cols-ints.bats

@@ -18,6 +18,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/arg-parsing.bats

@@ -6,6 +6,7 @@ setup() {
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/auto_increment.bats

@@ -14,6 +14,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/blame.bats

@@ -7,6 +7,7 @@ setup() {
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/case-sensitivity.bats

@@ -22,6 +22,7 @@ DELIM
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/column_tags.bats

@@ -6,6 +6,7 @@ setup() {
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/commit_tags.bats

@@ -21,6 +21,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/compatibility/test_files/dolt_versions.txt

@@ -5,4 +5,7 @@ v0.16.0
 v0.17.0
 v0.18.0
 v0.19.0
-v0.20.0
+v0.20.0
+v0.21.0
+v0.22.0
+v0.22.7

bats/cp-and-mv.bats

@@ -22,6 +22,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/create-views.bats

@@ -6,6 +6,7 @@ setup() {
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/diff.bats

@@ -18,6 +18,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/docs.bats

@@ -6,6 +6,7 @@ setup() {
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/empty-repo.bats

@@ -6,6 +6,7 @@ setup() {
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/export-tables.bats

@@ -26,6 +26,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/feature-version.bats

@@ -0,0 +1,128 @@
+#!/usr/bin/env bats
+load $BATS_TEST_DIRNAME/helper/common.bash
+
+setup() {
+    setup_common
+}
+
+teardown() {
+     teardown_common
+}
+
+# client FeatureVersion must be >= repo FeatureVersion to read
+# read with maximum FeatureVersion for assersions
+MAX=1000
+
+OLD=10
+NEW=20
+
+@test "set feature version with CLI flag" {
+    dolt --feature-version 19 sql -q "CREATE TABLE test (pk int PRIMARY KEY)"
+    run dolt --feature-version $MAX version --feature
+    [[ "$output" =~ "feature version: 19" ]] || false
+}
+
+@test "new client writes to table, locking out old client" {
+    run dolt --feature-version $OLD sql <<SQL
+CREATE TABLE test (pk int PRIMARY KEY);
+INSERT INTO test VALUES (10),(11),(12);
+SQL
+    [ "$status" -eq 0 ]
+    run dolt --feature-version $NEW sql -q "INSERT INTO test VALUES (20),(21),(22);"
+    [ "$status" -eq 0 ]
+
+    # old client can't read or write
+    run dolt --feature-version $OLD sql -q "SELECT * FROM test"
+    [ "$status" -ne 0 ]
+    [[ ! "$output" =~ "panic" ]] || false
+    run dolt --feature-version $OLD sql -q "INSERT INTO test VALUES (13);"
+    [ "$status" -ne 0 ]
+    [[ ! "$output" =~ "panic" ]] || false
+
+    run dolt --feature-version $MAX version --feature
+    [ "$status" -eq 0 ]
+    [[ "$output" =~ "feature version: $NEW" ]] || false
+}
+
+setup_remote_tests() {
+    # remote repo from top-level test directory
+    rm -rf .dolt/
+
+    # create a new repo and a remote
+    mkdir remote first_repo
+    pushd first_repo
+    dolt --feature-version $OLD init
+    dolt --feature-version $OLD remote add origin file://../remote/
+
+    # add some data and push
+    dolt --feature-version $OLD sql <<SQL
+CREATE TABLE test (pk int PRIMARY KEY);
+INSERT INTO test VALUES (10),(11),(12);
+SQL
+    dolt --feature-version $OLD add .
+    dolt --feature-version $OLD commit -m "test table"
+    dolt --feature-version $OLD push origin master
+    popd
+
+    # clone repo
+    dolt --feature-version $OLD clone file://remote clone_repo
+}
+
+@test "pulling newer FeatureVersion locks out old client" {
+    setup_remote_tests
+
+    pushd first_repo
+    dolt --feature-version $NEW sql -q "INSERT INTO test VALUES (20);"
+    dolt --feature-version $NEW commit -am "added row with new FeatureVersion on master"
+    dolt --feature-version $NEW push origin master
+    popd
+
+    pushd clone_repo
+    run dolt --feature-version $NEW sql -q "SELECT count(*) FROM test;" -r csv
+    [ "$status" -eq 0 ]
+    [[ "${lines[1]}" =~ "3" ]] || false
+    run dolt --feature-version $MAX version --feature
+    [ "$status" -eq 0 ]
+    [[ "$output" =~ "feature version: $OLD" ]] || false
+
+    # pull fails with old FeatureVersion
+    run dolt --feature-version $OLD pull
+    [ "$status" -ne 0 ]
+
+    # pull succeeds with old FeatureVersion
+    run dolt --feature-version $NEW pull
+    [ "$status" -eq 0 ]
+
+    run dolt --feature-version $NEW sql -q "SELECT count(*) FROM test;" -r csv
+    [ "$status" -eq 0 ]
+    [[ "${lines[1]}" =~ "4" ]] || false
+    run dolt --feature-version $MAX version --feature
+    [ "$status" -eq 0 ]
+    [[ "$output" =~ "feature version: $NEW" ]] || false
+}
+
+@test "older client maintains access to feature branch" {
+    setup_remote_tests
+
+    pushd clone_repo
+    dolt --feature-version $OLD checkout -b other
+    dolt --feature-version $OLD sql -q "INSERT INTO test VALUES (13);"
+    dolt --feature-version $OLD commit -am "made some changes on branch other"
+    popd
+
+    pushd first_repo
+    dolt --feature-version $NEW sql -q "INSERT INTO test VALUES (20);"
+    dolt --feature-version $NEW commit -am "added row with new FeatureVersion on master"
+    dolt --feature-version $NEW push origin master
+    popd
+
+    pushd clone_repo
+    dolt --feature-version $OLD fetch
+    dolt --feature-version $OLD checkout master
+    run dolt --feature-version $OLD pull
+    [ "$status" -ne 0 ]
+    [[ "$output" =~ "visit https://github.com/dolthub/dolt/releases/latest/" ]] || false
+    dolt --feature-version $OLD sql -q "SELECT * FROM test"
+    dolt --feature-version $OLD checkout other
+    popd
+}

bats/filter-branch.bats

@@ -20,6 +20,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/foreign-keys.bats

@@ -21,6 +21,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/helper/common.bash

@@ -41,6 +41,11 @@ setup_no_dolt_init() {
     cd "dolt-repo-$$"
 }
 
+assert_feature_version() {
+    run dolt version --feature
+    [[ "$output" =~ "feature version: 0" ]] || exit 1
+}
+
 setup_common() {
     setup_no_dolt_init
     dolt init

bats/import-create-tables.bats

@@ -48,6 +48,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/import-replace-tables.bats

@@ -6,6 +6,7 @@ setup() {
 }
 
 teardown() {
+  assert_feature_version
   teardown_common
 }
 

bats/import-update-tables.bats

@@ -37,6 +37,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/index-on-writes.bats

@@ -102,6 +102,7 @@ setup() {
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/index.bats

@@ -20,6 +20,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/keyless.bats

@@ -15,6 +15,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/localbs-remotes.bats

@@ -12,6 +12,7 @@ setup() {
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 
@@ -160,4 +161,5 @@ SQL
     run dolt clone localbs://../remotedir test-repo
     [ "$status" -eq 1 ]
     [ ! -d test-repo ]
+    cd ..
 }

bats/log.bats

@@ -6,6 +6,7 @@ setup() {
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/merge.bats

@@ -25,6 +25,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/multiple-tables.bats

@@ -28,6 +28,7 @@ SQL
 }
 
 teardown() {
+    assert_feature_version
     teardown_common
 }
 

bats/no-repo.bats

@@ -8,6 +8,7 @@ setup() {
 }
 
 teardown() {
+    cd ../
     teardown_common
     rm -rf $BATS_TMPDIR/no-dolt-dir-$$
 }
@@ -250,6 +251,7 @@ NOT_VALID_REPO_ERROR="The current directory is not a valid dolt repository."
     [ -f .dolt/repo_state.json ]
     [ ! -f README.md ]
     [ ! -f LICENSE.md ]
+    cd ../
     rm -rf $BATS_TMPDIR/dolt-repo-$$-new
 }