diff --git a/bats/compatibility/.gitignore b/bats/compatibility/.gitignore
new file mode 100644
index 00000000000..f5c7eac3d9e
--- /dev/null
+++ b/bats/compatibility/.gitignore
@@ -0,0 +1 @@
+env_test/
diff --git a/bats/compatibility/README.md b/bats/compatibility/README.md
new file mode 100644
index 00000000000..4de34a299b4
--- /dev/null
+++ b/bats/compatibility/README.md
@@ -0,0 +1,23 @@
+## Compatibility Tests
+
+These tests attempt to ensure forward and backward compatibility for Dolt versions.
+
+The testing script `runner.sh` checks out and builds older Dolt release versions to ensure that they can read data from
+newer repositories and vice-versa.
+A test directory `/env_test` is created outside of source control to preserve the environment across
+`git checkout` commands.
+
+For each Dolt release version listed in `versions.txt`, `runner.sh` creates a legacy Dolt repository using the
+`/test_files/setup_repo.sh` script in a directory named with the corresponding version.
+An additional Dolt repository is created using Dolt built from the initial git branch.
+BATS tests, located in `test_files/bats/`, are used to verify the forward and backward compatibility of all Dolt versions
+and the repositories created with those versions.
+
+### Updating
+
+The BATS tests used to verify compatibility are inherently fragile.
+Our primary integration tests in `/dolt/bats/` setup and tear down their environment for each test.
+Because the tests rely on creating a repo with one version of Dolt and running BATS tests with a different version, 
+we cannot isolate their environment without building Dolt twice per test or setting up a different Dolt repo per test.
+The initial version of these tests does all write operations in the `setup_repo.sh` script, and limits state modifications
+within the BATS test to `dolt checkout` branch changes. Take care when editing the BATS tests to follow this pattern.
\ No newline at end of file
diff --git a/bats/compatibility/runner.sh b/bats/compatibility/runner.sh
new file mode 100755
index 00000000000..8df2b9ae3fe
--- /dev/null
+++ b/bats/compatibility/runner.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+function build_dolt() {
+  pushd "$dolt_dir" > /dev/null || exit
+  git checkout "$1" > /dev/null
+  go install .
+  popd > /dev/null || exit
+}
+
+function setup_dir() {
+  if [ -d "$1" ]; then rm -r "$1"; fi
+  mkdir "$1"
+  pushd "$1" > /dev/null || exit
+  "$top_dir/setup_repo.sh" > setup_repo.log
+  cp -r "$top_dir"/bats/* .
+  popd > /dev/null || exit
+}
+
+function run_bats_tests() {
+  pushd "$1" > /dev/null || exit
+  cwd=$(pwd)
+  hash=$(git rev-parse HEAD)
+  echo "testing dolt @ $hash against repo in $cwd"
+  bats .
+  echo
+  popd > /dev/null || exit
+}
+
+# ensure that we have a clean working change set before we begin
+if [[ $(git diff --stat) != '' ]]; then
+  echo "cannot run compatibility tests with git working changes"
+  exit
+fi
+
+# copy all the test files to take them out of source control
+# when we checkout different Dolt releases we don't want to
+# delete our environment
+test_env="env_test"
+rm -r $test_env
+mkdir $test_env
+cp -r test_files/* $test_env
+pushd $test_env > /dev/null || exit
+
+top_dir=$(pwd)
+starting_branch=$(git rev-parse --abbrev-ref HEAD)
+dolt_dir="../../../go/cmd/dolt/"
+
+# setup a repository with dolt built
+# from the current branch
+build_dolt "$starting_branch"
+setup_dir "head"
+
+while IFS= read -r ver
+do
+
+  build_dolt "$ver"
+  setup_dir "$ver"
+
+  # run compatibility.bats to ensure dolt @ $ver can
+  # read a repo created with dolt @ HEAD
+  ver_hash=$(git rev-parse HEAD)
+  echo "hash for dolt @ $ver: $ver_hash"
+  run_bats_tests head
+
+done < <(grep -v '^ *#' < dolt_versions.txt)
+
+# now build dolt @ HEAD and make sure we can read
+# all of the legacy repositories we created
+build_dolt "$starting_branch"
+
+while IFS= read -r ver
+do
+  head_hash=$(git rev-parse HEAD)
+  echo "hash for dolt @ head: $head_hash"
+  run_bats_tests "$ver"
+
+done < <(grep -v '^ *#' < dolt_versions.txt)
+
+
+popd > /dev/null || exit
\ No newline at end of file
diff --git a/bats/compatibility/test_files/bats/compatibility.bats b/bats/compatibility/test_files/bats/compatibility.bats
new file mode 100755
index 00000000000..6410cfe2abd
--- /dev/null
+++ b/bats/compatibility/test_files/bats/compatibility.bats
@@ -0,0 +1,158 @@
+#!/usr/bin/env bats
+load $BATS_TEST_DIRNAME/helper/common.bash
+
+setup() {
+    setup_common
+}
+
+teardown() {
+    teardown_common
+}
+clear
+@test "dolt version" {
+    run dolt version
+    [ "$status" -eq 0 ]
+    regex='dolt version [0-9]+.[0-9]+.[0-9]+'
+    [[ "$output" =~ $regex ]] || false
+}
+
+@test "dolt status" {
+    run dolt status
+    [ "$status" -eq 0 ]
+    [[ "$output" =~ "On branch master" ]] || false
+    [[ "$output" =~ "nothing to commit, working tree clean" ]] || false
+}
+
+@test "dolt ls" {
+    run dolt ls
+    [ "$status" -eq 0 ]
+    [[ "${lines[0]}" =~ "Tables in working set:" ]] || false
+}
+
+@test "dolt branch" {
+    run dolt branch
+    [ "$status" -eq 0 ]
+}
+
+@test "dolt diff" {
+    run dolt diff
+    [ "$status" -eq 0 ]
+}
+
+@test "dolt schema show on branch init" {
+    run dolt checkout init
+    [ "$status" -eq 0 ]
+
+    dolt schema show
+    run dolt schema show abc
+    [ "$status" -eq 0 ]
+    [[ "${lines[0]}" =~ "abc @ working" ]] || false
+    [[ "${lines[1]}" =~ "CREATE TABLE \`abc\` (" ]] || false
+    [[ "${lines[2]}" =~ " \`pk\` BIGINT NOT NULL COMMENT 'tag:0'," ]] || false
+    [[ "${lines[3]}" =~ " \`a\` LONGTEXT COMMENT 'tag:100'," ]] || false
+    [[ "${lines[4]}" =~ " \`b\` DOUBLE COMMENT 'tag:101'," ]] || false
+    [[ "${lines[5]}" =~ " \`w\` BIGINT COMMENT 'tag:102'," ]] || false
+    [[ "${lines[6]}" =~ " \`x\` BIGINT COMMENT 'tag:103'," ]] || false
+    [[ "${lines[7]}" =~ " PRIMARY KEY (\`pk\`)" ]] || false
+    [[ "${lines[8]}" =~ ");" ]] || false
+}
+
+@test "dolt sql 'select * from abc' on branch init" {
+    # checkout we're on the right branch
+    run dolt status
+    [ "$status" -eq 0 ]
+    [[ "$output" =~ "On branch init" ]] || false
+    [[ "$output" =~ "nothing to commit, working tree clean" ]] || false
+
+    dolt sql -q 'select * from abc;'
+    run dolt sql -q 'select * from abc;'
+    [ "$status" -eq 0 ]
+
+
+    [[ "${lines[1]}" =~ "| pk | a    | b   | w | x |" ]] || false
+    [[ "${lines[2]}" =~ "+----+------+-----+---+---+" ]] || false
+    [[ "${lines[3]}" =~ "| 0  | asdf | 1.1 | 0 | 0 |" ]] || false
+    [[ "${lines[4]}" =~ "| 1  | asdf | 1.1 | 0 | 0 |" ]] || false
+    [[ "${lines[5]}" =~ "| 2  | asdf | 1.1 | 0 | 0 |" ]] || false
+}
+
+@test "dolt schema show on branch master" {
+    run dolt checkout master
+    [ "$status" -eq 0 ]
+
+    dolt schema show
+    run dolt schema show abc
+    [ "$status" -eq 0 ]
+    [[ "${lines[0]}" =~ "abc @ working" ]] || false
+    [[ "${lines[1]}" =~ "CREATE TABLE \`abc\` (" ]] || false
+    [[ "${lines[2]}" =~ "\`pk\` BIGINT NOT NULL COMMENT 'tag:0'," ]] || false
+    [[ "${lines[3]}" =~ "\`a\` LONGTEXT COMMENT 'tag:100'," ]] || false
+    [[ "${lines[4]}" =~ "\`b\` DOUBLE COMMENT 'tag:101'," ]] || false
+    [[ "${lines[5]}" =~ "\`x\` BIGINT COMMENT 'tag:103'," ]] || false
+    [[ "${lines[6]}" =~ "\`y\` BIGINT COMMENT 'tag:104'," ]] || false
+    [[ "${lines[7]}" =~ "PRIMARY KEY (\`pk\`)" ]] || false
+    [[ "${lines[8]}" =~ ");" ]] || false
+}
+
+
+@test "dolt sql 'select * from abc' on branch master" {
+    # checkout we're on the right branch
+    run dolt status
+    [ "$status" -eq 0 ]
+    [[ "$output" =~ "On branch master" ]] || false
+    [[ "$output" =~ "nothing to commit, working tree clean" ]] || false
+
+    dolt sql -q 'select * from abc;'
+    run dolt sql -q 'select * from abc;'
+    [ "$status" -eq 0 ]
+    [[ "${lines[1]}" =~ "| pk | a    | b   | x | y      |" ]] || false
+    [[ "${lines[2]}" =~ "+----+------+-----+---+--------+" ]] || false
+    [[ "${lines[3]}" =~ "| 0  | asdf | 1.1 | 0 | <NULL> |" ]] || false
+    [[ "${lines[4]}" =~ "| 2  | asdf | 1.1 | 0 | <NULL> |" ]] || false
+    [[ "${lines[5]}" =~ "| 3  | data | 1.1 | 0 | <NULL> |" ]] || false
+}
+
+@test "dolt schema show on branch other" {
+    run dolt checkout other
+    [ "$status" -eq 0 ]
+
+    dolt schema show
+    run dolt schema show abc
+    [ "$status" -eq 0 ]
+    [[ "${lines[0]}" =~ "abc @ working" ]] || false
+    [[ "${lines[1]}" =~ "CREATE TABLE \`abc\` (" ]] || false
+    [[ "${lines[2]}" =~ "\`pk\` BIGINT NOT NULL COMMENT 'tag:0'," ]] || false
+    [[ "${lines[3]}" =~ "\`a\` LONGTEXT COMMENT 'tag:100'," ]] || false
+    [[ "${lines[4]}" =~ "\`b\` DOUBLE COMMENT 'tag:101'," ]] || false
+    [[ "${lines[5]}" =~ "\`w\` BIGINT COMMENT 'tag:102'," ]] || false
+    [[ "${lines[6]}" =~ "\`z\` BIGINT COMMENT 'tag:105'," ]] || false
+    [[ "${lines[7]}" =~ "PRIMARY KEY (\`pk\`)" ]] || false
+    [[ "${lines[8]}" =~ ");" ]] || false
+}
+
+@test "dolt sql 'select * from abc' on branch other" {
+    # checkout we're on the right branch
+    run dolt status
+    [ "$status" -eq 0 ]
+    [[ "$output" =~ "On branch other" ]] || false
+    [[ "$output" =~ "nothing to commit, working tree clean" ]] || false
+
+    dolt sql -q 'select * from abc;'
+    run dolt sql -q 'select * from abc;'
+    [ "$status" -eq 0 ]
+    [[ "${lines[1]}" =~ "| pk | a    | b   | w | z      |" ]] || false
+    [[ "${lines[2]}" =~ "+----+------+-----+---+--------+" ]] || false
+    [[ "${lines[3]}" =~ "| 0  | asdf | 1.1 | 0 | <NULL> |" ]] || false
+    [[ "${lines[4]}" =~ "| 1  | asdf | 1.1 | 0 | <NULL> |" ]] || false
+    [[ "${lines[5]}" =~ "| 4  | data | 1.1 | 0 | <NULL> |" ]] || false
+
+    dolt checkout master
+}
+
+@test "dolt table import" {
+    run dolt table import -c -s abc_schema.json abc2 abc.csv
+    [ "$status" -eq 0 ]
+    [[ "$output" =~ "Import completed successfully." ]] || false
+
+    dolt sql -q 'drop table abc2'
+}
\ No newline at end of file
diff --git a/bats/compatibility/test_files/bats/helper/common.bash b/bats/compatibility/test_files/bats/helper/common.bash
new file mode 100644
index 00000000000..b2130f32dcb
--- /dev/null
+++ b/bats/compatibility/test_files/bats/helper/common.bash
@@ -0,0 +1,16 @@
+load helper/windows-compat
+
+if [ -z "$BATS_TMPDIR" ]; then
+    export BATS_TMPDIR=$HOME/batstmp/
+    mkdir $BATS_TMPDIR
+fi
+
+setup_common() {
+    echo "setup" > /dev/null
+}
+
+teardown_common() {
+    echo "teardown" > /dev/null
+}
+
+dolt config --global --add metrics.disabled true > /dev/null 2>&1
diff --git a/bats/compatibility/test_files/bats/helper/windows-compat.bash b/bats/compatibility/test_files/bats/helper/windows-compat.bash
new file mode 100644
index 00000000000..3a7049eccc9
--- /dev/null
+++ b/bats/compatibility/test_files/bats/helper/windows-compat.bash
@@ -0,0 +1,24 @@
+nativepath() { echo "$1"; }
+nativevar() { eval export "$1"="$2"; }
+skiponwindows() { :; }
+
+IS_WINDOWS=false
+
+if [ -d /mnt/c/Windows/System32 ]; then
+    IS_WINDOWS=true
+    if [ ! -d /mnt/c/batstmp ]; then
+        mkdir /mnt/c/batstmp
+    fi
+    BATS_TMPDIR=`TMPDIR=/mnt/c/batstmp mktemp -d -t dolt-bats-tests-XXXXXX`
+    export BATS_TMPDIR
+    nativepath() {
+        wslpath -w "$1"
+    }
+    nativevar() {
+        eval export "$1"="$2"
+        export WSLENV="$1$3"
+    }
+    skiponwindows() {
+        skip "$1"
+    }
+fi
diff --git a/bats/compatibility/test_files/dolt_versions.txt b/bats/compatibility/test_files/dolt_versions.txt
new file mode 100644
index 00000000000..dcd458281f2
--- /dev/null
+++ b/bats/compatibility/test_files/dolt_versions.txt
@@ -0,0 +1,2 @@
+v0.13.0
+v0.14.0
\ No newline at end of file
diff --git a/bats/compatibility/test_files/setup_repo.sh b/bats/compatibility/test_files/setup_repo.sh
new file mode 100755
index 00000000000..6660192d8ff
--- /dev/null
+++ b/bats/compatibility/test_files/setup_repo.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+dolt init
+
+dolt sql <<SQL
+CREATE TABLE abc (
+  pk BIGINT NOT NULL COMMENT 'tag:0',
+  a LONGTEXT COMMENT 'tag:100',
+  b DOUBLE COMMENT 'tag:101',
+  w BIGINT COMMENT 'tag:102',
+  x BIGINT COMMENT 'tag:103',
+  PRIMARY KEY (pk)
+);
+INSERT INTO abc VALUES (0, 'asdf', 1.1, 0, 0);
+INSERT INTO abc VALUES (1, 'asdf', 1.1, 0, 0);
+INSERT INTO abc VALUES (2, 'asdf', 1.1, 0, 0);
+SQL
+dolt add .
+dolt commit -m "initialized data"
+dolt branch init
+
+
+dolt branch other
+dolt sql <<SQL
+DELETE FROM abc WHERE pk=1;
+INSERT INTO abc VALUES (3, 'data', 1.1, 0, 0);
+ALTER TABLE abc DROP COLUMN w;
+ALTER TABLE abc ADD COLUMN y BIGINT COMMENT 'tag:104';
+SQL
+dolt add .
+dolt commit -m "made changes to master"
+
+dolt checkout other
+dolt sql <<SQL
+DELETE FROM abc WHERE pk=2;
+INSERT INTO abc VALUES (4, 'data', 1.1, 0, 0);
+ALTER TABLE abc DROP COLUMN x;
+ALTER TABLE abc ADD COLUMN z BIGINT COMMENT 'tag:105';
+SQL
+dolt add .
+dolt commit -m "made changes to other"
+
+dolt checkout master
+dolt table export abc abc.csv
+dolt schema export abc abc_schema.json
+
+# add info to the log
+echo
+echo "dolt status"
+dolt status
+
+echo
+echo "dolt branch"
+dolt branch
+
+echo
+echo "dolt schema show"
+dolt schema show
+
+echo
+echo "dolt sql -q 'select * from abc;'"
+dolt sql -q 'select * from abc;'
diff --git a/bats/helper/1pk5col-ints-schema.json b/bats/helper/1pk5col-ints-schema.json
index c77613337b5..9fea4e10886 100644
--- a/bats/helper/1pk5col-ints-schema.json
+++ b/bats/helper/1pk5col-ints-schema.json
@@ -3,6 +3,7 @@
     {
       "tag": 0,
       "name": "pk",
+      "kind": "int",
       "is_part_of_pk": true,
       "typeinfo": {
         "type": "int",
@@ -20,6 +21,7 @@
     {
       "tag": 1,
       "name": "c1",
+      "kind": "int",
       "is_part_of_pk": false,
       "typeinfo": {
         "type": "int",
@@ -32,6 +34,7 @@
     {
       "tag": 2,
       "name": "c2",
+      "kind": "int",
       "is_part_of_pk": false,
       "typeinfo": {
         "type": "int",
@@ -44,6 +47,7 @@
     {
       "tag": 3,
       "name": "c3",
+      "kind": "int",
       "is_part_of_pk": false,
       "typeinfo": {
         "type": "int",
@@ -56,6 +60,7 @@
     {
       "tag": 4,
       "name": "c4",
+      "kind": "int",
       "is_part_of_pk": false,
       "typeinfo": {
         "type": "int",
@@ -68,6 +73,7 @@
     {
       "tag": 5,
       "name": "c5",
+      "kind": "int",
       "is_part_of_pk": false,
       "typeinfo": {
         "type": "int",
diff --git a/bats/helper/testdata/20200218/.dolt/noms/0np979l706glgvkrb60qjutfsvqp2qha b/bats/helper/testdata/20200218/.dolt/noms/0np979l706glgvkrb60qjutfsvqp2qha
deleted file mode 100644
index 30e0e03573e..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/0np979l706glgvkrb60qjutfsvqp2qha and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/19358uq7gd25das63fisbhs5hgr5bjl6 b/bats/helper/testdata/20200218/.dolt/noms/19358uq7gd25das63fisbhs5hgr5bjl6
deleted file mode 100644
index 518392441c2..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/19358uq7gd25das63fisbhs5hgr5bjl6 and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/1c4lr7m42hk06rmp5ud608k3u1cskdng b/bats/helper/testdata/20200218/.dolt/noms/1c4lr7m42hk06rmp5ud608k3u1cskdng
deleted file mode 100644
index 35c4ce78c4e..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/1c4lr7m42hk06rmp5ud608k3u1cskdng and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/1cnrtr8avnmntcjf7sk1ls124vd994o2 b/bats/helper/testdata/20200218/.dolt/noms/1cnrtr8avnmntcjf7sk1ls124vd994o2
deleted file mode 100644
index 917fc20e017..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/1cnrtr8avnmntcjf7sk1ls124vd994o2 and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/1j0kapej1j3vcjtl0v5g9aba56gnsocs b/bats/helper/testdata/20200218/.dolt/noms/1j0kapej1j3vcjtl0v5g9aba56gnsocs
deleted file mode 100644
index 1fce6890a93..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/1j0kapej1j3vcjtl0v5g9aba56gnsocs and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/29sgublh0pevbk65gg7e6ifio0r1pbg3 b/bats/helper/testdata/20200218/.dolt/noms/29sgublh0pevbk65gg7e6ifio0r1pbg3
deleted file mode 100644
index 480cfde0dd4..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/29sgublh0pevbk65gg7e6ifio0r1pbg3 and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/3qsuukgmncd33n3a3pvh3bl2uknpd1pt b/bats/helper/testdata/20200218/.dolt/noms/3qsuukgmncd33n3a3pvh3bl2uknpd1pt
deleted file mode 100644
index 98bd320acf1..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/3qsuukgmncd33n3a3pvh3bl2uknpd1pt and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/8tk8khk3qfdloe8bbjh9avdpp1n5f10j b/bats/helper/testdata/20200218/.dolt/noms/8tk8khk3qfdloe8bbjh9avdpp1n5f10j
deleted file mode 100644
index 8acde9be573..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/8tk8khk3qfdloe8bbjh9avdpp1n5f10j and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/8uve6lu1t2bbp21jh8luu27112ldee53 b/bats/helper/testdata/20200218/.dolt/noms/8uve6lu1t2bbp21jh8luu27112ldee53
deleted file mode 100644
index a2c76688bfb..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/8uve6lu1t2bbp21jh8luu27112ldee53 and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/akkjp98avt302ttpsc17fbbjjj3bro6m b/bats/helper/testdata/20200218/.dolt/noms/akkjp98avt302ttpsc17fbbjjj3bro6m
deleted file mode 100644
index cef17c7c425..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/akkjp98avt302ttpsc17fbbjjj3bro6m and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/at3q7mfua3danpflmntkbnvjhl91nr7e b/bats/helper/testdata/20200218/.dolt/noms/at3q7mfua3danpflmntkbnvjhl91nr7e
deleted file mode 100644
index 5a39a4a686e..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/at3q7mfua3danpflmntkbnvjhl91nr7e and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/aua0mketcuac9gdue9fako6m10i1orkt b/bats/helper/testdata/20200218/.dolt/noms/aua0mketcuac9gdue9fako6m10i1orkt
deleted file mode 100644
index 8c9449a9c0f..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/aua0mketcuac9gdue9fako6m10i1orkt and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/c9i43jm5ubijsvdg3679hld9p1otrmhk b/bats/helper/testdata/20200218/.dolt/noms/c9i43jm5ubijsvdg3679hld9p1otrmhk
deleted file mode 100644
index aec8406b9df..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/c9i43jm5ubijsvdg3679hld9p1otrmhk and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/cs3200s56umfm60v6bruf0rnt0adquvu b/bats/helper/testdata/20200218/.dolt/noms/cs3200s56umfm60v6bruf0rnt0adquvu
deleted file mode 100644
index c561f914020..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/cs3200s56umfm60v6bruf0rnt0adquvu and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/e1hhji1sq277j2spo9defilqjhb31tnp b/bats/helper/testdata/20200218/.dolt/noms/e1hhji1sq277j2spo9defilqjhb31tnp
deleted file mode 100644
index ddb3194d326..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/e1hhji1sq277j2spo9defilqjhb31tnp and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/es163dd2tfgc03k6g0eikn5obr9p52o5 b/bats/helper/testdata/20200218/.dolt/noms/es163dd2tfgc03k6g0eikn5obr9p52o5
deleted file mode 100644
index 33a7ab89c0d..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/es163dd2tfgc03k6g0eikn5obr9p52o5 and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/fe1m0kokam20d7jr8t6acg95s9iauabm b/bats/helper/testdata/20200218/.dolt/noms/fe1m0kokam20d7jr8t6acg95s9iauabm
deleted file mode 100644
index c1265375c0b..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/fe1m0kokam20d7jr8t6acg95s9iauabm and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/g06fe93ki9g8pnfnng655vbqgsqrgm6e b/bats/helper/testdata/20200218/.dolt/noms/g06fe93ki9g8pnfnng655vbqgsqrgm6e
deleted file mode 100644
index f72050ddb1d..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/g06fe93ki9g8pnfnng655vbqgsqrgm6e and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/h37m8tmlu1pco0de4fskh4bhjng0iiqj b/bats/helper/testdata/20200218/.dolt/noms/h37m8tmlu1pco0de4fskh4bhjng0iiqj
deleted file mode 100644
index d10d84c2a6d..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/h37m8tmlu1pco0de4fskh4bhjng0iiqj and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/j3qdmkh5kies7u6u0p5q35qqvsdrnqmh b/bats/helper/testdata/20200218/.dolt/noms/j3qdmkh5kies7u6u0p5q35qqvsdrnqmh
deleted file mode 100644
index d20de9d94c9..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/j3qdmkh5kies7u6u0p5q35qqvsdrnqmh and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/jaa1npmvf5mvmjfa5g05k97csb6lmetj b/bats/helper/testdata/20200218/.dolt/noms/jaa1npmvf5mvmjfa5g05k97csb6lmetj
deleted file mode 100644
index 5158a1f0e1b..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/jaa1npmvf5mvmjfa5g05k97csb6lmetj and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/joa80roic1tnji5co508amahn0s3buc4 b/bats/helper/testdata/20200218/.dolt/noms/joa80roic1tnji5co508amahn0s3buc4
deleted file mode 100644
index f90305619f7..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/joa80roic1tnji5co508amahn0s3buc4 and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/kef5fdf6ipmeoaqjvaucfeutvigp1k5t b/bats/helper/testdata/20200218/.dolt/noms/kef5fdf6ipmeoaqjvaucfeutvigp1k5t
deleted file mode 100644
index 95d2c472766..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/kef5fdf6ipmeoaqjvaucfeutvigp1k5t and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/m06v03lupqbb7mjj3b1v0n750n28iusl b/bats/helper/testdata/20200218/.dolt/noms/m06v03lupqbb7mjj3b1v0n750n28iusl
deleted file mode 100644
index 42acc15948a..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/m06v03lupqbb7mjj3b1v0n750n28iusl and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/m1plgie64ceiqsiodf91v49g5s0v47aq b/bats/helper/testdata/20200218/.dolt/noms/m1plgie64ceiqsiodf91v49g5s0v47aq
deleted file mode 100644
index 4fce5aeed19..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/m1plgie64ceiqsiodf91v49g5s0v47aq and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/manifest b/bats/helper/testdata/20200218/.dolt/noms/manifest
deleted file mode 100644
index c24644231cd..00000000000
--- a/bats/helper/testdata/20200218/.dolt/noms/manifest
+++ /dev/null
@@ -1 +0,0 @@
-4:__LD_1__:uec7u5td6ijeokkl33odpbpd8n2iqgrb:c2ed6imouel3splhtbuqjilvm8mc1jtg:j3qdmkh5kies7u6u0p5q35qqvsdrnqmh:1:kef5fdf6ipmeoaqjvaucfeutvigp1k5t:1:cs3200s56umfm60v6bruf0rnt0adquvu:1:u3v99av1pn9csrj1c2279d55cgbs9nmf:1:pkn7rl4ptpcnaj84ndqovf70m25k4m15:4:r02nsa1aso14cum0ucu68hpbv5e26sub:1:1j0kapej1j3vcjtl0v5g9aba56gnsocs:1:pukvcg65bke2gfjsaa0vkmb6iqufc2pr:1:19358uq7gd25das63fisbhs5hgr5bjl6:1:akkjp98avt302ttpsc17fbbjjj3bro6m:2:vluaml01uh03jq2qmlvnq6lmm76k2gnb:1:jaa1npmvf5mvmjfa5g05k97csb6lmetj:2:uieip5gmq2l1crulfhaaeetjnp7qrss3:1:q46sgrpbkut499mcat8jqck1vd7dga8j:1:at3q7mfua3danpflmntkbnvjhl91nr7e:1:29sgublh0pevbk65gg7e6ifio0r1pbg3:1:vf9go77binpab3ueh4qjc7e17ms5mulj:1:h37m8tmlu1pco0de4fskh4bhjng0iiqj:1:fe1m0kokam20d7jr8t6acg95s9iauabm:2:m06v03lupqbb7mjj3b1v0n750n28iusl:1:0np979l706glgvkrb60qjutfsvqp2qha:1:1c4lr7m42hk06rmp5ud608k3u1cskdng:2:psvnhn9ct110ood7vckomvoeqjdfurga:1:g06fe93ki9g8pnfnng655vbqgsqrgm6e:6:ss6lrhevqfh9ekcn0kncn7basasco8ae:1:1cnrtr8avnmntcjf7sk1ls124vd994o2:4:e1hhji1sq277j2spo9defilqjhb31tnp:1:es163dd2tfgc03k6g0eikn5obr9p52o5:4:8tk8khk3qfdloe8bbjh9avdpp1n5f10j:4:8uve6lu1t2bbp21jh8luu27112ldee53:2:ua5da1eb1h4851k05dhn8bb9nl90s7ve:1:p59hn64bs3917m88ojtodm16n7c945v5:5:c9i43jm5ubijsvdg3679hld9p1otrmhk:2:m1plgie64ceiqsiodf91v49g5s0v47aq:1:joa80roic1tnji5co508amahn0s3buc4:1:aua0mketcuac9gdue9fako6m10i1orkt:1:nl77suguv7ont1cmeccqdh2u9vc1vpis:4:4bujnjuatdli0klda7ucot0tl836jujt:1:ng1ns2c6or846i2g0pgg4ngjhonbml77:4:3qsuukgmncd33n3a3pvh3bl2uknpd1pt:1
\ No newline at end of file
diff --git a/bats/helper/testdata/20200218/.dolt/noms/ng1ns2c6or846i2g0pgg4ngjhonbml77 b/bats/helper/testdata/20200218/.dolt/noms/ng1ns2c6or846i2g0pgg4ngjhonbml77
deleted file mode 100644
index f8a1f887840..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/ng1ns2c6or846i2g0pgg4ngjhonbml77 and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/nl77suguv7ont1cmeccqdh2u9vc1vpis b/bats/helper/testdata/20200218/.dolt/noms/nl77suguv7ont1cmeccqdh2u9vc1vpis
deleted file mode 100644
index cdaf36c85c1..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/nl77suguv7ont1cmeccqdh2u9vc1vpis and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/p59hn64bs3917m88ojtodm16n7c945v5 b/bats/helper/testdata/20200218/.dolt/noms/p59hn64bs3917m88ojtodm16n7c945v5
deleted file mode 100644
index 10c53191716..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/p59hn64bs3917m88ojtodm16n7c945v5 and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/pkn7rl4ptpcnaj84ndqovf70m25k4m15 b/bats/helper/testdata/20200218/.dolt/noms/pkn7rl4ptpcnaj84ndqovf70m25k4m15
deleted file mode 100644
index 6ac227e3aab..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/pkn7rl4ptpcnaj84ndqovf70m25k4m15 and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/psvnhn9ct110ood7vckomvoeqjdfurga b/bats/helper/testdata/20200218/.dolt/noms/psvnhn9ct110ood7vckomvoeqjdfurga
deleted file mode 100644
index 3cd420b666e..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/psvnhn9ct110ood7vckomvoeqjdfurga and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/pukvcg65bke2gfjsaa0vkmb6iqufc2pr b/bats/helper/testdata/20200218/.dolt/noms/pukvcg65bke2gfjsaa0vkmb6iqufc2pr
deleted file mode 100644
index fa5863359a9..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/pukvcg65bke2gfjsaa0vkmb6iqufc2pr and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/q46sgrpbkut499mcat8jqck1vd7dga8j b/bats/helper/testdata/20200218/.dolt/noms/q46sgrpbkut499mcat8jqck1vd7dga8j
deleted file mode 100644
index 91cad19f7ba..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/q46sgrpbkut499mcat8jqck1vd7dga8j and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/r02nsa1aso14cum0ucu68hpbv5e26sub b/bats/helper/testdata/20200218/.dolt/noms/r02nsa1aso14cum0ucu68hpbv5e26sub
deleted file mode 100644
index caef5a1b88e..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/r02nsa1aso14cum0ucu68hpbv5e26sub and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/ss6lrhevqfh9ekcn0kncn7basasco8ae b/bats/helper/testdata/20200218/.dolt/noms/ss6lrhevqfh9ekcn0kncn7basasco8ae
deleted file mode 100644
index acb6c64bfdb..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/ss6lrhevqfh9ekcn0kncn7basasco8ae and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/u3v99av1pn9csrj1c2279d55cgbs9nmf b/bats/helper/testdata/20200218/.dolt/noms/u3v99av1pn9csrj1c2279d55cgbs9nmf
deleted file mode 100644
index f2c18d7ae85..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/u3v99av1pn9csrj1c2279d55cgbs9nmf and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/ua5da1eb1h4851k05dhn8bb9nl90s7ve b/bats/helper/testdata/20200218/.dolt/noms/ua5da1eb1h4851k05dhn8bb9nl90s7ve
deleted file mode 100644
index 093bbc31bed..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/ua5da1eb1h4851k05dhn8bb9nl90s7ve and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/uieip5gmq2l1crulfhaaeetjnp7qrss3 b/bats/helper/testdata/20200218/.dolt/noms/uieip5gmq2l1crulfhaaeetjnp7qrss3
deleted file mode 100644
index d4006465f8c..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/uieip5gmq2l1crulfhaaeetjnp7qrss3 and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/vf9go77binpab3ueh4qjc7e17ms5mulj b/bats/helper/testdata/20200218/.dolt/noms/vf9go77binpab3ueh4qjc7e17ms5mulj
deleted file mode 100644
index e03e6e6a436..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/vf9go77binpab3ueh4qjc7e17ms5mulj and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/vluaml01uh03jq2qmlvnq6lmm76k2gnb b/bats/helper/testdata/20200218/.dolt/noms/vluaml01uh03jq2qmlvnq6lmm76k2gnb
deleted file mode 100644
index fd0d1a631d9..00000000000
Binary files a/bats/helper/testdata/20200218/.dolt/noms/vluaml01uh03jq2qmlvnq6lmm76k2gnb and /dev/null differ
diff --git a/bats/helper/testdata/20200218/.dolt/repo_state.json b/bats/helper/testdata/20200218/.dolt/repo_state.json
deleted file mode 100644
index 1c257279c32..00000000000
--- a/bats/helper/testdata/20200218/.dolt/repo_state.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "head": "refs/heads/master",
-  "staged": "j00m9ho0qk8nuqqemh445bgr38mi59n2",
-  "working": "j00m9ho0qk8nuqqemh445bgr38mi59n2",
-  "merge": null,
-  "remotes": null,
-  "branches": null
-}
\ No newline at end of file
diff --git a/bats/helper/testdata/20200218/README.md b/bats/helper/testdata/20200218/README.md
deleted file mode 100644
index 2e521bd13a0..00000000000
--- a/bats/helper/testdata/20200218/README.md
+++ /dev/null
@@ -1,75 +0,0 @@
-## Overview
-
-This is test data that captures a repository on February 18, 2020. This may be used to verify that any serialization/deserialization changes are compatible with people's pre-existing data. This makes use of the new extended type information for schemas, which does away with persisting the noms kind of a column and introduces a new TypeInfo structure.
-
-# 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/bats/helper/testdata/20200218/.dolt/config.json b/bats/helper/testdata/20200225/.dolt/config.json
old mode 100644
new mode 100755
similarity index 100%
rename from bats/helper/testdata/20200218/.dolt/config.json
rename to bats/helper/testdata/20200225/.dolt/config.json
diff --git a/bats/helper/testdata/20200225/.dolt/noms/01mcg27ngkhkrthdo0p1ogdti510ui2d b/bats/helper/testdata/20200225/.dolt/noms/01mcg27ngkhkrthdo0p1ogdti510ui2d
new file mode 100644
index 00000000000..c575c500e3a
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/01mcg27ngkhkrthdo0p1ogdti510ui2d differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/0t63hbmjg0o2e0l2muvmpdt7clu931h9 b/bats/helper/testdata/20200225/.dolt/noms/0t63hbmjg0o2e0l2muvmpdt7clu931h9
new file mode 100644
index 00000000000..3ff3784b790
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/0t63hbmjg0o2e0l2muvmpdt7clu931h9 differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/0t9600cdhn6hoshofgps1e1qeipsj8dt b/bats/helper/testdata/20200225/.dolt/noms/0t9600cdhn6hoshofgps1e1qeipsj8dt
new file mode 100644
index 00000000000..e04573b4f8e
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/0t9600cdhn6hoshofgps1e1qeipsj8dt differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/3f7h9ho7l4ltmil4ip6iv5csfjeqa8pe b/bats/helper/testdata/20200225/.dolt/noms/3f7h9ho7l4ltmil4ip6iv5csfjeqa8pe
new file mode 100644
index 00000000000..d0d6bac5e3a
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/3f7h9ho7l4ltmil4ip6iv5csfjeqa8pe differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/3oobbccq8prr93u72rui774p5bddobss b/bats/helper/testdata/20200225/.dolt/noms/3oobbccq8prr93u72rui774p5bddobss
new file mode 100644
index 00000000000..40be204c891
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/3oobbccq8prr93u72rui774p5bddobss differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/3skhauhatndqile2e7mqs6q25eoh4988 b/bats/helper/testdata/20200225/.dolt/noms/3skhauhatndqile2e7mqs6q25eoh4988
new file mode 100644
index 00000000000..b9041d2ad51
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/3skhauhatndqile2e7mqs6q25eoh4988 differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/4ae47cm21t7cuq7vluh2ugosmv3djfii b/bats/helper/testdata/20200225/.dolt/noms/4ae47cm21t7cuq7vluh2ugosmv3djfii
new file mode 100644
index 00000000000..ea5a7a92d96
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/4ae47cm21t7cuq7vluh2ugosmv3djfii differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt b/bats/helper/testdata/20200225/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt
similarity index 100%
rename from bats/helper/testdata/20200218/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt
rename to bats/helper/testdata/20200225/.dolt/noms/4bujnjuatdli0klda7ucot0tl836jujt
diff --git a/bats/helper/testdata/20200225/.dolt/noms/6bc0ms2gnjcepoup7ni9110khaljmu47 b/bats/helper/testdata/20200225/.dolt/noms/6bc0ms2gnjcepoup7ni9110khaljmu47
new file mode 100644
index 00000000000..093593458fc
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/6bc0ms2gnjcepoup7ni9110khaljmu47 differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/77goep5rp0nmldp0pn8j66ria281d7tv b/bats/helper/testdata/20200225/.dolt/noms/77goep5rp0nmldp0pn8j66ria281d7tv
new file mode 100644
index 00000000000..af8b68850d6
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/77goep5rp0nmldp0pn8j66ria281d7tv differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/7a407hfrv6mucer355itqg34lsui05ln b/bats/helper/testdata/20200225/.dolt/noms/7a407hfrv6mucer355itqg34lsui05ln
new file mode 100644
index 00000000000..1a05400efbc
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/7a407hfrv6mucer355itqg34lsui05ln differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/8gnmhsv44p0qfgi21hvq6ql0hvv4r7tr b/bats/helper/testdata/20200225/.dolt/noms/8gnmhsv44p0qfgi21hvq6ql0hvv4r7tr
new file mode 100644
index 00000000000..9efb8174ffe
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/8gnmhsv44p0qfgi21hvq6ql0hvv4r7tr differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/8q7v5097qicfnloaqc6roe05ef75428s b/bats/helper/testdata/20200225/.dolt/noms/8q7v5097qicfnloaqc6roe05ef75428s
new file mode 100644
index 00000000000..50391cc33c0
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/8q7v5097qicfnloaqc6roe05ef75428s differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/94tvddc0h23hi71m0ovp3emkdv8ko6uq b/bats/helper/testdata/20200225/.dolt/noms/94tvddc0h23hi71m0ovp3emkdv8ko6uq
new file mode 100644
index 00000000000..f561da69472
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/94tvddc0h23hi71m0ovp3emkdv8ko6uq differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/9657m1fpeclidkpn8g2h38594pht9jsq b/bats/helper/testdata/20200225/.dolt/noms/9657m1fpeclidkpn8g2h38594pht9jsq
new file mode 100644
index 00000000000..bdf7ad799a5
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/9657m1fpeclidkpn8g2h38594pht9jsq differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/9hrkb1viqhe9iplh2b623i4g358tcn16 b/bats/helper/testdata/20200225/.dolt/noms/9hrkb1viqhe9iplh2b623i4g358tcn16
new file mode 100644
index 00000000000..7e9117c1cde
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/9hrkb1viqhe9iplh2b623i4g358tcn16 differ
diff --git a/bats/helper/testdata/20200218/.dolt/noms/LOCK b/bats/helper/testdata/20200225/.dolt/noms/LOCK
similarity index 100%
rename from bats/helper/testdata/20200218/.dolt/noms/LOCK
rename to bats/helper/testdata/20200225/.dolt/noms/LOCK
diff --git a/bats/helper/testdata/20200225/.dolt/noms/a4ofkmekn2f0ih23dmqg9klvhr7caje8 b/bats/helper/testdata/20200225/.dolt/noms/a4ofkmekn2f0ih23dmqg9klvhr7caje8
new file mode 100644
index 00000000000..a4056a3262c
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/a4ofkmekn2f0ih23dmqg9klvhr7caje8 differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/cae69p9bv9qgk8gnmcetcrq6pb337bur b/bats/helper/testdata/20200225/.dolt/noms/cae69p9bv9qgk8gnmcetcrq6pb337bur
new file mode 100644
index 00000000000..24d2337cfe2
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/cae69p9bv9qgk8gnmcetcrq6pb337bur differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/cvk1s81mdeof0rnedr8vmk4f3qh91r2a b/bats/helper/testdata/20200225/.dolt/noms/cvk1s81mdeof0rnedr8vmk4f3qh91r2a
new file mode 100644
index 00000000000..7cb32a497a3
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/cvk1s81mdeof0rnedr8vmk4f3qh91r2a differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/fi3vd71upeqgs7ffmc198536l2ah2nem b/bats/helper/testdata/20200225/.dolt/noms/fi3vd71upeqgs7ffmc198536l2ah2nem
new file mode 100644
index 00000000000..36571d4ea96
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/fi3vd71upeqgs7ffmc198536l2ah2nem differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/fjfk34olm8dg9f3l7u7sqk259allkpbq b/bats/helper/testdata/20200225/.dolt/noms/fjfk34olm8dg9f3l7u7sqk259allkpbq
new file mode 100644
index 00000000000..19ee3dcab6b
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/fjfk34olm8dg9f3l7u7sqk259allkpbq differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/fvv6ab1mar3engqa8aunlous38m1pbtd b/bats/helper/testdata/20200225/.dolt/noms/fvv6ab1mar3engqa8aunlous38m1pbtd
new file mode 100644
index 00000000000..f9ba3179570
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/fvv6ab1mar3engqa8aunlous38m1pbtd differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/g1k00sceog5vkmf454dpcf5prg458vrh b/bats/helper/testdata/20200225/.dolt/noms/g1k00sceog5vkmf454dpcf5prg458vrh
new file mode 100644
index 00000000000..418f0ac7ab9
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/g1k00sceog5vkmf454dpcf5prg458vrh differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/g3n9nvmfponntake5r368lnlljmbidke b/bats/helper/testdata/20200225/.dolt/noms/g3n9nvmfponntake5r368lnlljmbidke
new file mode 100644
index 00000000000..1bf86bda64e
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/g3n9nvmfponntake5r368lnlljmbidke differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/gi9e8nmhav58f4vukca2vc2cd87u09af b/bats/helper/testdata/20200225/.dolt/noms/gi9e8nmhav58f4vukca2vc2cd87u09af
new file mode 100644
index 00000000000..38876299d46
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/gi9e8nmhav58f4vukca2vc2cd87u09af differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/h16g5dvp5vkq837snpa8760ac8lhl4ad b/bats/helper/testdata/20200225/.dolt/noms/h16g5dvp5vkq837snpa8760ac8lhl4ad
new file mode 100644
index 00000000000..dabe01bfd64
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/h16g5dvp5vkq837snpa8760ac8lhl4ad differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/h463bia4dpvciqkm76vfj5qr4ed0l6k1 b/bats/helper/testdata/20200225/.dolt/noms/h463bia4dpvciqkm76vfj5qr4ed0l6k1
new file mode 100644
index 00000000000..b6848734a5f
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/h463bia4dpvciqkm76vfj5qr4ed0l6k1 differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/jff26llmtmj7ap2rtlc4g7v42bfmg8a7 b/bats/helper/testdata/20200225/.dolt/noms/jff26llmtmj7ap2rtlc4g7v42bfmg8a7
new file mode 100644
index 00000000000..b8205f5b074
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/jff26llmtmj7ap2rtlc4g7v42bfmg8a7 differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/jqt5s1qs2g998ugg538u8l7c706it2cb b/bats/helper/testdata/20200225/.dolt/noms/jqt5s1qs2g998ugg538u8l7c706it2cb
new file mode 100644
index 00000000000..a950ed902cb
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/jqt5s1qs2g998ugg538u8l7c706it2cb differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/lci84t6s7j5r171qn02dlr7aqns6549e b/bats/helper/testdata/20200225/.dolt/noms/lci84t6s7j5r171qn02dlr7aqns6549e
new file mode 100644
index 00000000000..54a9af2d54d
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/lci84t6s7j5r171qn02dlr7aqns6549e differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/manifest b/bats/helper/testdata/20200225/.dolt/noms/manifest
new file mode 100644
index 00000000000..89b3c9970cd
--- /dev/null
+++ b/bats/helper/testdata/20200225/.dolt/noms/manifest
@@ -0,0 +1 @@
+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/bats/helper/testdata/20200225/.dolt/noms/n49314e2mcvrf6fi2g6s1s3dkv87e4i0 b/bats/helper/testdata/20200225/.dolt/noms/n49314e2mcvrf6fi2g6s1s3dkv87e4i0
new file mode 100644
index 00000000000..70a40725bde
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/n49314e2mcvrf6fi2g6s1s3dkv87e4i0 differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/p3u6rb5hpkc8dcqfvlq3ptr2a0rsodu2 b/bats/helper/testdata/20200225/.dolt/noms/p3u6rb5hpkc8dcqfvlq3ptr2a0rsodu2
new file mode 100644
index 00000000000..e387312ac1a
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/p3u6rb5hpkc8dcqfvlq3ptr2a0rsodu2 differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/psdvh71n9e069pl01nkcg5aijos7k891 b/bats/helper/testdata/20200225/.dolt/noms/psdvh71n9e069pl01nkcg5aijos7k891
new file mode 100644
index 00000000000..76a7157d8be
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/psdvh71n9e069pl01nkcg5aijos7k891 differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/rd6kqkaclph8l93js1f2h00pna5uuqif b/bats/helper/testdata/20200225/.dolt/noms/rd6kqkaclph8l93js1f2h00pna5uuqif
new file mode 100644
index 00000000000..c9d71e58669
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/rd6kqkaclph8l93js1f2h00pna5uuqif differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/refbbl8digdrdb0mhrfk6a0mkuhb0ran b/bats/helper/testdata/20200225/.dolt/noms/refbbl8digdrdb0mhrfk6a0mkuhb0ran
new file mode 100644
index 00000000000..fdb7428acc4
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/refbbl8digdrdb0mhrfk6a0mkuhb0ran differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/sfa54kk9itpahbnapbf56d6vue2b6iko b/bats/helper/testdata/20200225/.dolt/noms/sfa54kk9itpahbnapbf56d6vue2b6iko
new file mode 100644
index 00000000000..62de1f285ce
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/sfa54kk9itpahbnapbf56d6vue2b6iko differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/t9virrnc5olckgn23ok6cnak68ld8a29 b/bats/helper/testdata/20200225/.dolt/noms/t9virrnc5olckgn23ok6cnak68ld8a29
new file mode 100644
index 00000000000..3105a1fa317
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/t9virrnc5olckgn23ok6cnak68ld8a29 differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/u025c384nohd013tjaeq6c1vn6cj1v9r b/bats/helper/testdata/20200225/.dolt/noms/u025c384nohd013tjaeq6c1vn6cj1v9r
new file mode 100644
index 00000000000..ffbf6eeb6a4
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/u025c384nohd013tjaeq6c1vn6cj1v9r differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/vcgoj8o1malsol4avn930tpngsd4094u b/bats/helper/testdata/20200225/.dolt/noms/vcgoj8o1malsol4avn930tpngsd4094u
new file mode 100644
index 00000000000..269234f0384
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/vcgoj8o1malsol4avn930tpngsd4094u differ
diff --git a/bats/helper/testdata/20200225/.dolt/noms/vfm8fpknt3arl9rn73mh1nn0sk46olmo b/bats/helper/testdata/20200225/.dolt/noms/vfm8fpknt3arl9rn73mh1nn0sk46olmo
new file mode 100644
index 00000000000..c2220676c17
Binary files /dev/null and b/bats/helper/testdata/20200225/.dolt/noms/vfm8fpknt3arl9rn73mh1nn0sk46olmo differ
diff --git a/bats/helper/testdata/20200225/.dolt/repo_state.json b/bats/helper/testdata/20200225/.dolt/repo_state.json
new file mode 100755
index 00000000000..d3861ededf5
--- /dev/null
+++ b/bats/helper/testdata/20200225/.dolt/repo_state.json
@@ -0,0 +1,8 @@
+{
+  "head": "refs/heads/master",
+  "staged": "7pkje2od877vsvi4ueaab27f0vr2alar",
+  "working": "7pkje2od877vsvi4ueaab27f0vr2alar",
+  "merge": null,
+  "remotes": {},
+  "branches": {}
+}
\ No newline at end of file
diff --git a/bats/helper/testdata/20200225/LICENSE.md b/bats/helper/testdata/20200225/LICENSE.md
new file mode 100755
index 00000000000..f1d7767a108
--- /dev/null
+++ b/bats/helper/testdata/20200225/LICENSE.md
@@ -0,0 +1 @@
+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/bats/helper/testdata/20200225/README.md b/bats/helper/testdata/20200225/README.md
new file mode 100755
index 00000000000..c9ee875eab4
--- /dev/null
+++ b/bats/helper/testdata/20200225/README.md
@@ -0,0 +1 @@
+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/bats/helper/testdata/new_repo.sh b/bats/helper/testdata/new_repo.sh
new file mode 100644
index 00000000000..10f9831e33a
--- /dev/null
+++ b/bats/helper/testdata/new_repo.sh
@@ -0,0 +1,21 @@
+#!/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/go/libraries/doltcore/schema/encoding/schema_marshaling.go b/go/libraries/doltcore/schema/encoding/schema_marshaling.go
index 49413ca92f0..0c8ad2a9af0 100644
--- a/go/libraries/doltcore/schema/encoding/schema_marshaling.go
+++ b/go/libraries/doltcore/schema/encoding/schema_marshaling.go
@@ -25,6 +25,13 @@ import (
 	"github.com/liquidata-inc/dolt/go/store/types"
 )
 
+// Correct Marshalling & Unmarshalling is essential to compatibility across Dolt versions
+// any changes to the fields of Schema or other persisted objects must be append only, no
+// fields can ever be removed without breaking compatibility.
+//
+// the marshalling annotations of new fields must have the "omitempty" option to allow newer
+// versions of Dolt to read objects serialized by older Dolt versions where the field did not
+// yet exists. However, all fields must always be written.
 type encodedColumn struct {
 	Tag uint64 `noms:"tag" json:"tag"`
 
@@ -32,13 +39,15 @@ type encodedColumn struct {
 	Name string `noms:"name" json:"name"`
 
 	// Kind is the type of the field.  See types/noms_kind.go in the liquidata fork for valid values
-	Kind string `noms:"kind,omitempty" json:"kind,omitempty"`
+	Kind string `noms:"kind" json:"kind"`
 
 	IsPartOfPK bool `noms:"is_part_of_pk" json:"is_part_of_pk"`
 
 	TypeInfo encodedTypeInfo `noms:"typeinfo,omitempty" json:"typeinfo,omitempty"`
 
 	Constraints []encodedConstraint `noms:"col_constraints" json:"col_constraints"`
+
+	// NB: all new fields must have the 'omitempty' annotation. See comment above
 }
 
 func encodeAllColConstraints(constraints []schema.ColConstraint) []encodedConstraint {
@@ -70,10 +79,11 @@ func encodeColumn(col schema.Column) encodedColumn {
 	return encodedColumn{
 		col.Tag,
 		col.Name,
-		"",
+		col.KindString(),
 		col.IsPartOfPK,
 		encodeTypeInfo(col.TypeInfo),
-		encodeAllColConstraints(col.Constraints)}
+		encodeAllColConstraints(col.Constraints),
+	}
 }
 
 func (nfd encodedColumn) decodeColumn() (schema.Column, error) {
diff --git a/go/libraries/doltcore/schema/encoding/schema_marshaling_test.go b/go/libraries/doltcore/schema/encoding/schema_marshaling_test.go
index d2868591410..a3d232bb504 100644
--- a/go/libraries/doltcore/schema/encoding/schema_marshaling_test.go
+++ b/go/libraries/doltcore/schema/encoding/schema_marshaling_test.go
@@ -16,6 +16,7 @@ package encoding
 
 import (
 	"context"
+	"errors"
 	"reflect"
 	"testing"
 
@@ -28,6 +29,7 @@ import (
 	"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema"
 	"github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo"
 	"github.com/liquidata-inc/dolt/go/store/constants"
+	"github.com/liquidata-inc/dolt/go/store/marshal"
 	"github.com/liquidata-inc/dolt/go/store/types"
 )
 
@@ -68,6 +70,16 @@ func TestNomsMarshalling(t *testing.T) {
 	if !reflect.DeepEqual(tSchema, unMarshalled) {
 		t.Error("Value different after marshalling and unmarshalling.")
 	}
+
+	validated, err := validateUnmarshaledNomsValue(context.Background(), types.Format_7_18, val)
+
+	if err != nil {
+		t.Fatal("Failed compatibility test. Schema could not be unmarshalled with mirror type")
+	}
+
+	if !reflect.DeepEqual(tSchema, validated) {
+		t.Error("Value different after marshalling and unmarshalling.")
+	}
 }
 
 func TestJSONMarshalling(t *testing.T) {
@@ -162,3 +174,86 @@ func TestTypeInfoMarshalling(t *testing.T) {
 		})
 	}
 }
+
+func validateUnmarshaledNomsValue(ctx context.Context, nbf *types.NomsBinFormat, schemaVal types.Value) (schema.Schema, error) {
+	var sd testSchemaData
+	err := marshal.Unmarshal(ctx, nbf, schemaVal, &sd)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return sd.decodeSchema()
+}
+
+func TestMirroredTypes(t *testing.T) {
+	realType := reflect.ValueOf(&encodedColumn{}).Elem()
+	mirrorType := reflect.ValueOf(&testEncodedColumn{}).Elem()
+	require.Equal(t, mirrorType.NumField(), realType.NumField())
+
+	// TODO: create reflection tests to ensure that:
+	// - no fields in testEncodeColumn have the 'omitempty' annotation
+	// - no legacy fields in encodeColumn have the 'omitempty' annotation (with whitelist)
+	// - all new fields in encodeColumn have the 'omitempty' annotation
+}
+
+// testEncodedColumn is a mirror type of encodedColumn that helps ensure compatibility between Dolt versions
+//
+// Fields in this test struct should be added WITHOUT the "omitempty" annotation in order to guarantee that
+// all fields in encodeColumn are always being written when encodedColumn is serialized.
+// See the comment above type encodeColumn.
+type testEncodedColumn struct {
+	Tag uint64 `noms:"tag" json:"tag"`
+
+	Name string `noms:"name" json:"name"`
+
+	Kind string `noms:"kind" json:"kind"`
+
+	IsPartOfPK bool `noms:"is_part_of_pk" json:"is_part_of_pk"`
+
+	TypeInfo encodedTypeInfo `noms:"typeinfo" json:"typeinfo"`
+
+	Constraints []encodedConstraint `noms:"col_constraints" json:"col_constraints"`
+}
+
+type testSchemaData struct {
+	Columns []testEncodedColumn `noms:"columns" json:"columns"`
+}
+
+func (tec testEncodedColumn) decodeColumn() (schema.Column, error) {
+	var typeInfo typeinfo.TypeInfo
+	var err error
+	if tec.TypeInfo.Type != "" {
+		typeInfo, err = tec.TypeInfo.decodeTypeInfo()
+		if err != nil {
+			return schema.Column{}, err
+		}
+	} else if tec.Kind != "" {
+		typeInfo = typeinfo.FromKind(schema.LwrStrToKind[tec.Kind])
+	} else {
+		return schema.Column{}, errors.New("cannot decode column due to unknown schema format")
+	}
+	colConstraints := decodeAllColConstraint(tec.Constraints)
+	return schema.NewColumnWithTypeInfo(tec.Name, tec.Tag, typeInfo, tec.IsPartOfPK, colConstraints...)
+}
+
+func (tsd testSchemaData) decodeSchema() (schema.Schema, error) {
+	numCols := len(tsd.Columns)
+	cols := make([]schema.Column, numCols)
+
+	var err error
+	for i, col := range tsd.Columns {
+		cols[i], err = col.decodeColumn()
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	colColl, err := schema.NewColCollection(cols...)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return schema.SchemaFromCols(colColl), nil
+}