From 64664ec26b60db1e5f040affaa6b57dd7befd308 Mon Sep 17 00:00:00 2001
From: Max Hoffman <max@dolthub.com>
Date: Wed, 10 Mar 2021 08:59:37 -0800
Subject: [PATCH] Add vinai's changes

---
 bats/sql-branch.bats | 39 ---------------------------------------
 bats/sql.bats        | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 39 deletions(-)
 delete mode 100644 bats/sql-branch.bats

diff --git a/bats/sql-branch.bats b/bats/sql-branch.bats
deleted file mode 100644
index ed26b39764..0000000000
--- a/bats/sql-branch.bats
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bats
-load $BATS_TEST_DIRNAME/helper/common.bash
-
-setup() {
-    setup_common
-
-    dolt sql <<SQL
-CREATE TABLE test (
-    pk int primary key
-);
-CREATE TABLE test2 (
-    pk int primary key
-);
-INSERT INTO test VALUES (0),(1),(2);
-SQL
-}
-
-teardown() {
-    assert_feature_version
-    teardown_common
-}
-
-@test "active_branch() func" {
-    run dolt sql -q 'select active_branch()' -r csv
-    [ $status -eq 0 ]
-    # TODO: Get rid of this echo.
-    echo $output
-    [[ "$output" =~ "ACTIVE_BRANCH()" ]] || false
-    [[ "$output" =~ "master" ]] || false
-}
-
-@test "active_branch() func on feature branch" {
-    run dolt branch tmp_br
-    run dolt checkout tmp_br
-    run dolt sql -q 'select active_branch()' -r csv
-    [ $status -eq 0 ]
-    [[ "$output" =~ "ACTIVE_BRANCH()" ]] || false
-    [[ "$output" =~ "tmp_br" ]] || false
-}
diff --git a/bats/sql.bats b/bats/sql.bats
index 2223f854d1..2be04a4cea 100755
--- a/bats/sql.bats
+++ b/bats/sql.bats
@@ -946,3 +946,19 @@ SQL
     [[ ! "$output" =~ ',p2,PROCEDURE,' ]] || false
     [[ "${#lines[@]}" = "1" ]] || false
 }
+
+@test "sql: active_branch() func" {
+    run dolt sql -q 'select active_branch()' -r csv
+    [ $status -eq 0 ]
+    [[ "$output" =~ "ACTIVE_BRANCH()" ]] || false
+    [[ "$output" =~ "master" ]] || false
+}
+
+@test "sql: active_branch() func on feature branch" {
+    run dolt branch tmp_br
+    run dolt checkout tmp_br
+    run dolt sql -q 'select active_branch()' -r csv
+    [ $status -eq 0 ]
+    [[ "$output" =~ "ACTIVE_BRANCH()" ]] || false
+    [[ "$output" =~ "tmp_br" ]] || false
+}