From 178259995b5dcc2e9d9ce7e71227d641703ad7cc Mon Sep 17 00:00:00 2001
From: Daylon Wilkins <daylon@liquidata.co>
Date: Tue, 21 Jun 2022 01:54:36 -0700
Subject: [PATCH] Unskipped bats tests

---
 .../doltcore/table/typed/parquet/writer.go    |  2 +-
 integration-tests/bats/column_tags.bats       |  1 -
 integration-tests/bats/deleted-branches.bats  |  2 +-
 integration-tests/bats/docs.bats              |  5 --
 integration-tests/bats/drop-create.bats       |  1 -
 integration-tests/bats/export-tables.bats     | 15 ++--
 integration-tests/bats/filter-branch.bats     |  1 -
 integration-tests/bats/helper/pytest.py       |  6 --
 .../bats/helper/query-server-common.bash      |  1 -
 integration-tests/bats/merge.bats             |  1 -
 .../bats/remotes-sql-server.bats              | 32 ++++----
 integration-tests/bats/remotes.bats           |  1 -
 integration-tests/bats/replication.bats       |  1 -
 .../bats/sql-check-constraints.bats           |  2 -
 integration-tests/bats/sql-checkout.bats      |  1 -
 integration-tests/bats/sql-client.bats        |  2 +-
 integration-tests/bats/sql-config.bats        |  1 -
 integration-tests/bats/sql-conflicts.bats     |  1 -
 integration-tests/bats/sql-create-tables.bats |  4 -
 integration-tests/bats/sql-merge.bats         |  2 -
 integration-tests/bats/sql-push.bats          |  2 -
 integration-tests/bats/sql-server.bats        | 78 +++++++++----------
 integration-tests/bats/sql-show.bats          |  1 -
 integration-tests/bats/sql.bats               |  1 -
 integration-tests/bats/system-tables.bats     | 13 ++--
 25 files changed, 71 insertions(+), 106 deletions(-)

diff --git a/go/libraries/doltcore/table/typed/parquet/writer.go b/go/libraries/doltcore/table/typed/parquet/writer.go
index 7cfc2c690b..8120befbef 100644
--- a/go/libraries/doltcore/table/typed/parquet/writer.go
+++ b/go/libraries/doltcore/table/typed/parquet/writer.go
@@ -38,7 +38,7 @@ type ParquetWriter struct {
 
 var typeMap = map[typeinfo.Identifier]string{
 	typeinfo.DatetimeTypeIdentifier:   "type=INT64, convertedtype=TIME_MICROS",
-	typeinfo.DecimalTypeIdentifier:    "type=BYTE_ARRAY, convertedtype=DECIMAL, scale=2, precision=20",
+	typeinfo.DecimalTypeIdentifier:    "type=BYTE_ARRAY, convertedtype=UTF8",
 	typeinfo.EnumTypeIdentifier:       "type=BYTE_ARRAY, convertedtype=UTF8",
 	typeinfo.InlineBlobTypeIdentifier: "type=BYTE_ARRAY, convertedtype=UTF8",
 	typeinfo.SetTypeIdentifier:        "type=BYTE_ARRAY, convertedtype=UTF8",
diff --git a/integration-tests/bats/column_tags.bats b/integration-tests/bats/column_tags.bats
index 2a55b19957..d6e22a9507 100644
--- a/integration-tests/bats/column_tags.bats
+++ b/integration-tests/bats/column_tags.bats
@@ -57,7 +57,6 @@ SQL
     [[ "$output" =~ "TeSt,c1,8201" ]] || false
 }
 
-
 @test "column_tags: Merging two branches that added same tag, name, type, and constraints" {
     dolt sql <<SQL
 CREATE TABLE test (
diff --git a/integration-tests/bats/deleted-branches.bats b/integration-tests/bats/deleted-branches.bats
index 926e375c07..59a4e00748 100644
--- a/integration-tests/bats/deleted-branches.bats
+++ b/integration-tests/bats/deleted-branches.bats
@@ -3,7 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 load $BATS_TEST_DIRNAME/helper/query-server-common.bash
 
 setup() {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     setup_common
 }
diff --git a/integration-tests/bats/docs.bats b/integration-tests/bats/docs.bats
index 1f4a49d956..85c03e9437 100644
--- a/integration-tests/bats/docs.bats
+++ b/integration-tests/bats/docs.bats
@@ -208,7 +208,6 @@ SQL
     run cat README.md
     [ "$output" = readme-text ]
 
-
     echo newLicenseText > LICENSE.md
     dolt sql <<SQL
 CREATE TABLE test (
@@ -272,7 +271,6 @@ SQL
     [[ "$output" =~ ([[:space:]]*new doc:[[:space:]]*LICENSE.md) ]] || false
     [[ "$output" =~ ([[:space:]]*new doc:[[:space:]]*README.md) ]] || false
 
-
     dolt add .
     dolt commit -m "initial doc commit"
     echo ~new-text~ > README.md
@@ -400,7 +398,6 @@ SQL
     run cat README.md
     [[ "$output" =~ "this is my readme" ]] || false
 
-
     echo "testing-modified-doc" > LICENSE.md
     dolt checkout LICENSE.md
     run cat LICENSE.md
@@ -463,7 +460,6 @@ SQL
     run cat README.md
     [[ "$output" =~ "a readme" ]] || false
 
-
     echo "new readme" > README.md
     dolt sql <<SQL
 CREATE TABLE test2 (
@@ -710,7 +706,6 @@ SQL
     [[ ! "$output" =~ "dolt_docs" ]] || false
  }
 
-
 @test "docs: dolt sql operation on dolt_docs" {
     echo "a readme" > README.md
     echo "a license" > LICENSE.md
diff --git a/integration-tests/bats/drop-create.bats b/integration-tests/bats/drop-create.bats
index 8696361922..af55323d71 100755
--- a/integration-tests/bats/drop-create.bats
+++ b/integration-tests/bats/drop-create.bats
@@ -148,7 +148,6 @@ SQL
     [[ "$output" =~ "|  +  | 3 | 3 | 3    |" ]] || false
 }
 
-
 @test "drop-create: dropped column" {
     dolt sql  <<SQL
 create table test(a int primary key, b int null, c int null);
diff --git a/integration-tests/bats/export-tables.bats b/integration-tests/bats/export-tables.bats
index 87c46e3a39..772635be4c 100644
--- a/integration-tests/bats/export-tables.bats
+++ b/integration-tests/bats/export-tables.bats
@@ -312,7 +312,7 @@ SQL
 }
 
 @test "export-tables: parquet file export check with parquet tools" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     dolt sql -q "CREATE TABLE test_table (pk int primary key, col1 text, col2 int);"
     dolt sql -q "INSERT INTO test_table VALUES (1, 'row1', 22), (2, 'row2', 33), (3, 'row3', 22);"
 
@@ -360,7 +360,7 @@ print(table.to_pandas())
 }
 
 @test "export-tables: table export datetime, bool, enum types to parquet" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     dolt sql <<SQL
 CREATE TABLE diffTypes (
   pk BIGINT PRIMARY KEY,
@@ -391,9 +391,8 @@ SQL
     [[ "$output" =~ "$row3" ]] || false
 }
 
-
 @test "export-tables: table export more types to parquet" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     dolt sql <<SQL
 CREATE TABLE test (
   \`pk\` BIGINT NOT NULL,
@@ -424,7 +423,7 @@ SQL
 }
 
 @test "export-tables: table export decimal and bit types to parquet" {
-    skip "DECIMAL handling in parquet is strange, have to investigate further"
+    skiponwindows "Missing dependencies"
     dolt sql -q "CREATE TABLE more (pk BIGINT NOT NULL,v DECIMAL(9,5),b BIT(10),PRIMARY KEY (pk));"
     dolt sql -q "INSERT INTO more VALUES (1, 1234.56789, 511);"
     dolt sql -q "INSERT INTO more VALUES (2, 5235.66789, 514);"
@@ -436,10 +435,8 @@ SQL
 
     run parquet-tools cat --json more.parquet > output.json
     [ "$status" -eq 0 ]
-    row1='{"pk":1,"v":1234.57,"b":511}'
-    row2='{"pk":2,"v":5235.67,"b":514}'
-    [[ "$output" =~ "$row1" ]] || false
-    [[ "$output" =~ "$row2" ]] || false
+    [[ "$output" =~ '{"pk":1,"v":"1234.56789","b":511}' ]] || false
+    [[ "$output" =~ '{"pk":2,"v":"5235.66789","b":514}' ]] || false
 }
 
 @test "export-tables: table export to sql with null values in different sql types" {
diff --git a/integration-tests/bats/filter-branch.bats b/integration-tests/bats/filter-branch.bats
index d5b2d71f2e..d25e0082dd 100644
--- a/integration-tests/bats/filter-branch.bats
+++ b/integration-tests/bats/filter-branch.bats
@@ -193,7 +193,6 @@ function setup_write_test {
         [[ "$output" =~ "added" ]] || false
     done
 
-
     for commit in HEAD HEAD~1 HEAD~2; do
         run dolt sql -q "SHOW TABLES AS OF '$commit';" -r csv
         [ "$status" -eq 0 ]
diff --git a/integration-tests/bats/helper/pytest.py b/integration-tests/bats/helper/pytest.py
index 7448d78912..1d64badbb6 100644
--- a/integration-tests/bats/helper/pytest.py
+++ b/integration-tests/bats/helper/pytest.py
@@ -6,16 +6,13 @@ import mysql.connector
 from io import StringIO
 from multiprocessing import Process
 
-
 def _connect(user, host, port, database):
     return mysql.connector.connect(user=user, host=host, port=port, database=database, allow_local_infile=True)
 
-
 def _print_err_and_exit(e):
     print(e, file=sys.stderr)
     sys.exit(1)
 
-
 def csv_to_row_maps(csv_str):
     csv_str = csv_str.replace('\\n', '\n')
     rd = csv.DictReader(StringIO(csv_str))
@@ -25,7 +22,6 @@ def csv_to_row_maps(csv_str):
 
     return rows
 
-
 class DoltConnection(object):
     def __init__(self, user='root', host='127.0.0.1', port=3306, database='dolt', auto_commit=False):
         self.user = user
@@ -69,7 +65,6 @@ class DoltConnection(object):
                 _print_err_and_exit(e)
             raise e
 
-
 class InfiniteRetryConnection(DoltConnection):
     def connect(self):
         while True:
@@ -86,7 +81,6 @@ class InfiniteRetryConnection(DoltConnection):
             except BaseException:
                 pass
 
-
 def wait_for_connection(user='root', host='127.0.0.1', port=3306, database='dolt', timeout_ms=5000):
     timeoutf = timeout_ms / 1000.0
     exit_zero_on_connect = InfiniteRetryConnection(user=user, host=host, port=port, database=database)
diff --git a/integration-tests/bats/helper/query-server-common.bash b/integration-tests/bats/helper/query-server-common.bash
index 1af3ad706e..0cf35fa7b0 100644
--- a/integration-tests/bats/helper/query-server-common.bash
+++ b/integration-tests/bats/helper/query-server-common.bash
@@ -161,7 +161,6 @@ behavior:
     wait_for_connection $PORT 5000
 }
 
-
 start_multi_db_server() {
     DEFAULT_DB="$1"
     let PORT="$$ % (65536-1024) + 1024"
diff --git a/integration-tests/bats/merge.bats b/integration-tests/bats/merge.bats
index f23be499f1..1fa0df155f 100644
--- a/integration-tests/bats/merge.bats
+++ b/integration-tests/bats/merge.bats
@@ -531,7 +531,6 @@ SQL
     [[ "$output" =~ "2,2,2" ]] || false
 }
 
-
 @test "merge: merge branch with table that was deleted" {
     dolt sql << SQL
 INSERT INTO test2 VALUES (0, 0, 0);
diff --git a/integration-tests/bats/remotes-sql-server.bats b/integration-tests/bats/remotes-sql-server.bats
index c47d7b21f3..46d0b386c3 100644
--- a/integration-tests/bats/remotes-sql-server.bats
+++ b/integration-tests/bats/remotes-sql-server.bats
@@ -37,7 +37,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: sql-push --set-remote within session" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt remote add origin file://../rem1
@@ -55,7 +55,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: push on sql-session commit" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt config --local --add sqlserver.global.dolt_replicate_to_remote remote1
@@ -75,7 +75,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: async push on sql-session commit" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt config --local --add sqlserver.global.dolt_replicate_to_remote remote1
@@ -99,7 +99,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: pull new commits on read" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt commit -am "cm"
@@ -114,7 +114,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: pull remote not found error" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt config --local --add sqlserver.global.dolt_read_replica_remote unknown
@@ -127,7 +127,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: quiet pull warnings" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt config --local --add sqlserver.global.dolt_skip_replication_errors 1
@@ -139,7 +139,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: push remote not found error" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt config --local --add sqlserver.global.dolt_replicate_to_remote unknown
@@ -151,7 +151,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: quiet push warnings" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt config --local --add sqlserver.global.dolt_skip_replication_errors 1
@@ -162,7 +162,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: pull multiple heads" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt checkout -b new_feature
@@ -179,7 +179,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: connect to remote head" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt checkout -b new_feature
@@ -222,7 +222,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: pull all heads" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt commit -am "new commit"
@@ -237,7 +237,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: pull invalid head" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     skip "query retry prevents error checking"
 
     cd repo2
@@ -252,7 +252,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: pull multiple heads, one invalid" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     skip "query retry prevents error checking"
 
     cd repo2
@@ -267,7 +267,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: quiet pull all heads warnings" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt commit -am "cm"
@@ -283,7 +283,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: connect to missing branch pulls remote" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt checkout -b feature-branch
@@ -300,7 +300,7 @@ teardown() {
 }
 
 @test "remotes-sql-server: connect to hash works" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     
     cd repo1
     dolt commit -am "cm"
diff --git a/integration-tests/bats/remotes.bats b/integration-tests/bats/remotes.bats
index 2707be82d7..f35df4db36 100644
--- a/integration-tests/bats/remotes.bats
+++ b/integration-tests/bats/remotes.bats
@@ -952,7 +952,6 @@ SQL
     [ "$status" -eq 0 ]
 }
 
-
 @test "remotes: force fetch from main" {
     dolt remote add test-remote http://localhost:50051/test-org/test-repo
     dolt push test-remote main
diff --git a/integration-tests/bats/replication.bats b/integration-tests/bats/replication.bats
index d0713d40ba..9ac6e21c44 100644
--- a/integration-tests/bats/replication.bats
+++ b/integration-tests/bats/replication.bats
@@ -211,7 +211,6 @@ teardown() {
     [[ "$output" =~ "invalid replicate heads setting; cannot set both" ]] || false
 }
 
-
 @test "replication: replica pull multiple heads quiet warnings" {
     dolt clone file://./rem1 repo2
     cd repo2
diff --git a/integration-tests/bats/sql-check-constraints.bats b/integration-tests/bats/sql-check-constraints.bats
index 7753589fa3..e62e6aab3a 100644
--- a/integration-tests/bats/sql-check-constraints.bats
+++ b/integration-tests/bats/sql-check-constraints.bats
@@ -9,7 +9,6 @@ teardown() {
     teardown_common
 }
 
-
 @test "sql-check-constraints: basic tests for check constraints" {
     dolt sql <<SQL
 CREATE table t1 (
@@ -185,4 +184,3 @@ SQL
     [[ "$output" =~ "`c1` > 3" ]] || false
 }
 
-
diff --git a/integration-tests/bats/sql-checkout.bats b/integration-tests/bats/sql-checkout.bats
index 26528a3a96..c53d7308cb 100644
--- a/integration-tests/bats/sql-checkout.bats
+++ b/integration-tests/bats/sql-checkout.bats
@@ -99,7 +99,6 @@ CALL DOLT_CHECKOUT('-b', 'new-branch');
 SQL
 }
 
-
 @test "sql-checkout: DOLT_CHECKOUT -b throws error on branches that already exist" {
     run dolt sql -q "SELECT DOLT_CHECKOUT('-b', 'main')"
     [ $status -eq 1 ]
diff --git a/integration-tests/bats/sql-client.bats b/integration-tests/bats/sql-client.bats
index 58c2de2fc3..db0051d9c8 100644
--- a/integration-tests/bats/sql-client.bats
+++ b/integration-tests/bats/sql-client.bats
@@ -42,7 +42,7 @@ teardown() {
 }
 
 @test "sql-client: test sql-client shows tables" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     cd repo1
     start_sql_server repo1
     cd ../
diff --git a/integration-tests/bats/sql-config.bats b/integration-tests/bats/sql-config.bats
index 1309f4f068..187901e8a3 100644
--- a/integration-tests/bats/sql-config.bats
+++ b/integration-tests/bats/sql-config.bats
@@ -44,7 +44,6 @@ teardown() {
     [[ "$output" =~ "sqlserver.global.max_connections = 1000" ]] || false
 }
 
-
 @test "sql-config: remove persisted variable with cli engine" {
     skip "TODO parser support for RESET PERSIST"
 
diff --git a/integration-tests/bats/sql-conflicts.bats b/integration-tests/bats/sql-conflicts.bats
index 7d24bf4c2c..de17ba8951 100644
--- a/integration-tests/bats/sql-conflicts.bats
+++ b/integration-tests/bats/sql-conflicts.bats
@@ -94,7 +94,6 @@ SQL
   [ "$status" -eq 0 ]
 }
 
-
 @test "sql-conflicts: modify conflict" {
   skip_nbf_dolt_1
   dolt SQL -q "INSERT INTO one_pk (pk1,c1,c2) VALUES (0,0,0)"
diff --git a/integration-tests/bats/sql-create-tables.bats b/integration-tests/bats/sql-create-tables.bats
index 49302077c3..3f641d9ca7 100644
--- a/integration-tests/bats/sql-create-tables.bats
+++ b/integration-tests/bats/sql-create-tables.bats
@@ -213,7 +213,6 @@ SQL
     [[ "$output" =~ "PRIMARY KEY (\`pk\`)" ]] || false
 }
 
-
 @test "sql-create-tables: create a table using sql with a string" {
     run dolt sql <<SQL
 CREATE TABLE test (
@@ -231,7 +230,6 @@ SQL
     [[ "$output" =~ "PRIMARY KEY (\`pk\`)" ]] || false
 }
 
-
 @test "sql-create-tables: create a table using sql with an unsigned int" {
     run dolt sql -q "CREATE TABLE test (pk BIGINT NOT NULL, c1 BIGINT UNSIGNED, PRIMARY KEY (pk))"
     [ "$status" -eq 0 ]
@@ -306,7 +304,6 @@ SQL
     [[ "$output" =~ "date" ]] || false
 }
 
-
 @test "sql-create-tables: create two table with the same name" {
     dolt sql <<SQL
 CREATE TABLE test (
@@ -535,7 +532,6 @@ SQL
     [[ "$output" =~ "nothing to commit, working tree clean" ]] || false
 }
 
-
 @test "sql-create-tables: You can create a temp table of the same name as a normal table. Run it through operations" {
     run dolt sql <<SQL
 CREATE TABLE goodtable(pk int PRIMARY KEY);
diff --git a/integration-tests/bats/sql-merge.bats b/integration-tests/bats/sql-merge.bats
index 109585b41c..2b3bbd9ff6 100644
--- a/integration-tests/bats/sql-merge.bats
+++ b/integration-tests/bats/sql-merge.bats
@@ -1201,7 +1201,6 @@ SELECT DOLT_COMMIT('-a', '-m', 'Insert 60');
 SELECT DOLT_MERGE('feature-branch');
 SQL
 
-
     run dolt status
     [ $status -eq 0 ]
     [[ "$output" =~ "On branch main" ]] || false
@@ -1253,7 +1252,6 @@ CALL DOLT_COMMIT('-a', '-m', 'Insert 60');
 CALL DOLT_MERGE('feature-branch');
 SQL
 
-
     run dolt status
     [ $status -eq 0 ]
     [[ "$output" =~ "On branch main" ]] || false
diff --git a/integration-tests/bats/sql-push.bats b/integration-tests/bats/sql-push.bats
index cc43f9f002..28039291c5 100644
--- a/integration-tests/bats/sql-push.bats
+++ b/integration-tests/bats/sql-push.bats
@@ -208,7 +208,6 @@ teardown() {
     [ "$status" -eq 1 ]
     [[ "$output" =~ "the tip of your current branch is behind its remote counterpart" ]] || false
 
-
     dolt sql -q "select dolt_push('--force', 'origin', 'main')"
 }
 
@@ -223,7 +222,6 @@ teardown() {
     [ "$status" -eq 1 ]
     [[ "$output" =~ "the tip of your current branch is behind its remote counterpart" ]] || false
 
-
     dolt sql -q "CALL dolt_push('--force', 'origin', 'main')"
 }
 
diff --git a/integration-tests/bats/sql-server.bats b/integration-tests/bats/sql-server.bats
index a81fd89600..9399f6f4b6 100644
--- a/integration-tests/bats/sql-server.bats
+++ b/integration-tests/bats/sql-server.bats
@@ -35,7 +35,7 @@ teardown() {
 }
 
 @test "sql-server: test autocommit" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     start_sql_server repo1
@@ -69,7 +69,7 @@ teardown() {
 }
 
 @test "sql-server: read-only flag prevents modification" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
 
@@ -96,7 +96,7 @@ teardown() {
 }
 
 @test "sql-server: read-only flag still allows select" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt sql -q "create table t(c0 int)"
@@ -113,7 +113,7 @@ teardown() {
 }
 
 @test "sql-server: read-only flag prevents dolt_commit" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
 
@@ -129,7 +129,7 @@ teardown() {
 }
 
 @test "sql-server: test command line modification" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     start_sql_server repo1
@@ -163,7 +163,7 @@ teardown() {
 }
 
 @test "sql-server: test dolt sql interface works properly with autocommit" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     start_sql_server repo1
@@ -224,7 +224,7 @@ teardown() {
 }
 
 @test "sql-server: test basic querying via dolt sql-server" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     start_sql_server repo1
@@ -246,7 +246,7 @@ teardown() {
 }
 
 @test "sql-server: test multiple queries on the same connection" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     start_sql_server repo1
@@ -265,7 +265,7 @@ teardown() {
 }
 
 @test "sql-server: test reset_hard" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt sql <<SQL
@@ -310,7 +310,7 @@ SQL
 }
 
 @test "sql-server: test multi db with use statements" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     start_multi_db_server repo1
 
@@ -419,7 +419,7 @@ SQL
 }
 
 @test "sql-server: test CREATE and DROP database via sql-server" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     start_sql_server repo1
@@ -437,7 +437,7 @@ SQL
 }
 
 @test "sql-server: DOLT_ADD, DOLT_COMMIT, DOLT_CHECKOUT, DOLT_MERGE work together in server mode" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
      cd repo1
      start_sql_server repo1
@@ -489,7 +489,7 @@ SQL
 }
 
 @test "sql-server: DOLT_MERGE ff works" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
      cd repo1
      start_sql_server repo1
@@ -515,7 +515,7 @@ SQL
 }
 
 @test "sql-server: LOAD DATA LOCAL INFILE works" {
-     skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+     skiponwindows "Missing dependencies"
 
      cd repo1
      start_sql_server repo1
@@ -530,7 +530,7 @@ SQL
 }
 
 @test "sql-server: Run queries on database without ever selecting it" {
-     skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+     skiponwindows "Missing dependencies"
 
      start_multi_db_server repo1
 
@@ -586,7 +586,7 @@ SQL
 }
 
 @test "sql-server: create database without USE" {
-     skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+     skiponwindows "Missing dependencies"
 
      start_multi_db_server repo1
 
@@ -620,7 +620,7 @@ SQL
 }
 
 @test "sql-server: manual commit table can be dropped (validates superschema structure)" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     start_sql_server repo1
@@ -657,7 +657,7 @@ SQL
 # TODO: Need to update testing logic allow queries for a multiple session.
 @test "sql-server: Create a temporary table and validate that it doesn't persist after a session closes" {
     skip_nbf_dolt_1
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     start_sql_server repo1
@@ -677,7 +677,7 @@ SQL
 }
 
 @test "sql-server: connect to another branch with connection string" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt checkout -b "feature-branch"
@@ -696,7 +696,7 @@ SQL
 }
 
 @test "sql-server: connect to a commit with connection string" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt sql -q "create table test (pk int primary key)"
@@ -721,7 +721,7 @@ SQL
 }
 
 @test "sql-server: select a branch with the USE syntax" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt checkout -b "feature-branch"
@@ -742,7 +742,7 @@ SQL
 }
 
 @test "sql-server: SET GLOBAL default branch as ref" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt checkout -b "new"
@@ -762,7 +762,7 @@ SQL
 }
 
 @test "sql-server: SET GLOBAL default branch as branch name" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     dolt checkout -b "new"
@@ -782,7 +782,7 @@ SQL
 }
 
 @test "sql-server: require_secure_transport no key or cert" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     cd repo1
     let PORT="$$ % (65536-1024) + 1024"
     cat >config.yml <<EOF
@@ -794,7 +794,7 @@ EOF
 }
 
 @test "sql-server: tls_key non-existant" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     cd repo1
     cp "$BATS_TEST_DIRNAME"/../../go/cmd/dolt/commands/sqlserver/testdata/chain_key.pem .
     cp "$BATS_TEST_DIRNAME"/../../go/cmd/dolt/commands/sqlserver/testdata/chain_cert.pem .
@@ -809,7 +809,7 @@ EOF
 }
 
 @test "sql-server: tls_cert non-existant" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     cd repo1
     cp "$BATS_TEST_DIRNAME"/../../go/cmd/dolt/commands/sqlserver/testdata/chain_key.pem .
     cp "$BATS_TEST_DIRNAME"/../../go/cmd/dolt/commands/sqlserver/testdata/chain_cert.pem .
@@ -824,7 +824,7 @@ EOF
 }
 
 @test "sql-server: tls only server" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     cd repo1
     cp "$BATS_TEST_DIRNAME"/../../go/cmd/dolt/commands/sqlserver/testdata/chain_key.pem .
     cp "$BATS_TEST_DIRNAME"/../../go/cmd/dolt/commands/sqlserver/testdata/chain_cert.pem .
@@ -868,7 +868,7 @@ while True:
 }
 
 @test "sql-server: disable_client_multi_statements makes create trigger work" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     cd repo1
     dolt sql -q 'create table test (id int primary key)'
     let PORT="$$ % (65536-1024) + 1024"
@@ -915,7 +915,7 @@ END""")
 }
 
 @test "sql-server: client_multi_statements work" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     cd repo1
     dolt sql -q 'create table test (id int primary key)'
     let PORT="$$ % (65536-1024) + 1024"
@@ -960,7 +960,7 @@ END""")
 }
 
 @test "sql-server: auto increment for a table should reset between drops" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     start_sql_server repo1
@@ -977,7 +977,7 @@ END""")
 }
 
 @test "sql-server: sql-push --set-remote within session" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     skip_nbf_dolt_1
 
     mkdir rem1
@@ -997,7 +997,7 @@ END""")
 }
 
 @test "sql-server: replicate to backup after sql-session commit" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     skip_nbf_dolt_1
 
     mkdir bac1
@@ -1026,7 +1026,7 @@ END""")
 }
 
 @test "sql-server: create database with no starting repo" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     mkdir no_dolt && cd no_dolt
     start_sql_server
@@ -1081,7 +1081,7 @@ END""")
 }
 
 @test "sql-server: drop database with active connections" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     skip_nbf_dolt_1
     
     mkdir no_dolt && cd no_dolt
@@ -1131,7 +1131,7 @@ END""")
 }
 
 @test "sql-server: connect to databases case insensitive" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     skip_nbf_dolt_1
 
     mkdir no_dolt && cd no_dolt
@@ -1153,7 +1153,7 @@ END""")
 }
 
 @test "sql-server: create and drop database with --multi-db-dir" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     mkdir no_dolt && cd no_dolt
     mkdir db_dir
@@ -1192,7 +1192,7 @@ END""")
 }
 
 @test "sql-server: create database errors" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     mkdir no_dolt && cd no_dolt
     mkdir dir_exists
@@ -1210,7 +1210,7 @@ END""")
 }
 
 @test "sql-server: create database with existing repo" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
 
     cd repo1
     start_sql_server
@@ -1254,7 +1254,7 @@ END""")
 }
 
 @test "sql-server: fetch uses database tempdir from different working directory" {
-    skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
+    skiponwindows "Missing dependencies"
     skip_nbf_dolt_1
 
     mkdir remote1
diff --git a/integration-tests/bats/sql-show.bats b/integration-tests/bats/sql-show.bats
index e9b27a8106..c8dd41ffb0 100644
--- a/integration-tests/bats/sql-show.bats
+++ b/integration-tests/bats/sql-show.bats
@@ -36,7 +36,6 @@ teardown() {
     ! [[ "$output" =~ "test" ]] || false
 }
 
-
 @test "sql-show: show table status has number of rows correct" {
     dolt sql -q "CREATE TABLE test(pk int NOT NULL AUTO_INCREMENT, c1 int, PRIMARY KEY (pk))"
 
diff --git a/integration-tests/bats/sql.bats b/integration-tests/bats/sql.bats
index 593fc33c63..180dc6ee8b 100755
--- a/integration-tests/bats/sql.bats
+++ b/integration-tests/bats/sql.bats
@@ -849,7 +849,6 @@ SQL
     [[ "$output" =~ 'branch not found' ]] || false
 }
 
-
 @test "sql: branch qualified DB name in select" {
     dolt add .; dolt commit -m 'commit tables'
     dolt checkout -b feature-branch
diff --git a/integration-tests/bats/system-tables.bats b/integration-tests/bats/system-tables.bats
index f2551c0e96..b2453a572f 100644
--- a/integration-tests/bats/system-tables.bats
+++ b/integration-tests/bats/system-tables.bats
@@ -137,7 +137,6 @@ teardown() {
 }
 
 @test "system-tables: query dolt_remotes system table" {
-    skip "JSON formatting is weird, need to fix"
     skip_nbf_dolt_1 "dolt remote not supported"
     
     run dolt sql -q "select count(*) from dolt_remotes" -r csv
@@ -152,10 +151,14 @@ teardown() {
     [[ "$output" =~ 1 ]] || false
 
     regex='file://.*/remote'
-    run dolt sql -q "select * from dolt_remotes" -r csv
+    run dolt sql -q "select name, fetch_specs, params from dolt_remotes" -r csv
     [ $status -eq 0 ]
-    [[ "${lines[0]}" = name,url,fetch_specs,params ]] || false
-    [[ "${lines[1]}" =~ origin,$regex,[refs/heads/*:refs/remotes/origin/*,{} ]] || false
+    [[ "${lines[0]}" = name,fetch_specs,params ]] || false
+    [[ "${lines[1]}" =~ "origin,\"[\"\"refs/heads/*:refs/remotes/origin/*\"\"]\",{}" ]] || false
+    run dolt sql -q "select url from dolt_remotes" -r csv
+    [ $status -eq 0 ]
+    [[ "${lines[0]}" = url ]] || false
+    [[ "${lines[1]}" =~ $regex ]] || false
 }
 
 @test "system-tables: check unsupported dolt_remote behavior" {
@@ -338,8 +341,6 @@ teardown() {
     [[ "$output" =~ "$EXPECTED" ]] || false
 }
 
-
-
 @test "system-tables: query dolt_history_ system table" {
     dolt sql -q "create table test (pk int, c1 int, primary key(pk))"
     dolt add test