From 4fba85a8c0dea2b349bbcc9a37e71e83da5d5d08 Mon Sep 17 00:00:00 2001
From: Andy Arthur <andy@liquidata.co>
Date: Mon, 23 Mar 2020 07:25:54 -0700
Subject: [PATCH] updated bats tests with PR feedback

---
 bats/conflict-detection.bats                  | 202 ++++++++---------
 bats/create-tables.bats                       | 212 +++++++++---------
 bats/diff.bats                                |  24 +-
 .../1pksupportedtypes/create_table.sql        |  14 +-
 bats/multiple-tables.bats                     |  48 ++--
 bats/query-catalog.bats                       |  26 +--
 bats/sql.bats                                 |  26 +--
 7 files changed, 276 insertions(+), 276 deletions(-)

diff --git a/bats/conflict-detection.bats b/bats/conflict-detection.bats
index 97211f0b60..b8deb80939 100644
--- a/bats/conflict-detection.bats
+++ b/bats/conflict-detection.bats
@@ -19,12 +19,12 @@ teardown() {
 @test "cannot merge into dirty working table" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -60,12 +60,12 @@ SQL
 @test "two branches modify different cell different row. merge. no conflict" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -96,12 +96,12 @@ SQL
 @test "two branches modify different cell same row. merge. no conflict" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -131,12 +131,12 @@ SQL
 @test "two branches modify same cell. merge. conflict" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -163,12 +163,12 @@ SQL
 @test "two branches add a different row. merge. no conflict" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -194,12 +194,12 @@ SQL
 @test "two branches add same row. merge. no conflict" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -223,12 +223,12 @@ SQL
 @test "one branch add table, other modifies table. merge. no conflict" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -241,12 +241,12 @@ SQL
     dolt checkout add-table
     dolt sql <<SQL
 CREATE TABLE test2 (
-  pk BIGINT NOT NULL COMMENT 'tag:10',
-  c1 BIGINT COMMENT 'tag:11',
-  c2 BIGINT COMMENT 'tag:12',
-  c3 BIGINT COMMENT 'tag:13',
-  c4 BIGINT COMMENT 'tag:14',
-  c5 BIGINT COMMENT 'tag:15',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -264,12 +264,12 @@ SQL
 @test "two branches add same column. merge. no conflict" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -293,12 +293,12 @@ SQL
 @test "two branches add different column. merge. no conflict" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -357,12 +357,12 @@ SQL
 @test "two branches delete same column. merge. no conflict" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -428,12 +428,12 @@ SQL
 @test "two branches rename same column to same name. merge. no conflict" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -457,12 +457,12 @@ SQL
 @test "two branches rename same column to different name. merge. conflict" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -488,12 +488,12 @@ SQL
 @test "two branches rename different column to same name. merge. conflict" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -790,12 +790,12 @@ SQL
     dolt checkout table1
     dolt sql <<SQL
 CREATE TABLE table1 (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -804,13 +804,13 @@ SQL
     dolt checkout table2
     dolt sql <<SQL
 CREATE TABLE table2 (
-  pk1 BIGINT NOT NULL COMMENT 'tag:0',
-  pk2 BIGINT NOT NULL COMMENT 'tag:1',
-  c1 BIGINT COMMENT 'tag:2',
-  c2 BIGINT COMMENT 'tag:3',
-  c3 BIGINT COMMENT 'tag:4',
-  c4 BIGINT COMMENT 'tag:5',
-  c5 BIGINT COMMENT 'tag:6',
+  pk1 BIGINT NOT NULL,
+  pk2 BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk1,pk2)
 );
 SQL
@@ -829,10 +829,10 @@ SQL
 @test "two branches drop different tables. merge. no conflict" {
   dolt sql <<SQL
 CREATE TABLE foo (
-  pk BIGINT NOT NULL PRIMARY KEY COMMENT 'tag:0'
+  pk BIGINT NOT NULL PRIMARY KEY
 );
 CREATE TABLE bar (
-  pk BIGINT NOT NULL PRIMARY KEY COMMENT 'tag:1'
+  pk BIGINT NOT NULL PRIMARY KEY
 );
 SQL
     dolt add .
@@ -860,10 +860,10 @@ SQL
 @test "two branch rename different tables. merge. no conflict" {
     dolt sql <<SQL
 CREATE TABLE foo (
-  pk BIGINT NOT NULL PRIMARY KEY COMMENT 'tag:0'
+  pk BIGINT NOT NULL PRIMARY KEY
 );
 CREATE TABLE bar (
-  pk BIGINT NOT NULL PRIMARY KEY COMMENT 'tag:1'
+  pk BIGINT NOT NULL PRIMARY KEY
 );
 SQL
     dolt add .
diff --git a/bats/create-tables.bats b/bats/create-tables.bats
index ca5e59ec76..a9800d0b29 100755
--- a/bats/create-tables.bats
+++ b/bats/create-tables.bats
@@ -12,12 +12,12 @@ teardown() {
 @test "create a single primary key table" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -29,13 +29,13 @@ SQL
 @test "create a two primary key table" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk1 BIGINT NOT NULL COMMENT 'tag:0',
-  pk2 BIGINT NOT NULL COMMENT 'tag:1',
-  c1 BIGINT COMMENT 'tag:2',
-  c2 BIGINT COMMENT 'tag:3',
-  c3 BIGINT COMMENT 'tag:4',
-  c4 BIGINT COMMENT 'tag:5',
-  c5 BIGINT COMMENT 'tag:6',
+  pk1 BIGINT NOT NULL,
+  pk2 BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk1,pk2)
 );
 SQL
@@ -47,13 +47,13 @@ SQL
 @test "create a table that uses all supported types" {
     dolt sql <<SQL
 CREATE TABLE test (
-  \`pk\` BIGINT NOT NULL COMMENT 'tag:0',
-  \`int\` BIGINT COMMENT 'tag:1',
-  \`string\` LONGTEXT COMMENT 'tag:2',
-  \`boolean\` BOOLEAN COMMENT 'tag:3',
-  \`float\` DOUBLE COMMENT 'tag:4',
-  \`uint\` BIGINT UNSIGNED COMMENT 'tag:5',
-  \`uuid\` CHAR(36) CHARACTER SET ascii COLLATE ascii_bin COMMENT 'tag:6',
+  \`pk\` BIGINT NOT NULL,
+  \`int\` BIGINT,
+  \`string\` LONGTEXT,
+  \`boolean\` BOOLEAN,
+  \`float\` DOUBLE,
+  \`uint\` BIGINT UNSIGNED,
+  \`uuid\` CHAR(36) CHARACTER SET ascii COLLATE ascii_bin,
   PRIMARY KEY (pk)
 );
 SQL
@@ -65,15 +65,15 @@ SQL
 @test "create a table that uses unsupported poop type" {
     run dolt sql <<SQL
 CREATE TABLE test (
-  \`pk\` BIGINT NOT NULL COMMENT 'tag:0',
-  \`int\` BIGINT COMMENT 'tag:1',
-  \`string\` LONGTEXT COMMENT 'tag:2',
-  \`boolean\` BOOLEAN COMMENT 'tag:3',
-  \`float\` DOUBLE COMMENT 'tag:4',
-  \`uint\` BIGINT UNSIGNED COMMENT 'tag:5',
-  \`uuid\` CHAR(36) CHARACTER SET ascii COLLATE ascii_bin COMMENT 'tag:6',
-  \`blob\` LONGBLOB COMMENT 'tag:7',
-  \`poop\` POOP COMMENT 'tag:8',
+  \`pk\` BIGINT NOT NULL,
+  \`int\` BIGINT,
+  \`string\` LONGTEXT,
+  \`boolean\` BOOLEAN,
+  \`float\` DOUBLE,
+  \`uint\` BIGINT UNSIGNED,
+  \`uuid\` CHAR(36) CHARACTER SET ascii COLLATE ascii_bin,
+  \`blob\` LONGBLOB,
+  \`poop\` POOP,
   PRIMARY KEY (pk)
 );
 SQL
@@ -83,24 +83,24 @@ SQL
 @test "create a repo with two tables" {
     dolt sql <<SQL
 CREATE TABLE test1 (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
     dolt sql <<SQL
 CREATE TABLE test2 (
-  pk1 BIGINT NOT NULL COMMENT 'tag:10',
-  pk2 BIGINT NOT NULL COMMENT 'tag:11',
-  c1 BIGINT COMMENT 'tag:12',
-  c2 BIGINT COMMENT 'tag:13',
-  c3 BIGINT COMMENT 'tag:14',
-  c4 BIGINT COMMENT 'tag:15',
-  c5 BIGINT COMMENT 'tag:16',
+  pk1 BIGINT NOT NULL,
+  pk2 BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk1,pk2)
 );
 SQL
@@ -237,23 +237,23 @@ SQL
 @test "create two table with the same name" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
     run dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -316,12 +316,12 @@ SQL
 @test "create a basic table (int types) using sql" {
     run dolt sql <<SQL
 CREATE TABLE test (
-    pk BIGINT COMMENT 'tag:0',
-    c1 BIGINT COMMENT 'tag:1',
-    c2 BIGINT COMMENT 'tag:2',
-    c3 BIGINT COMMENT 'tag:3',
-    c4 BIGINT COMMENT 'tag:4',
-    c5 BIGINT COMMENT 'tag:5',
+    pk BIGINT,
+    c1 BIGINT,
+    c2 BIGINT,
+    c3 BIGINT,
+    c4 BIGINT,
+    c5 BIGINT,
     PRIMARY KEY (pk)
 );
 SQL
@@ -332,25 +332,25 @@ SQL
     run dolt schema show
     [ "$status" -eq 0 ]
     [[ "$output" =~ "CREATE TABLE \`test\`" ]] || false
-    [[ "$output" =~ "\`pk\` BIGINT NOT NULL COMMENT 'tag:0'" ]] || false
-    [[ "$output" =~ "\`c1\` BIGINT COMMENT 'tag:1'" ]] || false
-    [[ "$output" =~ "\`c2\` BIGINT COMMENT 'tag:2'" ]] || false
-    [[ "$output" =~ "\`c3\` BIGINT COMMENT 'tag:3'" ]] || false
-    [[ "$output" =~ "\`c4\` BIGINT COMMENT 'tag:4'" ]] || false
-    [[ "$output" =~ "\`c5\` BIGINT COMMENT 'tag:5'" ]] || false
+    [[ "$output" =~ "\`pk\` BIGINT NOT NULL" ]] || false
+    [[ "$output" =~ "\`c1\` BIGINT" ]] || false
+    [[ "$output" =~ "\`c2\` BIGINT" ]] || false
+    [[ "$output" =~ "\`c3\` BIGINT" ]] || false
+    [[ "$output" =~ "\`c4\` BIGINT" ]] || false
+    [[ "$output" =~ "\`c5\` BIGINT" ]] || false
     [[ "$output" =~ "PRIMARY KEY (\`pk\`)" ]] || false
 }
 
 @test "create a table with sql with multiple primary keys" {
     run dolt sql <<SQL
 CREATE TABLE test (
-    pk1 BIGINT COMMENT 'tag:0',
-    pk2 BIGINT COMMENT 'tag:1',
-    c1 BIGINT COMMENT 'tag:2',
-    c2 BIGINT COMMENT 'tag:3',
-    c3 BIGINT COMMENT 'tag:4',
-    c4 BIGINT COMMENT 'tag:5',
-    c5 BIGINT COMMENT 'tag:6',
+    pk1 BIGINT,
+    pk2 BIGINT,
+    c1 BIGINT,
+    c2 BIGINT,
+    c3 BIGINT,
+    c4 BIGINT,
+    c5 BIGINT,
     PRIMARY KEY (pk1),
     PRIMARY KEY (pk2)
 );
@@ -359,25 +359,25 @@ SQL
     run dolt schema show
     [ "$status" -eq 0 ]
     [[ "$output" =~ "CREATE TABLE \`test\`" ]] || false
-    [[ "$output" =~ "\`pk1\` BIGINT NOT NULL COMMENT 'tag:0'" ]] || false
-    [[ "$output" =~ "\`pk2\` BIGINT NOT NULL COMMENT 'tag:1'" ]] || false
-    [[ "$output" =~ "\`c1\` BIGINT COMMENT 'tag:2'" ]] || false
-    [[ "$output" =~ "\`c2\` BIGINT COMMENT 'tag:3'" ]] || false
-    [[ "$output" =~ "\`c3\` BIGINT COMMENT 'tag:4'" ]] || false
-    [[ "$output" =~ "\`c4\` BIGINT COMMENT 'tag:5'" ]] || false
-    [[ "$output" =~ "\`c5\` BIGINT COMMENT 'tag:6'" ]] || false
+    [[ "$output" =~ "\`pk1\` BIGINT NOT NULL" ]] || false
+    [[ "$output" =~ "\`pk2\` BIGINT NOT NULL" ]] || false
+    [[ "$output" =~ "\`c1\` BIGINT" ]] || false
+    [[ "$output" =~ "\`c2\` BIGINT" ]] || false
+    [[ "$output" =~ "\`c3\` BIGINT" ]] || false
+    [[ "$output" =~ "\`c4\` BIGINT" ]] || false
+    [[ "$output" =~ "\`c5\` BIGINT" ]] || false
     [[ "$output" =~ "PRIMARY KEY (\`pk1\`,\`pk2\`)" ]] || false
 }
 
 @test "create a table using sql with not null constraint" {
     run dolt sql <<SQL
 CREATE TABLE test (
-    pk BIGINT NOT NULL COMMENT 'tag:0',
-    c1 BIGINT COMMENT 'tag:1',
-    c2 BIGINT COMMENT 'tag:2',
-    c3 BIGINT COMMENT 'tag:3',
-    c4 BIGINT COMMENT 'tag:4',
-    c5 BIGINT COMMENT 'tag:5',
+    pk BIGINT NOT NULL,
+    c1 BIGINT,
+    c2 BIGINT,
+    c3 BIGINT,
+    c4 BIGINT,
+    c5 BIGINT,
     PRIMARY KEY (pk)
 );
 SQL
@@ -385,20 +385,20 @@ SQL
     run dolt schema show test
     [ "$status" -eq 0 ]
     [[ "$output" =~ "CREATE TABLE \`test\`" ]] || false
-    [[ "$output" =~ "\`pk\` BIGINT NOT NULL COMMENT 'tag:0'" ]] || false
-    [[ "$output" =~ "\`c1\` BIGINT COMMENT 'tag:1'" ]] || false
-    [[ "$output" =~ "\`c2\` BIGINT COMMENT 'tag:2'" ]] || false
-    [[ "$output" =~ "\`c3\` BIGINT COMMENT 'tag:3'" ]] || false
-    [[ "$output" =~ "\`c4\` BIGINT COMMENT 'tag:4'" ]] || false
-    [[ "$output" =~ "\`c5\` BIGINT COMMENT 'tag:5'" ]] || false
+    [[ "$output" =~ "\`pk\` BIGINT NOT NULL" ]] || false
+    [[ "$output" =~ "\`c1\` BIGINT" ]] || false
+    [[ "$output" =~ "\`c2\` BIGINT" ]] || false
+    [[ "$output" =~ "\`c3\` BIGINT" ]] || false
+    [[ "$output" =~ "\`c4\` BIGINT" ]] || false
+    [[ "$output" =~ "\`c5\` BIGINT" ]] || false
     [[ "$output" =~ "PRIMARY KEY (\`pk\`)" ]] || false
 }
 
 @test "create a table using sql with a float" {
     run dolt sql <<SQL
 CREATE TABLE test (
-    pk BIGINT NOT NULL COMMENT 'tag:0',
-    c1 DOUBLE COMMENT 'tag:1',
+    pk BIGINT NOT NULL,
+    c1 DOUBLE,
     PRIMARY KEY (pk)
 );
 SQL
@@ -406,8 +406,8 @@ SQL
     run dolt schema show test
     [ "$status" -eq 0 ]
     [[ "$output" =~ "CREATE TABLE \`test\` " ]] || false
-    [[ "$output" =~ "\`pk\` BIGINT NOT NULL COMMENT 'tag:0'" ]] || false
-    [[ "$output" =~ "\`c1\` DOUBLE COMMENT 'tag:1'" ]] || false
+    [[ "$output" =~ "\`pk\` BIGINT NOT NULL" ]] || false
+    [[ "$output" =~ "\`c1\` DOUBLE" ]] || false
     [[ "$output" =~ "PRIMARY KEY (\`pk\`)" ]] || false
 }
 
@@ -415,8 +415,8 @@ SQL
 @test "create a table using sql with a string" {
     run dolt sql <<SQL
 CREATE TABLE test (
-    pk BIGINT NOT NULL COMMENT 'tag:0',
-    c1 LONGTEXT COMMENT 'tag:1',
+    pk BIGINT NOT NULL,
+    c1 LONGTEXT,
     PRIMARY KEY (pk)
 );
 SQL
@@ -424,8 +424,8 @@ SQL
     run dolt schema show test
     [ "$status" -eq 0 ]
     [[ "$output" =~ "CREATE TABLE \`test\`" ]] || false
-    [[ "$output" =~ "\`pk\` BIGINT NOT NULL COMMENT 'tag:0'" ]] || false
-    [[ "$output" =~ "\`c1\` LONGTEXT COMMENT 'tag:1'" ]] || false
+    [[ "$output" =~ "\`pk\` BIGINT NOT NULL" ]] || false
+    [[ "$output" =~ "\`c1\` LONGTEXT" ]] || false
     [[ "$output" =~ "PRIMARY KEY (\`pk\`)" ]] || false
 }
 
@@ -461,12 +461,12 @@ SQL
 @test "dolt diff on a newly created table" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
diff --git a/bats/diff.bats b/bats/diff.bats
index 3384178da3..6ebc2dc77a 100644
--- a/bats/diff.bats
+++ b/bats/diff.bats
@@ -158,12 +158,12 @@ SQL
 @test "diff summary gets summaries for all tables with changes" {
     dolt sql <<SQL
 CREATE TABLE test (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -171,12 +171,12 @@ SQL
     dolt sql -q "insert into test values (1, 1, 1, 1, 1, 1)"
     dolt sql <<SQL
 CREATE TABLE employees (
-  \`id\` LONGTEXT NOT NULL COMMENT 'tag:10',
-  \`first name\` LONGTEXT COMMENT 'tag:11',
-  \`last name\` LONGTEXT COMMENT 'tag:12',
-  \`title\` LONGTEXT COMMENT 'tag:13',
-  \`start date\` LONGTEXT COMMENT 'tag:14',
-  \`end date\` LONGTEXT COMMENT 'tag:15',
+  \`id\` LONGTEXT NOT NULL,
+  \`first name\` LONGTEXT,
+  \`last name\` LONGTEXT,
+  \`title\` LONGTEXT,
+  \`start date\` LONGTEXT,
+  \`end date\` LONGTEXT,
   PRIMARY KEY (id)
 );
 SQL
diff --git a/bats/helper/queries/1pksupportedtypes/create_table.sql b/bats/helper/queries/1pksupportedtypes/create_table.sql
index 81c9ba6e95..87b495e3d5 100644
--- a/bats/helper/queries/1pksupportedtypes/create_table.sql
+++ b/bats/helper/queries/1pksupportedtypes/create_table.sql
@@ -1,10 +1,10 @@
 CREATE TABLE `newtable`(
-    `pk` BIGINT NOT NULL COMMENT 'tag:10',
-    `int` BIGINT COMMENT 'tag:11',
-    `string` LONGTEXT COMMENT 'tag:12',
-    `boolean` BOOLEAN COMMENT 'tag:13',
-    `float` DOUBLE COMMENT 'tag:14',
-    `uint` BIGINT UNSIGNED COMMENT 'tag:15',
-    `uuid` LONGTEXT COMMENT 'tag:16',
+    `pk` BIGINT NOT NULL,
+    `int` BIGINT,
+    `string` LONGTEXT,
+    `boolean` BOOLEAN,
+    `float` DOUBLE,
+    `uint` BIGINT UNSIGNED,
+    `uuid` LONGTEXT,
     PRIMARY KEY (`pk`)
 );
diff --git a/bats/multiple-tables.bats b/bats/multiple-tables.bats
index de718ec7db..47706b71e9 100755
--- a/bats/multiple-tables.bats
+++ b/bats/multiple-tables.bats
@@ -5,23 +5,23 @@ setup() {
     setup_common
     dolt sql <<SQL
 CREATE TABLE test1 (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
     dolt sql <<SQL
 CREATE TABLE test2 (
-  pk BIGINT NOT NULL COMMENT 'tag:10',
-  c1 BIGINT COMMENT 'tag:11',
-  c2 BIGINT COMMENT 'tag:12',
-  c3 BIGINT COMMENT 'tag:13',
-  c4 BIGINT COMMENT 'tag:14',
-  c5 BIGINT COMMENT 'tag:15',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
@@ -135,23 +135,23 @@ teardown() {
 
     dolt sql <<SQL
 CREATE TABLE test3 (
-  pk BIGINT NOT NULL COMMENT 'tag:20',
-  c1 BIGINT COMMENT 'tag:21',
-  c2 BIGINT COMMENT 'tag:22',
-  c3 BIGINT COMMENT 'tag:23',
-  c4 BIGINT COMMENT 'tag:24',
-  c5 BIGINT COMMENT 'tag:25',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
     dolt sql <<SQL
 CREATE TABLE test4 (
-  pk BIGINT NOT NULL COMMENT 'tag:30',
-  c1 BIGINT COMMENT 'tag:31',
-  c2 BIGINT COMMENT 'tag:32',
-  c3 BIGINT COMMENT 'tag:33',
-  c4 BIGINT COMMENT 'tag:34',
-  c5 BIGINT COMMENT 'tag:35',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
diff --git a/bats/query-catalog.bats b/bats/query-catalog.bats
index 35139d165a..af1b362381 100644
--- a/bats/query-catalog.bats
+++ b/bats/query-catalog.bats
@@ -5,24 +5,24 @@ setup() {
     setup_common
     dolt sql <<SQL
 CREATE TABLE one_pk (
-  pk BIGINT NOT NULL COMMENT 'tag:0',
-  c1 BIGINT COMMENT 'tag:1',
-  c2 BIGINT COMMENT 'tag:2',
-  c3 BIGINT COMMENT 'tag:3',
-  c4 BIGINT COMMENT 'tag:4',
-  c5 BIGINT COMMENT 'tag:5',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
     dolt sql <<SQL
 CREATE TABLE two_pk (
-  pk1 BIGINT NOT NULL COMMENT 'tag:10',
-  pk2 BIGINT NOT NULL COMMENT 'tag:11',
-  c1 BIGINT COMMENT 'tag:12',
-  c2 BIGINT COMMENT 'tag:13',
-  c3 BIGINT COMMENT 'tag:14',
-  c4 BIGINT COMMENT 'tag:15',
-  c5 BIGINT COMMENT 'tag:16',
+  pk1 BIGINT NOT NULL,
+  pk2 BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk1,pk2)
 );
 SQL
diff --git a/bats/sql.bats b/bats/sql.bats
index db47e3ae73..a07720bfea 100755
--- a/bats/sql.bats
+++ b/bats/sql.bats
@@ -5,24 +5,24 @@ setup() {
     setup_common
     dolt sql <<SQL
 CREATE TABLE one_pk (
-  pk BIGINT NOT NULL COMMENT 'tag:10',
-  c1 BIGINT COMMENT 'tag:11',
-  c2 BIGINT COMMENT 'tag:12',
-  c3 BIGINT COMMENT 'tag:13',
-  c4 BIGINT COMMENT 'tag:14',
-  c5 BIGINT COMMENT 'tag:15',
+  pk BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk)
 );
 SQL
     dolt sql <<SQL
 CREATE TABLE two_pk (
-  pk1 BIGINT NOT NULL COMMENT 'tag:20',
-  pk2 BIGINT NOT NULL COMMENT 'tag:21',
-  c1 BIGINT COMMENT 'tag:22',
-  c2 BIGINT COMMENT 'tag:23',
-  c3 BIGINT COMMENT 'tag:24',
-  c4 BIGINT COMMENT 'tag:25',
-  c5 BIGINT COMMENT 'tag:26',
+  pk1 BIGINT NOT NULL,
+  pk2 BIGINT NOT NULL,
+  c1 BIGINT,
+  c2 BIGINT,
+  c3 BIGINT,
+  c4 BIGINT,
+  c5 BIGINT,
   PRIMARY KEY (pk1,pk2)
 );
 SQL