diff --git a/integration-tests/bats/branch-control.bats b/integration-tests/bats/branch-control.bats
index 9537d5aac0..34f8c94dd8 100644
--- a/integration-tests/bats/branch-control.bats
+++ b/integration-tests/bats/branch-control.bats
@@ -45,12 +45,12 @@ setup_test_user() {
 @test "branch-control: fresh database. branch control tables exist through server interface" {
     start_sql_server
 
-    run dolt -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql --result-format csv -q "select * from dolt_branch_control"
+    run dolt sql --result-format csv -q "select * from dolt_branch_control"
     [ $status -eq 0 ]
     [ ${lines[0]} = "database,branch,user,host,permissions" ]
     [ ${lines[1]} = "%,%,%,%,write" ]
 
-    dolt -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql -q "select * from dolt_branch_namespace_control"
+    dolt sql -q "select * from dolt_branch_namespace_control"
 }
 
 @test "branch-control: modify dolt_branch_control from dolt sql then make sure changes are reflected" {
@@ -63,7 +63,7 @@ setup_test_user() {
     [ ${lines[1]} = "test-db,test-branch,test,%,write" ]
 
     start_sql_server
-    run dolt -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql --result-format csv -q "select * from dolt_branch_control"
+    run dolt sql --result-format csv -q "select * from dolt_branch_control"
     [ $status -eq 0 ]
     [ ${lines[0]} = "database,branch,user,host,permissions" ]
     [ ${lines[1]} = "test-db,test-branch,test,%,write" ]
@@ -78,13 +78,13 @@ setup_test_user() {
     SERVER_PID=$! # will get killed by teardown_common
     sleep 5 # not using python wait so this works on windows
 
-    run dolt --use-db "dolt_repo_$$" -u root -p "" --port $PORT --host 0.0.0.0 --no-tls sql --result-format csv -q "select * from dolt_branch_control"
+    run dolt sql --result-format csv -q "select * from dolt_branch_control"
     [ ${lines[0]} = "database,branch,user,host,permissions" ]
     [ ${lines[1]} = "%,%,%,%,write" ]
 
-    dolt --use-db "dolt_repo_$$" -u root -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "delete from dolt_branch_control where user='%'"
+    dolt sql -q "delete from dolt_branch_control where user='%'"
      
-    run dolt --use-db "dolt_repo_$$" -u root -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "select * from dolt_branch_control"
+    run dolt sql -q "select * from dolt_branch_control"
     [ $status -eq 0 ]
     [ "$output" == "" ]
 }
@@ -97,19 +97,19 @@ setup_test_user() {
     
     start_sql_server
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql -q "create table t (c1 int)"
+    run dolt sql -q "create table t (c1 int)"
     [ $status -ne 0 ]
     [[ $output =~ "does not have the correct permissions" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql -q "call dolt_checkout('test-branch'); create table t (c1 int)"
+    dolt -u test sql -q "call dolt_checkout('test-branch'); create table t (c1 int)"
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql -q "call dolt_checkout('test-branch'); call dolt_add('t'); call dolt_commit('-m', 'Testing commit');"
+    dolt -u test sql -q "call dolt_checkout('test-branch'); call dolt_add('t'); call dolt_commit('-m', 'Testing commit');"
 
     # I should also have branch permissions on branches I create
-    dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql -q "call dolt_checkout('-b', 'test-branch-2'); create table t (c1 int)"
+    dolt sql -q "call dolt_checkout('-b', 'test-branch-2'); create table t (c1 int)"
 
     # Now back to main. Still locked out.
-    run dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql -q "create table t (c1 int)"
+    run dolt sql -q "create table t (c1 int)"
     [ $status -ne 0 ]
     [[ $output =~ "does not have the correct permissions" ]] || false
 }
@@ -126,16 +126,16 @@ setup_test_user() {
     start_sql_server
     
     # Admin has no write permission to branch not an admin on
-    run dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql -q "create table t (c1 int)"
+    run dolt -u test sql -q "create table t (c1 int)"
     [ $status -ne 0 ]
     [[ $output =~ "does not have the correct permissions" ]] || false
     
     # Admin can write
-    dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql -q "call dolt_checkout('test-branch'); create table t (c1 int)"
+    dolt -u test sql -q "call dolt_checkout('test-branch'); create table t (c1 int)"
 
     # Admin can make other users
-    dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql -q "insert into dolt_branch_control values ('dolt_repo_$$', 'test-branch', 'test2', '%', 'write')"
-    run dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql --result-format csv -q "select * from dolt_branch_control"
+    dolt -u test sql -q "insert into dolt_branch_control values ('dolt_repo_$$', 'test-branch', 'test2', '%', 'write')"
+    run dolt -u test sql --result-format csv -q "select * from dolt_branch_control"
     [ $status -eq 0 ]
     [ ${lines[0]} = "database,branch,user,host,permissions" ]
     [ ${lines[1]} = "dolt_repo_$$,test-branch,test,%,admin" ]
@@ -143,7 +143,7 @@ setup_test_user() {
     [ ${lines[3]} = "dolt_repo_$$,test-branch,test2,%,write" ]
 
     # test2 can see all branch permissions
-    run dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test2 -p "" sql --result-format csv -q "select * from dolt_branch_control"
+    run dolt -u test2 sql --result-format csv -q "select * from dolt_branch_control"
     [ $status -eq 0 ]
     [ ${lines[0]} = "database,branch,user,host,permissions" ]
     [ ${lines[1]} = "dolt_repo_$$,test-branch,test,%,admin" ]
@@ -151,18 +151,18 @@ setup_test_user() {
     [ ${lines[3]} = "dolt_repo_$$,test-branch,test2,%,write" ]
 
     # test2 now has write permissions on test-branch
-    dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test2 -p "" sql -q "call dolt_checkout('test-branch'); insert into t values(0)"
+    dolt -u test2 sql -q "call dolt_checkout('test-branch'); insert into t values(0)"
 
     # Remove test2 permissions
-    dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql -q "delete from dolt_branch_control where user='test2'"
+    dolt -u test sql -q "delete from dolt_branch_control where user='test2'"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql --result-format csv -q "select * from dolt_branch_control"
+    run dolt -u test sql --result-format csv -q "select * from dolt_branch_control"
     [ $status -eq 0 ]
     [ ${lines[0]} = "database,branch,user,host,permissions" ]
     [ ${lines[1]} = "dolt_repo_$$,test-branch,test,%,admin" ]
 
     # test2 cannot write to branch
-    run dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test2 -p "" sql -q "call dolt_checkout('test-branch'); insert into t values(1)"
+    run dolt -u test2 sql -q "call dolt_checkout('test-branch'); insert into t values(1)"
     [ $status -ne 0 ]
     [[ $output =~ "does not have the correct permissions" ]] || false
 }
@@ -174,9 +174,9 @@ setup_test_user() {
 
     start_sql_server
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql -q "call dolt_branch('test-branch')"
+    dolt -u test sql -q "call dolt_branch('test-branch')"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql --result-format csv -q "select * from dolt_branch_control"
+    run dolt -u test sql --result-format csv -q "select * from dolt_branch_control"
     [ $status -eq 0 ]
     [ ${lines[0]} = "database,branch,user,host,permissions" ]
     [ ${lines[1]} = "dolt_repo_$$,main,test,%,write" ]
@@ -195,18 +195,18 @@ branch', 'test', '%', 'admin')"
 
     start_sql_server
 
-    run dolt -u test -p "" --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql --result-format csv -q "select * from dolt_branch_namespace_control"
+    run dolt -u test sql --result-format csv -q "select * from dolt_branch_namespace_control"
     [ $status -eq 0 ]
     [ ${lines[0]} = "database,branch,user,host" ]
     [ ${lines[1]} = "dolt_repo_$$,test-%,test2,%" ]
 
     # test cannot create test-branch
-    run dolt -u test -p "" --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql -q "call dolt_branch('test-branch')"
+    run dolt -u test sql -q "call dolt_branch('test-branch')"
     [ $status -ne 0 ]
     [[ $output =~ "cannot create a branch" ]] || false
 
     # test2 can create test-branch
-    dolt -u test2 -p "" --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql -q "call dolt_branch('test-branch')"
+    dolt -u test2 sql -q "call dolt_branch('test-branch')"
 }
 
 @test "branch-control: test longest match in branch namespace control" {
@@ -221,13 +221,13 @@ branch', 'test', '%', 'admin')"
     start_sql_server
 
     # test can create a branch in its namesapce but not in test2
-    dolt -u test -p "" --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql -q "call dolt_branch('test/branch1')"
-    run dolt -u test -p "" --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql -q "call dolt_branch('test2/branch1')"
+    dolt -u test sql -q "call dolt_branch('test/branch1')"
+    run dolt -u test sql -q "call dolt_branch('test2/branch1')"
     [ $status -ne 0 ]
     [[ $output =~ "cannot create a branch" ]] || false
 
-    dolt -u test2 -p "" --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql -q "call dolt_branch('test2/branch1')"
-    run dolt -u test2 -p "" --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql -q "call dolt_branch('test/branch1')"
+    dolt -u test2 sql -q "call dolt_branch('test2/branch1')"
+    run dolt -u test2 sql -q "call dolt_branch('test/branch1')"
     [ $status -ne 0 ]
     [[ $output =~ "cannot create a branch" ]] || false   
 }
@@ -244,13 +244,13 @@ branch', 'test', '%', 'admin')"
 
   start_sql_server
 
-  run dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql -q "call dolt_checkout('test-branch'); create table t (c1 int)"
+  run dolt -u test sql -q "call dolt_checkout('test-branch'); create table t (c1 int)"
   [ $status -ne 0 ]
   [[ $output =~ "does not have the correct permissions" ]] || false
 
-  dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u admin -p "" sql -q "delete from dolt_branch_control where branch = 'test-branch'"
+  dolt -u admin sql -q "delete from dolt_branch_control where branch = 'test-branch'"
 
-  run dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" -u test -p "" sql -q "call dolt_checkout('test-branch'); create table t (c1 int)"
+  run dolt -u test sql -q "call dolt_checkout('test-branch'); create table t (c1 int)"
   [ $status -eq 0 ]
   [[ ! $output =~ "does not have the correct permissions" ]] || false
 }
diff --git a/integration-tests/bats/config.bats b/integration-tests/bats/config.bats
index 476562d2a8..8b66bc9bf9 100644
--- a/integration-tests/bats/config.bats
+++ b/integration-tests/bats/config.bats
@@ -207,16 +207,16 @@ teardown() {
     
     start_sql_server
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db '' sql -q "create database testdb"
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db '' sql --result-format csv -q "show databases"
+    dolt sql -q "create database testdb"
+    run dolt sql --result-format csv -q "show databases"
     [ $status -eq 0 ]
     [[ "$output" =~ "testdb" ]] || false
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db testdb sql -q "create table a(x int)"
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db testdb sql -q "insert into a values (1), (2)"
+    dolt sql -q "create table a(x int)"
+    dolt sql -q "insert into a values (1), (2)"
 
     [ -d "testdb" ]
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db testdb sql -q "select * from dolt_log"
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db testdb sql -q "select * from dolt_log"
+    dolt --use-db testdb sql -q "select * from dolt_log"
+    run dolt --use-db testdb sql -q "select * from dolt_log"
     [ "$status" -eq 0 ]
     [[ "$output" =~ "Dolt System Account" ]] || false
     [[ "$output" =~ "doltuser@dolthub.com" ]] || false
diff --git a/integration-tests/bats/deleted-branches.bats b/integration-tests/bats/deleted-branches.bats
index 65c311bb50..6c1b7036dc 100644
--- a/integration-tests/bats/deleted-branches.bats
+++ b/integration-tests/bats/deleted-branches.bats
@@ -25,8 +25,7 @@ make_it() {
 # branch. It does this by using the hidden variable @dolt_allow_default_branch_deletion to bypass
 # the check for deleting a db's default branch.
 force_delete_main_branch_on_sqlserver() {
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql \
-      -q "set @dolt_allow_default_branch_deletion=true; call dolt_checkout('to_keep'); call dolt_branch('-D', 'main');"
+    dolt sql -q "set @dolt_allow_default_branch_deletion=true; call dolt_checkout('to_keep'); call dolt_branch('-D', 'main');"
 }
 
 @test "deleted-branches: dolt checkout from CLI works when the db's default branch doesn't exist" {
@@ -55,13 +54,11 @@ force_delete_main_branch_on_sqlserver() {
     make_it
     start_sql_server "dolt_repo_$$"
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql \
-        -q "call dolt_checkout('to_keep'); show tables;"
+    run dolt sql -q "call dolt_checkout('to_keep'); show tables;"
 
     force_delete_main_branch_on_sqlserver
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql \
-        -q "call dolt_checkout('to_keep');"
+    run dolt sql -q "call dolt_checkout('to_keep');"
     [ $status -ne 0 ]
     [[ "$output" =~ "cannot resolve default branch head for database 'dolt_repo_$$'" ]] || false
 }
@@ -98,12 +95,11 @@ force_delete_main_branch_on_sqlserver() {
     make_it
     start_sql_server "dolt_repo_$$"
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql \
-      -q "SET @@GLOBAL.dolt_repo_$$_default_branch = 'to_keep'"
+    dolt sql -q "SET @@GLOBAL.dolt_repo_$$_default_branch = 'to_keep'"
 
     force_delete_main_branch_on_sqlserver
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql -q "describe test"
+    run dolt sql -q "describe test"
     [ $status -eq 0 ]
     [[ "$output" =~ "id" ]] || false
 }
@@ -115,39 +111,38 @@ force_delete_main_branch_on_sqlserver() {
     force_delete_main_branch_on_sqlserver
     
     # Against the default branch it fails
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql -q "SELECT * FROM test"
+    run dolt sql -q "SELECT * FROM test"
     [ $status -ne 0 ] 
 
     # Against to_keep it succeeds
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$/to_keep" sql -q "SELECT * FROM test"
+    dolt --use-db "dolt_repo_$$/to_keep" sql -q "SELECT * FROM test"
 }
 
 @test "deleted-branches: clients can use revision dbs in sql-server when the global default_branch var is set to an invalid branch" {
     make_it
     start_sql_server "dolt_repo_$$"
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql \
-      -q "SET @@GLOBAL.dolt_repo_$$_default_branch = 'this_branch_does_not_exist'"
+    dolt sql -q "SET @@GLOBAL.dolt_repo_$$_default_branch = 'this_branch_does_not_exist'"
 
     # Against the default branch it fails
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql -q "SELECT * FROM test"
+    run dolt sql -q "SELECT * FROM test"
     [ $status -ne 0 ]
 
     # Against main, which exists it succeeds
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$/main" sql -q "SELECT * FROM test"
+    dolt --use-db "dolt_repo_$$/main" sql -q "SELECT * FROM test"
 }
 
 @test "deleted-branches: dolt_checkout() from sql-server works when connected to a revision db and the global default_branch var is set to an invalid branch" {
     make_it
     start_sql_server "dolt_repo_$$"
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql -q "SET @@GLOBAL.dolt_repo_$$_default_branch = 'this_branch_does_not_exist'"
+    dolt sql -q "SET @@GLOBAL.dolt_repo_$$_default_branch = 'this_branch_does_not_exist'"
 
     # We are able to use a database branch revision in the connection string
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$/main" sql -q "SELECT * FROM test;"
+    dolt --use-db "dolt_repo_$$/main" sql -q "SELECT * FROM test;"
 
     # Trying to checkout a new branch works
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$/main" sql -q "CALL DOLT_CHECKOUT('to_keep');"
+    dolt --use-db "dolt_repo_$$/main" sql -q "CALL DOLT_CHECKOUT('to_keep');"
 
     # skip this check because of https://github.com/dolthub/dolt/issues/6160
     # run dolt branch
@@ -161,10 +156,10 @@ force_delete_main_branch_on_sqlserver() {
     force_delete_main_branch_on_sqlserver
 
     # We are able to use a database branch revision in the connection string
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$/to_keep" sql -q "SELECT * FROM test;"
+    dolt --use-db "dolt_repo_$$/to_keep" sql -q "SELECT * FROM test;"
 
     # Trying to checkout a new branch works
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$/to_keep" sql -q "CALL DOLT_CHECKOUT('to_checkout');"
+    dolt --use-db "dolt_repo_$$/to_keep" sql -q "CALL DOLT_CHECKOUT('to_checkout');"
 
     # skip this check because of https://github.com/dolthub/dolt/issues/6160
     # run dolt branch
@@ -176,11 +171,11 @@ force_delete_main_branch_on_sqlserver() {
     dolt branch -c to_keep to_checkout
     start_sql_server "dolt_repo_$$"
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql -q "SET @@GLOBAL.dolt_repo_$$_default_branch = 'to_keep'"
+    dolt sql -q "SET @@GLOBAL.dolt_repo_$$_default_branch = 'to_keep'"
 
     force_delete_main_branch_on_sqlserver
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql -q "SELECT * FROM test"
+    dolt sql -q "SELECT * FROM test"
     
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db "dolt_repo_$$" sql -q "CALL DOLT_CHECKOUT('to_checkout')"
+    dolt sql -q "CALL DOLT_CHECKOUT('to_checkout')"
 }
diff --git a/integration-tests/bats/events.bats b/integration-tests/bats/events.bats
index 299114875c..70b6944e02 100644
--- a/integration-tests/bats/events.bats
+++ b/integration-tests/bats/events.bats
@@ -29,123 +29,123 @@ teardown() {
 }
 
 @test "events: disabling recurring event should not be dropped" {
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "CREATE EVENT insert1 ON SCHEDULE EVERY 1 DAY DO INSERT INTO totals (int_col) VALUES (1);"
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "ALTER EVENT insert1 DISABLE; SELECT * FROM information_schema.events;"
+    dolt sql -q "CREATE EVENT insert1 ON SCHEDULE EVERY 1 DAY DO INSERT INTO totals (int_col) VALUES (1);"
+    run dolt sql -q "ALTER EVENT insert1 DISABLE; SELECT * FROM information_schema.events;"
     [ $status -eq 0 ]
     [[ $output =~ "DISABLED" ]] || false
 }
 
 @test "events: disabling current_timestamp one time event after execution" {
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "CREATE EVENT insert9 ON SCHEDULE AT CURRENT_TIMESTAMP DO INSERT INTO totals (int_col) VALUES (9);"
+    dolt sql -q "CREATE EVENT insert9 ON SCHEDULE AT CURRENT_TIMESTAMP DO INSERT INTO totals (int_col) VALUES (9);"
     # used for debugging
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM totals;"
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM totals;"
+    dolt sql -q "SELECT COUNT(*) FROM totals;"
+    run dolt sql -q "SELECT COUNT(*) FROM totals;"
     [ $status -eq 0 ]
     [[ $output =~ "| 1        |" ]] || false
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM information_schema.events;"
+    run dolt sql -q "SELECT COUNT(*) FROM information_schema.events;"
     [ $status -eq 0 ]
     [[ $output =~ "| 0        |" ]] || false
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "CREATE EVENT insert8 ON SCHEDULE AT CURRENT_TIMESTAMP ON COMPLETION PRESERVE DO INSERT INTO totals (int_col) VALUES (8);"
+    dolt sql -q "CREATE EVENT insert8 ON SCHEDULE AT CURRENT_TIMESTAMP ON COMPLETION PRESERVE DO INSERT INTO totals (int_col) VALUES (8);"
     # used for debugging
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM totals;"
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM totals;"
+    dolt sql -q "SELECT COUNT(*) FROM totals;"
+    run dolt sql -q "SELECT COUNT(*) FROM totals;"
     [ $status -eq 0 ]
     [[ $output =~ "| 2        |" ]] || false
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SHOW CREATE EVENT insert8;"
+    run dolt sql -q "SHOW CREATE EVENT insert8;"
     [ $status -eq 0 ]
     [[ $output =~ "ON COMPLETION PRESERVE DISABLE" ]] || false
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "ALTER EVENT insert8 ON COMPLETION NOT PRESERVE; SELECT COUNT(*) FROM information_schema.events;"
+    run dolt sql -q "ALTER EVENT insert8 ON COMPLETION NOT PRESERVE; SELECT COUNT(*) FROM information_schema.events;"
     [ $status -eq 0 ]
     [[ $output =~ "| 1        |" ]] || false
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "ALTER EVENT insert8 ENABLE; SELECT COUNT(*) FROM information_schema.events;"
+    run dolt sql -q "ALTER EVENT insert8 ENABLE; SELECT COUNT(*) FROM information_schema.events;"
     [ $status -eq 0 ]
     [[ $output =~ "| 0        |" ]] || false
 }
 
 @test "events: disabling future one time event after execution from the scheduler" {
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "CREATE EVENT insert9 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 3 SECOND ON COMPLETION PRESERVE DO INSERT INTO totals (int_col) VALUES (9); SHOW CREATE EVENT insert9;"
+    run dolt sql -q "CREATE EVENT insert9 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 3 SECOND ON COMPLETION PRESERVE DO INSERT INTO totals (int_col) VALUES (9); SHOW CREATE EVENT insert9;"
     [ $status -eq 0 ]
     [[ $output =~ "ON COMPLETION PRESERVE ENABLE" ]] || false
 
     sleep 4
     # used for debugging
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM totals;"
+    dolt sql -q "SELECT COUNT(*) FROM totals;"
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) >= 1 FROM totals;"
+    run dolt sql -q "SELECT COUNT(*) >= 1 FROM totals;"
     [ $status -eq 0 ]
     [[ $output =~ "| 1             |" ]] || false
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM information_schema.events;"
+    run dolt sql -q "SELECT COUNT(*) FROM information_schema.events;"
     [ $status -eq 0 ]
     [[ $output =~ "| 1        |" ]] || false
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SHOW CREATE EVENT insert9;"
+    run dolt sql -q "SHOW CREATE EVENT insert9;"
     [ $status -eq 0 ]
     [[ $output =~ "ON COMPLETION PRESERVE DISABLE" ]] || false
 }
 
 @test "events: recurring event with STARTS and ENDS defined" {
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "CREATE EVENT insert1 ON SCHEDULE EVERY 2 SECOND STARTS CURRENT_TIMESTAMP + INTERVAL 2 SECOND ENDS CURRENT_TIMESTAMP + INTERVAL 5 SECOND DO INSERT INTO totals (int_col) VALUES (1);"
+    dolt sql -q "CREATE EVENT insert1 ON SCHEDULE EVERY 2 SECOND STARTS CURRENT_TIMESTAMP + INTERVAL 2 SECOND ENDS CURRENT_TIMESTAMP + INTERVAL 5 SECOND DO INSERT INTO totals (int_col) VALUES (1);"
     sleep 10
 
     # used for debugging
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM totals;"
+    dolt sql -q "SELECT COUNT(*) FROM totals;"
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) >= 2 FROM totals;"
+    run dolt sql -q "SELECT COUNT(*) >= 2 FROM totals;"
     [ $status -eq 0 ]
     [[ $output =~ "| 1             |" ]] || false
 
     # should be dropped
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM information_schema.events;"
+    run dolt sql -q "SELECT COUNT(*) FROM information_schema.events;"
     [ $status -eq 0 ]
     [[ $output =~ "| 0        |" ]] || false
 }
 
 @test "events: recurring event with ENDS defined" {
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "CREATE EVENT insert1 ON SCHEDULE EVERY 2 SECOND ENDS CURRENT_TIMESTAMP + INTERVAL 3 SECOND ON COMPLETION PRESERVE DO INSERT INTO totals (int_col) VALUES (1); SELECT SLEEP(5);"
+    dolt sql -q "CREATE EVENT insert1 ON SCHEDULE EVERY 2 SECOND ENDS CURRENT_TIMESTAMP + INTERVAL 3 SECOND ON COMPLETION PRESERVE DO INSERT INTO totals (int_col) VALUES (1); SELECT SLEEP(5);"
     sleep 3
 
     # used for debugging
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM totals;"
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM totals;"
+    dolt sql -q "SELECT COUNT(*) FROM totals;"
+    run dolt sql -q "SELECT COUNT(*) FROM totals;"
     [ $status -eq 0 ]
     [[ $output =~ "| 2        |" ]] || false
 
     # should be disabled
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT * FROM information_schema.events;"
+    run dolt sql -q "SELECT * FROM information_schema.events;"
     [ $status -eq 0 ]
     [[ $output =~ "DISABLED" ]] || false
 }
 
 @test "events: checking out a branch should disable all events leaving the working set dirty" {
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "CREATE EVENT insert1 ON SCHEDULE EVERY 2 SECOND ENDS CURRENT_TIMESTAMP + INTERVAL 3 SECOND ON COMPLETION PRESERVE DO INSERT INTO totals (int_col) VALUES (1); SELECT SLEEP(5);"
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "CALL DOLT_COMMIT('-am','commit event changes to totals table')"
+    dolt sql -q "CREATE EVENT insert1 ON SCHEDULE EVERY 2 SECOND ENDS CURRENT_TIMESTAMP + INTERVAL 3 SECOND ON COMPLETION PRESERVE DO INSERT INTO totals (int_col) VALUES (1); SELECT SLEEP(5);"
+    dolt sql -q "CALL DOLT_COMMIT('-am','commit event changes to totals table')"
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "CALL DOLT_CHECKOUT('-b','newbranch')"
+    dolt sql -q "CALL DOLT_CHECKOUT('-b','newbranch')"
     # should be disabled
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT * FROM information_schema.events;"
+    run dolt sql -q "SELECT * FROM information_schema.events;"
     [ $status -eq 0 ]
     [[ $output =~ "DISABLED" ]] || false
 }
 
 @test "events: events on default branch still run after switching to non-default branch" {
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "CREATE EVENT insert1 ON SCHEDULE EVERY 3 SECOND ENDS CURRENT_TIMESTAMP + INTERVAL 3 MINUTE DO INSERT INTO totals (int_col) VALUES (1);"
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "CALL DOLT_COMMIT('-Am','commit with an event');"
+    dolt sql -q "CREATE EVENT insert1 ON SCHEDULE EVERY 3 SECOND ENDS CURRENT_TIMESTAMP + INTERVAL 3 MINUTE DO INSERT INTO totals (int_col) VALUES (1);"
+    dolt sql -q "CALL DOLT_COMMIT('-Am','commit with an event');"
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "CALL DOLT_CHECKOUT('-b','newbranch');"
+    dolt sql -q "CALL DOLT_CHECKOUT('-b','newbranch');"
     # should be disabled
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM totals;"
+    run dolt sql -q "SELECT COUNT(*) FROM totals;"
     [ $status -eq 0 ]
     [[ $output =~ "| 1        |" ]] || false
 
     # While we are sleeping, the event executor should still be running our event on schedule, on the main branch
     sleep 5
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "CALL DOLT_CHECKOUT('main'); SELECT COUNT(*) FROM totals;"
+    run dolt sql -q "CALL DOLT_CHECKOUT('main'); SELECT COUNT(*) FROM totals;"
     [ $status -eq 0 ]
     [[ ! $output =~ "| 1        |" ]] || false
 }
@@ -171,14 +171,14 @@ delimiter ;
 SQL
 
     # Verify that our event ran correctly and inserted three rows
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT * FROM totals;"
+    run dolt sql -q "SELECT * FROM totals;"
     [ $status -eq 0 ]
     [[ $output =~ "| 1  | 111     |" ]] || false
     [[ $output =~ "| 2  | 222     |" ]] || false
     [[ $output =~ "| 3  | 333     |" ]] || false
 
     # Verify that the event did not persist after execution
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM information_schema.events;"
+    run dolt sql -q "SELECT COUNT(*) FROM information_schema.events;"
     [ $status -eq 0 ]
     [[ $output =~ "| 0        |" ]] || false
 }
@@ -210,15 +210,15 @@ delimiter ;
 SQL
 
     # Verify that our event ran correctly and inserted one row
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT * FROM totals;"
+    run dolt sql -q "SELECT * FROM totals;"
     [ $status -eq 0 ]
     [[ $output =~ "| 1  | 42      |" ]] || false
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM totals;"
+    run dolt sql -q "SELECT COUNT(*) FROM totals;"
     [ $status -eq 0 ]
     [[ $output =~ "| 1  " ]] || false
 
     # Verify that the event did not persist after execution
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM information_schema.events;"
+    run dolt sql -q "SELECT COUNT(*) FROM information_schema.events;"
     [ $status -eq 0 ]
     [[ $output =~ "| 0        |" ]] || false
 }
@@ -237,7 +237,7 @@ SQL
 
     # Verify that our event IS NOT executing (on a non-main branch)
     sleep 1
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT COUNT(*) FROM totals;"
+    run dolt sql -q "SELECT COUNT(*) FROM totals;"
     [ $status -eq 0 ]
     [[ $output =~ "| 0  " ]] || false
 
@@ -251,16 +251,16 @@ SQL
 
     # Verify that the new event starts executing on main after we merge it over
     sleep 2
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT (SELECT COUNT(*) FROM totals) > 0;"
+    run dolt sql -q "SELECT (SELECT COUNT(*) FROM totals) > 0;"
     [ $status -eq 0 ]
     [[ $output =~ "| 1  " ]] || false
 }
 
 @test "events: restarting a sql-server correctly schedules existing events" {
     # Create the recurring event and make sure it runs at least once
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "CREATE EVENT eventTest1 ON SCHEDULE EVERY 1 SECOND STARTS CURRENT_TIMESTAMP DO INSERT INTO totals (int_col) VALUES (111);"
+    dolt sql -q "CREATE EVENT eventTest1 ON SCHEDULE EVERY 1 SECOND STARTS CURRENT_TIMESTAMP DO INSERT INTO totals (int_col) VALUES (111);"
     sleep 1
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT (SELECT COUNT(*) FROM totals) > 0;"
+    run dolt sql -q "SELECT (SELECT COUNT(*) FROM totals) > 0;"
     [ $status -eq 0 ]
     [[ $output =~ "| 1  " ]] || false
 
@@ -274,7 +274,7 @@ SQL
     # Restart the server and assert that the event gets scheduled and executed again
     start_sql_server
     sleep 1
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "SELECT (SELECT COUNT(*) FROM totals) > 0;"
+    run dolt sql -q "SELECT (SELECT COUNT(*) FROM totals) > 0;"
     [ $status -eq 0 ]
     [[ $output =~ "| 1  " ]] || false
 }
diff --git a/integration-tests/bats/multidb.bats b/integration-tests/bats/multidb.bats
index b90f01f4b6..1e741839c1 100644
--- a/integration-tests/bats/multidb.bats
+++ b/integration-tests/bats/multidb.bats
@@ -30,14 +30,14 @@ teardown() {
 @test "multidb: database default branches" {
     cd dbs1
     start_multi_db_server repo1
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "create database new;
+    dolt sql -q "create database new;
     	 use new;
     	 call dcheckout('-b', 'feat');
     	 create table t (x int);
     	 call dolt_add('.');
     	 call dcommit('-am', 'cm');
     	 set @@global.new_default_branch='feat'"
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 sql -q "use repo1"
+    dolt sql -q "use repo1"
 }
 
 @test "multidb: incompatible BIN FORMATs" {
diff --git a/integration-tests/bats/remotes-sql-server.bats b/integration-tests/bats/remotes-sql-server.bats
index 23b13aaaaf..6ba4e28549 100644
--- a/integration-tests/bats/remotes-sql-server.bats
+++ b/integration-tests/bats/remotes-sql-server.bats
@@ -49,14 +49,14 @@ teardown() {
     dolt checkout -b other
     start_sql_server repo1
 
-    run dolt --use-db repo1 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "call dolt_push()"
+    run dolt sql -q "call dolt_push()"
     [ $status -ne 0 ]
     [[ "$output" =~ "The current branch other has no upstream branch" ]] || false
 
-    dolt --use-db repo1 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "call dolt_push('--set-upstream', 'origin', 'other')"
+    dolt sql -q "call dolt_push('--set-upstream', 'origin', 'other')"
 
     skip "In-memory branch doesn't track upstream"
-    dolt --use-db repo1 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "call dolt_push()"
+    dolt sql -q "call dolt_push()"
 }
 
 @test "remotes-sql-server: push on sql-session commit" {
@@ -66,7 +66,7 @@ teardown() {
     dolt config --local --add sqlserver.global.dolt_replicate_to_remote remote1
     start_sql_server repo1
 
-    dolt --use-db repo1 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "CALL DOLT_COMMIT('-am', 'Step 1');"
+    dolt sql -q "CALL DOLT_COMMIT('-am', 'Step 1');"
     stop_sql_server 1 && sleep 0.5
 
     cd ../repo2
@@ -89,7 +89,7 @@ teardown() {
 
     start_sql_server repo1
 
-    dolt --use-db repo1 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "CALL DOLT_COMMIT('-am', 'Step 1');"
+    dolt sql -q "CALL DOLT_COMMIT('-am', 'Step 1');"
 
     # wait for the process to exit after we stop it
     stop_sql_server 1
@@ -117,7 +117,7 @@ teardown() {
     dolt config --local --add sqlserver.global.dolt_replicate_heads main
     start_sql_server repo2 && sleep 1
 
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables" --result-format csv
+    run dolt sql -q "show tables" --result-format csv
     [ $status -eq 0 ]
     [[ "$output" =~ "Tables_in_repo2" ]] || false
     [[ "$output" =~ "test" ]] || false
@@ -132,7 +132,7 @@ teardown() {
 
     start_sql_server repo1 ./server-log.txt
 
-    run dolt --use-db repo1 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
+    run dolt sql -q "show tables"
     [ $status -eq 0 ]
     [[ "$output" =~ "Table" ]] || false
 
@@ -150,7 +150,7 @@ teardown() {
 
     start_sql_server repo1 ./server-log.txt
 
-    run dolt --use-db repo1 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
+    run dolt sql -q "show tables"
     [ $status -eq 0 ]
     [[ "$output" =~ "Table" ]] || false
 
@@ -166,7 +166,7 @@ teardown() {
 
     start_sql_server repo1 ./server-log.txt
 
-    run dolt --use-db repo1 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
+    run dolt sql -q "show tables"
     [[ "$output" =~ "Table" ]] || false
 
     run grep 'replication disabled' ./server-log.txt
@@ -181,7 +181,7 @@ teardown() {
     dolt config --local --add sqlserver.global.dolt_replicate_to_remote unknown
     start_sql_server repo1
 
-    run dolt --use-db repo1 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
+    run dolt sql -q "show tables"
     [ $status -eq 0 ]
     [[ "$output" =~ "Tables_in_repo1" ]] || false
     [[ "$output" =~ "test" ]] || false
@@ -200,11 +200,11 @@ teardown() {
     dolt config --local --add sqlserver.global.dolt_replicate_heads main,new_feature
     start_sql_server repo2
 
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "call dolt_checkout('new_feature')"
+    run dolt sql -q "call dolt_checkout('new_feature')"
     [ $status -eq 0 ]
     [[ "$output" =~ "0" ]] || false
     
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "select name from dolt_branches order by name"
+    run dolt sql -q "select name from dolt_branches order by name"
     [ $status -eq 0 ]
     [[ "$output" =~ "name" ]] || false
     [[ "$output" =~ "main" ]] || false
@@ -231,14 +231,14 @@ teardown() {
     start_sql_server repo2
 
     # No data on main
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
+    run dolt sql -q "show tables"
     [ $status -eq 0 ]
     [ "$output" = "" ]
 
     # Connecting to heads that exist only on the remote should work fine (they get fetched)
-    dolt --use-db "repo2/b1" -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "show tables"
-    dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q 'use `repo2/b2`'
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q 'select * from `repo2/b2`.test'
+    dolt --use-db "repo2/b1" sql -q "show tables"
+    dolt sql -q 'use `repo2/b2`'
+    run dolt sql -q 'select * from `repo2/b2`.test'
     [ $status -eq 0 ]
     [[ "$output" =~ "pk" ]] || false
     [[ "$output" =~ " 0 " ]] || false
@@ -246,7 +246,7 @@ teardown() {
     [[ "$output" =~ " 2 " ]] || false
 
     # Remote branch we have never USEd before
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q 'select * from `repo2/b3`.test'
+    run dolt sql -q 'select * from `repo2/b3`.test'
     [ $status -eq 0 ]
     [[ "$output" =~ "pk" ]] || false
     [[ "$output" =~ " 0 " ]] || false
@@ -254,11 +254,11 @@ teardown() {
     [[ "$output" =~ " 2 " ]] || false
     
     # Connecting to heads that don't exist should error out
-    run dolt --use-db "repo2/notexist" -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q 'use `repo2/b2`'
+    run dolt --use-db "repo2/notexist" sql -q 'use `repo2/b2`'
     [ $status -ne 0 ]
     [[ $output =~ "database not found" ]] || false
     
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q 'use `repo2/notexist`'
+    run dolt sql -q 'use `repo2/notexist`'
     [ $status -ne 0 ]
     [[ $output =~ "database not found" ]] || false
 }
@@ -275,7 +275,7 @@ teardown() {
     dolt config --local --add sqlserver.global.dolt_replicate_heads main
     start_sql_server repo2
 
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
+    run dolt sql -q "show tables"
     [ $status -eq 0 ]
     [[ $output =~ "Tables_in_repo2" ]] || false
     [[ $output =~ "test" ]] || false
@@ -290,7 +290,7 @@ teardown() {
     dolt config --local --add sqlserver.global.dolt_replicate_heads unknown
     start_sql_server repo2
 
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
+    run dolt sql -q "show tables"
     [ $status -ne 0 ]
     [[ "$output" =~ "remote not found: 'unknown'" ]] || false    
 }
@@ -304,7 +304,7 @@ teardown() {
     dolt config --local --add sqlserver.global.dolt_replicate_heads main
     start_sql_server repo2
 
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
+    run dolt sql -q "show tables"
     [ $status -ne 0 ]
     [[ "$output" =~ "remote not found: 'unknown'" ]] || false
 }
@@ -322,7 +322,7 @@ teardown() {
     dolt config --local --add sqlserver.global.dolt_replicate_heads main
     start_sql_server repo2
 
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "SHOW tables"
+    run dolt sql -q "SHOW tables"
     [ $status -eq 0 ]
     [ "$output" = "" ]
 }
@@ -341,11 +341,11 @@ teardown() {
     dolt config --local --add sqlserver.global.dolt_replicate_heads main
     start_sql_server repo2
 
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "SHOW tables"
+    run dolt sql -q "SHOW tables"
     [ $status -eq 0 ]
     [ "$output" = "" ]
 
-    run dolt --use-db "repo2/feature-branch" -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "SHOW Tables"
+    run dolt --use-db "repo2/feature-branch" sql -q "SHOW Tables"
     [ $status -eq 0 ]
     [[ $output =~ "newTable" ]] || false
 }
@@ -363,13 +363,13 @@ teardown() {
     dolt config --local --add sqlserver.global.dolt_replicate_heads main
     start_sql_server repo2
 
-    dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
+    dolt sql -q "show tables"
+    run dolt sql -q "show tables"
     [ $status -eq 0 ]
     [[ $output =~ "Tables_in_repo2" ]] || false
     [[ $output =~ "test" ]] || false
     
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "use \`repo2/$head_hash\`"
+    run dolt sql -q "use \`repo2/$head_hash\`"
     [ $status -eq 0 ]
     [ "$output" = "Database changed" ]
 }
@@ -388,13 +388,13 @@ teardown() {
     dolt tag v1
     start_sql_server repo2
 
-    dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
+    dolt sql -q "show tables"
+    run dolt sql -q "show tables"
     [ $status -eq 0 ]
     [[ $output =~ "Tables_in_repo2" ]] || false
     [[ $output =~ "test" ]] || false
 
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "use \`repo2/v1\`"
+    run dolt sql -q "use \`repo2/v1\`"
     [ $status -eq 0 ]
     [ "$output" = "Database changed" ]
 }
@@ -420,16 +420,16 @@ teardown() {
     start_sql_server repo2
 
     # No data on main
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
+    run dolt sql -q "show tables"
     [ $status -eq 0 ]
     [ "$output" = "" ]
 
-    run dolt --use-db repo2/feature --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "select active_branch()"
+    run dolt --use-db repo2/feature sql -q "select active_branch()"
     [ $status -eq 0 ]
     [[ "$output" =~ "feature" ]] || false
     [[ ! "$output" =~ "main" ]] || false
 
-    run dolt --use-db repo2/feature --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
+    run dolt --use-db repo2/feature sql -q "show tables"
     [ $status -eq 0 ]
     [[ "$output" =~ "Tables_in_repo2/feature" ]] || false
     [[ "$output" =~ "test" ]] || false
@@ -462,11 +462,11 @@ teardown() {
     dolt branch newbranch
     dolt push remote1 newbranch
 
-    run dolt --use-db repo2/feature --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "select active_branch()"
+    run dolt --use-db repo2/feature --port $PORT --host 0.0.0.0 --no-tls -u dolt sql -q "select active_branch()"
     [ $status -eq 0 ]
     [[ "$output" =~ "feature" ]] || false
 
-    run dolt --use-db repo2/newbranch --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "select active_branch()"
+    run dolt --use-db repo2/newbranch --port $PORT --host 0.0.0.0 --no-tls -u dolt sql -q "select active_branch()"
     [ $status -eq 0 ]
     [[ "$output" =~ "newbranch" ]] || false
 
@@ -495,11 +495,11 @@ teardown() {
     start_sql_server repo2 >> server_log.txt 2>&1
 
     # No data on main
-    run dolt --use-db repo2 --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "show tables"
+    run dolt sql -q "show tables"
     [ $status -eq 0 ]
     [ "$output" = "" ]
 
-    run dolt --use-db repo2/feature --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "select active_branch()"
+    run dolt --use-db repo2/feature sql -q "select active_branch()"
     [ $status -eq 1 ]
     [[ "$output" =~ "'feature' matched multiple remote tracking branches" ]] || false
 
diff --git a/integration-tests/bats/replication-multidb.bats b/integration-tests/bats/replication-multidb.bats
index c88c54c320..535ddf2e8c 100644
--- a/integration-tests/bats/replication-multidb.bats
+++ b/integration-tests/bats/replication-multidb.bats
@@ -294,15 +294,15 @@ SQL
     start_multi_db_server repo1
     cd ..
 
-    dolt --use-db repo1 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "create table t1 (a int primary key)"
-    dolt --use-db repo1 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "call dolt_add('.')"
-    dolt --use-db repo1 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "call dolt_commit('-am', 'cm')"
-    dolt --use-db repo2 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "create table t2 (a int primary key)"
-    dolt --use-db repo2 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "call dolt_add('.')"
-    dolt --use-db repo2 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "call dolt_commit('-am', 'cm')"
-    dolt --use-db repo3 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "create table t3 (a int primary key)"
-    dolt --use-db repo3 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "call dolt_add('.')"
-    dolt --use-db repo3 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "call dolt_commit('-am', 'cm')"
+    dolt --use-db repo1 -u dolt --port $PORT --host 0.0.0.0 --no-tls sql -q "create table t1 (a int primary key)"
+    dolt --use-db repo1 -u dolt --port $PORT --host 0.0.0.0 --no-tls sql -q "call dolt_add('.')"
+    dolt --use-db repo1 -u dolt --port $PORT --host 0.0.0.0 --no-tls sql -q "call dolt_commit('-am', 'cm')"
+    dolt --use-db repo2 -u dolt --port $PORT --host 0.0.0.0 --no-tls sql -q "create table t2 (a int primary key)"
+    dolt --use-db repo2 -u dolt --port $PORT --host 0.0.0.0 --no-tls sql -q "call dolt_add('.')"
+    dolt --use-db repo2 -u dolt --port $PORT --host 0.0.0.0 --no-tls sql -q "call dolt_commit('-am', 'cm')"
+    dolt --use-db repo3 -u dolt --port $PORT --host 0.0.0.0 --no-tls sql -q "create table t3 (a int primary key)"
+    dolt --use-db repo3 -u dolt --port $PORT --host 0.0.0.0 --no-tls sql -q "call dolt_add('.')"
+    dolt --use-db repo3 -u dolt --port $PORT --host 0.0.0.0 --no-tls sql -q "call dolt_commit('-am', 'cm')"
 
     clone_helper $TMPDIRS
 
@@ -348,17 +348,17 @@ SQL
     cd dbs1
     start_multi_db_server repo1
     
-    run dolt --use-db repo1 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "show tables"
+    run dolt --use-db repo1 sql -q "show tables"
     [ $status -eq 0 ]
     [[ "$output" =~ Tables_in_repo1 ]] || false
     [[ "$output" =~ t1 ]] || false
     
-    run dolt --use-db repo2 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "show tables"
+    run dolt --use-db repo2 sql -q "show tables"
     [ $status -eq 0 ]
     [[ "$output" =~ Tables_in_repo2 ]] || false
     [[ "$output" =~ t2 ]] || false
     
-    run dolt --use-db repo3 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "show tables"
+    run dolt --use-db repo3 sql -q "show tables"
     [ $status -eq 0 ]
     [[ "$output" =~ Tables_in_repo3 ]] || false
     [[ "$output" =~ t3 ]] || false
@@ -386,12 +386,12 @@ SQL
     cd dbs1
     start_multi_db_server repo1
     
-    run dolt --use-db repo1/b2 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "select * from t1"
+    run dolt --use-db repo1/b2 sql -q "select * from t1"
     [ $status -eq 0 ]
     [[ "$output" =~ 2 ]] || false
     [[ ! "$output" =~ 1 ]] || false
 
-    run dolt --use-db repo1/b2 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "select count(*) from dolt_status"
+    run dolt --use-db repo1/b2 sql -q "select count(*) from dolt_status"
     [ $status -eq 0 ]
     [[ "$output" =~ 0 ]] || false
 
@@ -408,11 +408,11 @@ SQL
     cd dbs1
     start_multi_db_server repo1
     
-    run dolt --use-db repo1/b2 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "select * from t1"
+    run dolt --use-db repo1/b2 sql -q "select * from t1"
     [ $status -eq 0 ]
     [[ "$output" =~ 3 ]] || false
 
-    run dolt --use-db repo1/b2 -u dolt -p "" --port $PORT --host 0.0.0.0 --no-tls sql -q "select count(*) from dolt_status"
+    run dolt --use-db repo1/b2 sql -q "select count(*) from dolt_status"
     [ $status -eq 0 ]
     [[ "$output" =~ 0 ]] || false
 }
diff --git a/integration-tests/bats/sql-charsets-collations.bats b/integration-tests/bats/sql-charsets-collations.bats
index 24a508a626..41fdeee2a8 100644
--- a/integration-tests/bats/sql-charsets-collations.bats
+++ b/integration-tests/bats/sql-charsets-collations.bats
@@ -45,9 +45,9 @@ teardown() {
 
 @test "sql-charsets-collations: define charset and collation on a database" {
     start_sql_server
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db '' sql -q "CREATE DATABASE test CHARACTER SET latin1 COLLATE latin1_swedish_ci;"
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test sql -q "SELECT @@character_set_database; set @@SESSION.character_set_database=latin1"
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test sql -q "SELECT @@character_set_database; set @@SESSION.collation_database=latin1_swedish_ci"
+    dolt sql -q "CREATE DATABASE test CHARACTER SET latin1 COLLATE latin1_swedish_ci;"
+    dolt sql -q "SELECT @@character_set_database; set @@SESSION.character_set_database=latin1"
+    dolt sql -q "SELECT @@character_set_database; set @@SESSION.collation_database=latin1_swedish_ci"
     stop_sql_server
     sleep 0.5
 }
diff --git a/integration-tests/bats/sql-load-data.bats b/integration-tests/bats/sql-load-data.bats
index 29dfbde01b..72f6c31049 100644
--- a/integration-tests/bats/sql-load-data.bats
+++ b/integration-tests/bats/sql-load-data.bats
@@ -578,7 +578,7 @@ SQL
 
     start_sql_server 
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "
+    run dolt sql -q "
 load data local infile 'in.csv' into table t
 fields terminated by ','
 lines terminated by '\n'
@@ -588,7 +588,7 @@ lines terminated by '\n'
 
     # This should work but does not because of dolt sql
     # mysql -e works locally
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" sql -q "
+    run dolt sql -q "
 set global local_infile=1;
 load data local infile 'in.csv' into table t
 fields terminated by ','
@@ -621,11 +621,11 @@ CSV
     start_sql_server
 
     # File not found errors
-    run dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 -u dolt -p "" sql -q "load data infile 'foo.csv' into table t"
+    run dolt sql -q "load data infile 'foo.csv' into table t"
     [ $status -ne 0 ]
     [[ $output =~ "no such file or directory" ]] || false
     
-    dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 -u dolt -p "" sql -q "
+    dolt sql -q "
 load data infile 'in.csv' into table t                                    
 fields terminated by ','
 lines terminated by '\n'
diff --git a/integration-tests/bats/sql-privs.bats b/integration-tests/bats/sql-privs.bats
index 48464132ee..b77607c7a6 100644
--- a/integration-tests/bats/sql-privs.bats
+++ b/integration-tests/bats/sql-privs.bats
@@ -61,12 +61,12 @@ teardown() {
     SQL_USER='root'
     wait_for_connection $PORT 5000
 
-    run dolt -u root --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user order by user"
+    run dolt sql -q "select user from mysql.user order by user"
     [ $status -eq 0 ]
     [[ $output =~ "root" ]] || false
 
-    dolt -u root --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "create user new_user"
-    run dolt -u root --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user order by user"
+    dolt sql -q "create user new_user"
+    run dolt sql -q "select user from mysql.user order by user"
     [ $status -eq 0 ]
     [[ $output =~ "root" ]] || false
     [[ $output =~ "new_user" ]] || false
@@ -81,7 +81,7 @@ teardown() {
     SQL_USER='new_user'
     wait_for_connection $PORT 5000
 
-    run dolt -u root --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user order by user"
+    run dolt -u root sql -q "select user from mysql.user order by user"
     [ $status -ne 0 ]
 }
 
@@ -91,12 +91,12 @@ teardown() {
 
     start_sql_server_with_config test_db server.yaml
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user order by user"
+    run dolt sql -q "select user from mysql.user order by user"
     [ $status -eq 0 ]
     [[ $output =~ "dolt" ]] || false
     
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "create user new_user"
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user order by user"
+    dolt sql -q "create user new_user"
+    run dolt sql -q "select user from mysql.user order by user"
     [ $status -eq 0 ]
     [[ $output =~ "dolt" ]] || false
     [[ $output =~ "new_user" ]] || false
@@ -129,7 +129,7 @@ behavior:
     sleep 5
 
 
-    run dolt -u cmddolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt -u cmddolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ "cmddolt" ]] || false
 }
@@ -156,7 +156,7 @@ behavior:
     SERVER_PID=$!
     sleep 5
 
-    run dolt -u cmddolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt -u cmddolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ "cmddolt" ]] || false
 }
@@ -168,13 +168,13 @@ behavior:
 
     start_sql_server_with_config test_db server.yaml
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
     
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "create user new_user"
+    dolt sql -q "create user new_user"
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
     [[ $output =~ new_user ]] || false
@@ -194,13 +194,13 @@ behavior:
 
     start_sql_server_with_config test_db server.yaml
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "create user new_user"
+    dolt sql -q "create user new_user"
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
     [[ $output =~ new_user ]] || false
@@ -220,14 +220,14 @@ behavior:
 
     start_sql_server_with_args --host 0.0.0.0 --user=dolt --privilege-file=privs.json
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
     [[ $output =~ privs_user ]] || false
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "create user new_user"
+    dolt sql -q "create user new_user"
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
     [[ $output =~ new_user ]] || false
@@ -242,7 +242,7 @@ behavior:
     stop_sql_server
     start_sql_server_with_args --host 0.0.0.0 --user=dolt --privilege-file=privs.json
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
     [[ $output =~ new_user ]] || false
@@ -267,13 +267,13 @@ behavior:
     run ls -a
     ! [[ "$output" =~ ".doltcfg" ]] || false
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "create user new_user"
+    dolt sql -q "create user new_user"
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
     [[ $output =~ new_user ]] || false
@@ -289,7 +289,7 @@ behavior:
     make_test_repo
 
     start_sql_server_with_args --host 127.0.0.1 --user=dolt
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql --result-format csv -q "select user, host from mysql.user order by user"
+    run dolt sql --result-format csv -q "select user, host from mysql.user order by user"
     [ $status -eq 0 ]
     [[ "$output" =~ "dolt,%" ]] || false
 }
@@ -366,13 +366,13 @@ behavior:
     ! [[ "$output" =~ ".doltcfg" ]] || false
     ! [[ "$output" =~ "doltcfgdir" ]] || false
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "create user new_user"
+    dolt sql -q "create user new_user"
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
     [[ $output =~ new_user ]] || false
@@ -394,13 +394,13 @@ behavior:
     ! [[ "$output" =~ ".doltcfg" ]] || false
     ! [[ "$output" =~ "privs.db" ]] || false
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "create user new_user"
+    dolt sql -q "create user new_user"
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
     [[ $output =~ new_user ]] || false
@@ -510,13 +510,13 @@ behavior:
     ! [[ "$output" =~ "doltcfgdir" ]] || false
     ! [[ "$output" =~ "privs.db" ]] || false
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "create user new_user"
+    dolt sql -q "create user new_user"
 
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
     [[ $output =~ new_user ]] || false
@@ -583,7 +583,7 @@ behavior:
     dolt init
     start_sql_server_with_args --host 0.0.0.0 --user=dolt
 
-    dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "create user new_user"
+    dolt sql -q "create user new_user"
     stop_sql_server
     sleep 1
     run ls -a
@@ -593,7 +593,7 @@ behavior:
 
     cd db_dir
     start_sql_server_with_args --host 0.0.0.0 --user=dolt
-    run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db db1 sql -q "select user from mysql.user"
+    run dolt sql -q "select user from mysql.user"
     [ $status -eq 0 ]
     [[ $output =~ dolt ]] || false
     [[ $output =~ new_user ]] || false
@@ -604,54 +604,54 @@ behavior:
      SQL_USER='dolt'
      start_sql_server
 
-     dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "create table t1(c1 int)"
-     dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "create user test"
-     dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "grant select on test_db.* to test"
+     dolt sql -q "create table t1(c1 int)"
+     dolt sql -q "create user test"
+     dolt sql -q "grant select on test_db.* to test"
 
      # Should only see test_db database
-     run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db '' sql -q "show databases"
+     run dolt sql -q "show databases"
      [ $status -eq 0 ]
      [[ $output =~ test_db ]] || false
      
-     run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "show tables"
+     run dolt sql -q "show tables"
      [ $status -eq 0 ]
      [[ $output =~ t1 ]] || false
 
      # check information_schema.SCHEMA_PRIVILEGES table
-     run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select * from information_schema.SCHEMA_PRIVILEGES;"
+     run dolt sql -q "select * from information_schema.SCHEMA_PRIVILEGES;"
      [[ "$output" =~ "| 'test'@'%' | def           | test_db      | SELECT         | NO           |" ]] || false
 
      # Revoke works as expected
-     dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "revoke select on test_db.* from test"
-     run dolt -u test --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "show tables"
+     dolt sql -q "revoke select on test_db.* from test"
+     run dolt -u test sql -q "show tables"
      [ $status -ne 0 ]
 
      # Host in privileges is respected
-     dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "drop user test"
-     dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "create user test@'127.0.0.1'"
-     dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "grant select on test_db.* to test@'127.0.0.1'"
-     run dolt -u dolt --port $PORT --host 127.0.0.1 --no-tls --use-db test_db sql -q "show tables"
+     dolt sql -q "drop user test"
+     dolt sql -q "create user test@'127.0.0.1'"
+     dolt sql -q "grant select on test_db.* to test@'127.0.0.1'"
+     run dolt sql -q "show tables"
      [ $status -eq 0 ]
      [[ $output =~ t1 ]] || false
 
      # check information_schema.SCHEMA_PRIVILEGES table
-     run dolt -u dolt --port $PORT --host 127.0.0.1 --no-tls --use-db test_db sql -q "select * from information_schema.SCHEMA_PRIVILEGES;"
+     run dolt sql -q "select * from information_schema.SCHEMA_PRIVILEGES;"
      [[ "$output" =~ "| 'test'@'127.0.0.1' | def           | test_db      | SELECT         | NO           |" ]] || false
 
-     dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "grant update on test_db.t1 to test@'127.0.0.1'"
+     dolt sql -q "grant update on test_db.t1 to test@'127.0.0.1'"
      # check information_schema.TABLE_PRIVILEGES table
-     run dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select * from information_schema.TABLE_PRIVILEGES;"
+     run dolt sql -q "select * from information_schema.TABLE_PRIVILEGES;"
      [[ "$output" =~ "| 'test'@'127.0.0.1' | def           | test_db      | t1         | UPDATE         | NO           |" ]] || false
 
-     dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "grant insert on *.* to test@'127.0.0.1'"
+     dolt sql -q "grant insert on *.* to test@'127.0.0.1'"
      # check information_schema.USER_PRIVILEGES table
-     run dolt -u test --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "select * from information_schema.USER_PRIVILEGES;"
+     run dolt -u test sql -q "select * from information_schema.USER_PRIVILEGES;"
      [[ "$output" =~ "| 'test'@'127.0.0.1' | def           | INSERT         | NO           |" ]] || false
 
-     dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "drop user test@'127.0.0.1'"
-     dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "create user test@'10.10.10.10'"
-     dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db test_db sql -q "grant select on test_db.* to test@'10.10.10.10'"
-     run dolt -u test --port $PORT --host 127.0.0.1 --no-tls --use-db test_db sql -q "show tables"
+     dolt sql -q "drop user test@'127.0.0.1'"
+     dolt sql -q "create user test@'10.10.10.10'"
+     dolt sql -q "grant select on test_db.* to test@'10.10.10.10'"
+     run dolt -u test sql -q "show tables"
      [ $status -ne 0 ]
 }
 
@@ -659,11 +659,11 @@ behavior:
      make_test_repo
      start_sql_server
 
-     dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db '' sql -q "create user test identified by 'test'"
-     dolt -u dolt --port $PORT --host 0.0.0.0 --no-tls --use-db '' sql -q "grant select on mysql.user to test"
+     dolt sql -q "create user test identified by 'test'"
+     dolt sql -q "grant select on mysql.user to test"
 
      # Should not be able to connect to test_db
-     run dolt --port $PORT --host 0.0.0.0 --no-tls -u test -p test --use-db test_db sql -q "select user from mysql.user order by user"
+     run dolt -u test -p test --use-db test_db sql -q "select user from mysql.user order by user"
      [ $status -ne 0 ]
 
      run dolt --port $PORT --host 0.0.0.0 --no-tls -u test -p test --use-db '' sql -q "select user from mysql.user"
@@ -672,7 +672,7 @@ behavior:
      [[ $output =~ test ]] || false
 
      # Bad password can't connect
-     run dolt --port $PORT --host 0.0.0.0 --no-tls -u test -p bad --use-db '' sql -q "select user from mysql.user order by user"
+     run dolt -u test -p bad --use-db '' sql -q "select user from mysql.user order by user"
      [ $status -ne 0 ]
      
      # Should only see mysql database
diff --git a/integration-tests/bats/sql-server-remotesrv.bats b/integration-tests/bats/sql-server-remotesrv.bats
index f642b5d004..26c78b8121 100644
--- a/integration-tests/bats/sql-server-remotesrv.bats
+++ b/integration-tests/bats/sql-server-remotesrv.bats
@@ -43,7 +43,7 @@ teardown() {
     run dolt sql -q 'select count(*) from vals'
     [[ "$output" =~ "5" ]] || false
 
-    dolt -u root -p "" sql -q "
+    dolt -u root --port 3306 --host localhost --no-tls sql -q "
 use remote;
 insert into vals (i) values (6), (7), (8), (9), (10);
 call dolt_commit('-am', 'add some vals');
@@ -66,7 +66,7 @@ call dolt_commit('-am', 'add some vals');
     # By cloning here, we have a near-at-hand way to wait for the server to be ready.
     dolt clone http://localhost:50051/remote cloned_remote
 
-    dolt -u root -p "" sql -q "
+    dolt -u root --port 3306 --host localhost --no-tls sql -q "
 create database created;
 use created;
 create table vals (i int);
@@ -148,13 +148,13 @@ SQL
     # move CWD to make sure we don't lock ".../read_replica/db"
     mkdir tmp && cd tmp
 
-    dolt -u root -p "" sql -q "
+    dolt -u root --port 3307 --host 127.0.0.1 --no-tls sql -q "
 use db;
 insert into vals values (1), (2), (3), (4), (5);
 call dolt_commit('-am', 'insert 1-5.');
 "
 
-    run dolt --port 3307 --host 127.0.0.1 -u root -p "" sql -q "
+    run dolt --port 3307 --host 127.0.0.1 --no-tls -u root sql -q "
 use db;
 select count(*) from vals;
 "
diff --git a/integration-tests/bats/sql-server.bats b/integration-tests/bats/sql-server.bats
index d0b5e5523f..730b2ee709 100644
--- a/integration-tests/bats/sql-server.bats
+++ b/integration-tests/bats/sql-server.bats
@@ -39,20 +39,20 @@ teardown() {
   # Start a SQL-server and add a new user "user1"
   cd repo1
   start_sql_server
-  dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" --use-db 'repo1' sql -q "create user user1@'%';"
-  dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" --use-db 'repo1' sql -q "grant all privileges on *.* to user1@'%';"
+  dolt sql -q "create user user1@'%';"
+  dolt sql -q "grant all privileges on *.* to user1@'%';"
 
   # By default, commits will be authored by the current sql user (user1)
-  dolt --port $PORT --host 0.0.0.0 --no-tls -u user1 -p "" --use-db 'repo1' sql -q "create table t2(pk int primary key);"
-  dolt --port $PORT --host 0.0.0.0 --no-tls -u user1 -p "" --use-db 'repo1' sql -q "call dolt_commit('-Am', 'committing as user1');"
-  run dolt --port $PORT --host 0.0.0.0 --no-tls -u user1 -p "" --use-db 'repo1' sql -q "select committer, email, message from dolt_log limit 1;"
+  dolt -u user1 sql -q "create table t2(pk int primary key);"
+  dolt -u user1 sql -q "call dolt_commit('-Am', 'committing as user1');"
+  run dolt -u user1 sql -q "select committer, email, message from dolt_log limit 1;"
   [ $status -eq 0 ]
   [[ $output =~ "| user1     | user1@% | committing as user1 |" ]] || false
 
   # If --author is explicitly provided, then always use that, even if dolt_sql_user_is_committer is enabled
-  dolt --port $PORT --host 0.0.0.0 --no-tls -u user1 -p "" --use-db 'repo1' sql -q "create table t3(pk int primary key);"
-  dolt --port $PORT --host 0.0.0.0 --no-tls -u user1 -p "" --use-db 'repo1' sql -q "call dolt_commit('--author', 'barbie <barbie@plastic.com>', '-Am', 'committing as barbie');"
-  run dolt --port $PORT --host 0.0.0.0 --no-tls -u user1 -p "" --use-db 'repo1' sql -q "select committer, email, message from dolt_log limit 1;"
+  dolt -u user1 sql -q "create table t3(pk int primary key);"
+  dolt -u user1 sql -q "call dolt_commit('--author', 'barbie <barbie@plastic.com>', '-Am', 'committing as barbie');"
+  run dolt -u user1 sql -q "select committer, email, message from dolt_log limit 1;"
   [ $status -eq 0 ]
   [[ $output =~ "| barbie    | barbie@plastic.com | committing as barbie |" ]] || false
 }
@@ -72,7 +72,7 @@ EOF
 )
 
     start_sql_server >> server_log.txt 2>&1
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" --use-db '' sql -q "$SAVEPOINT_QUERY"
+    run dolt sql -q "$SAVEPOINT_QUERY"
     [ $status -eq 0 ]
 }
 
@@ -92,14 +92,14 @@ EOF
     # start the server and ensure there are no databases yet
     cd $tempDir/empty_server
     start_sql_server
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" --use-db '' sql -q "show databases"
+    run dolt sql -q "show databases"
     [ $status -eq 0 ]
     [[ $output =~ information_schema ]] || false
     [[ $output =~ mysql ]] || false
 
     # verify that dolt_clone works
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" --use-db '' sql -q "create database test01"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" --use-db 'test01' sql -q "call dolt_clone('file:///$tempDir/remote')"
+    dolt sql -q "create database test01"
+    dolt --use-db 'test01' sql -q "call dolt_clone('file:///$tempDir/remote')"
 }
 
 @test "sql-server: loglevels are case insensitive" {
@@ -109,7 +109,7 @@ EOF
     dolt sql-server --loglevel TrAcE --port=$PORT --user dolt --socket "dolt.$PORT.sock" > log.txt 2>&1 &
     SERVER_PID=$!
     wait_for_connection $PORT 5000
-    dolt --host 0.0.0.0 --port $PORT --no-tls -u dolt -p "" --use-db '' sql -q "show databases;"
+    dolt sql -q "show databases;"
     stop_sql_server
 
     # assert that loglevel in yaml config is not case sensitive
@@ -126,7 +126,7 @@ EOF
     dolt sql-server --config ./config.yml --socket "dolt.$PORT.sock" &
     SERVER_PID=$!
     wait_for_connection $PORT 5000
-    dolt --host 0.0.0.0 --port $PORT --no-tls -u dolt -p "" --use-db '' sql -q "show databases;"
+    dolt sql -q "show databases;"
     stop_sql_server
 }
 
@@ -139,7 +139,7 @@ EOF
     SERVER_PID=$!
     sleep 5
 
-    run dolt --host 0.0.0.0 --port=$PORT --no-tls --user=dolt --password=wrongpassword sql
+    run dolt --user=dolt --password=wrongpassword sql
     [ "$status" -eq 1 ]
     run grep 'Error authenticating user using MySQL native password' log.txt
     [ "$status" -eq 0 ]
@@ -152,10 +152,10 @@ EOF
     dolt branch other
 
     start_sql_server
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" --use-db '' sql -q "SET PERSIST repo1_default_branch = 'dev'"
+    dolt sql -q "SET PERSIST repo1_default_branch = 'dev'"
     stop_sql_server
     start_sql_server
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" --use-db repo1 sql -q "SELECT @@repo1_default_branch;"
+    run dolt --use-db repo1 sql -q "SELECT @@repo1_default_branch;"
     [ $status -eq 0 ]
     [[ $output =~ "@@SESSION.repo1_default_branch" ]] || false
     [[ $output =~ "dev" ]] || false
@@ -227,7 +227,7 @@ user_session_vars:
     [ "$status" -eq 0 ]
     [[ "$output" =~ "No tables in working set" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt -p "" --use-db repo1 sql -q "CREATE TABLE one_pk (
+    dolt sql -q "CREATE TABLE one_pk (
         pk BIGINT NOT NULL,
         c1 BIGINT,
         c2 BIGINT,
@@ -241,7 +241,7 @@ user_session_vars:
     run dolt --verbose-engine-setup --user=dolt sql -q "insert into one_pk values (1,1,1)"
     [ "$status" -eq 0 ]
     [[ "$output" =~ "starting remote mode" ]] || false
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SELECT * FROM one_pk"
+    run dolt sql -q "SELECT * FROM one_pk"
     [ $status -eq 0 ]
     [[ $output =~ " 1 " ]] || false
 
@@ -251,7 +251,7 @@ user_session_vars:
     run dolt table import -u one_pk import.csv
     [ "$status" -eq 1 ]
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SELECT * FROM one_pk"
+    run dolt sql -q "SELECT * FROM one_pk"
     [ $status -eq 0 ]
     ! [[ $output =~ " 2 " ]] || false
 }
@@ -273,12 +273,12 @@ SQL
     start_sql_server repo1
 
     # add some working changes
-    dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 -u dolt sql -q "INSERT INTO test VALUES (7,7);"
+    dolt sql -q "INSERT INTO test VALUES (7,7);"
     run dolt --user=dolt status
     [ "$status" -eq 0 ]
     [[ "$output" =~ "test" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 -u dolt sql -q "CALL DOLT_RESET('--hard');"
+    dolt sql -q "CALL DOLT_RESET('--hard');"
 
     run dolt --user=dolt status
     [ "$status" -eq 0 ]
@@ -287,7 +287,7 @@ SQL
     [ "$status" -eq 0 ]
     [[ "$output" =~ "6,6" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls --use-db repo1 -u dolt sql -q "
+    dolt sql -q "
         INSERT INTO test VALUES (8,8);
         CALL DOLT_RESET('--hard');"
 
@@ -305,14 +305,14 @@ SQL
     start_multi_db_server repo1
 
     # create a table in repo1
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "CREATE TABLE r1_one_pk (
+    dolt sql -q "CREATE TABLE r1_one_pk (
         pk BIGINT NOT NULL COMMENT 'tag:0',
         c1 BIGINT COMMENT 'tag:1',
         c2 BIGINT COMMENT 'tag:2',
         PRIMARY KEY (pk))"
 
     # create a table in repo2
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "USE repo2;
+    dolt sql -q "USE repo2;
     CREATE TABLE r2_one_pk (
         pk BIGINT NOT NULL COMMENT 'tag:0',
         c3 BIGINT COMMENT 'tag:1',
@@ -321,15 +321,15 @@ SQL
     )"
 
     # validate tables in repos
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SHOW tables"
+    run dolt sql -q "SHOW tables"
     [ $status -eq 0 ]
     [[ $output =~ "r1_one_pk" ]] || false
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "USE repo2; SHOW tables"
+    run dolt sql -q "USE repo2; SHOW tables"
     [ $status -eq 0 ]
     [[ $output =~ "r2_one_pk" ]] || false
 
     # put data in both
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "
+    dolt sql -q "
     INSERT INTO r1_one_pk (pk) VALUES (0);
     INSERT INTO r1_one_pk (pk,c1) VALUES (1,1);
     INSERT INTO r1_one_pk (pk,c1,c2) VALUES (2,2,2),(3,3,3);
@@ -338,46 +338,45 @@ SQL
     INSERT INTO r2_one_pk (pk,c3) VALUES (1,1);
     INSERT INTO r2_one_pk (pk,c3,c4) VALUES (2,2,2),(3,3,3)"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql --result-format csv -q "SELECT * FROM repo1.r1_one_pk ORDER BY pk"
-    echo "$output"
+    run dolt sql --result-format csv -q "SELECT * FROM repo1.r1_one_pk ORDER BY pk"
     [ $status -eq 0 ]
     [[ $output =~ "0,," ]] || false
     [[ $output =~ "1,1," ]] || false
     [[ $output =~ "2,2,2" ]] || false
     [[ $output =~ "3,3,3" ]] || false
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo2 sql --result-format csv -q "SELECT * FROM repo2.r2_one_pk ORDER BY pk"
+    run dolt sql --result-format csv -q "SELECT * FROM repo2.r2_one_pk ORDER BY pk"
     [ $status -eq 0 ]
     [[ $output =~ "0,," ]] || false
     [[ $output =~ "1,1," ]] || false
     [[ $output =~ "2,2,2" ]] || false
     [[ $output =~ "3,3,3" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "
+    dolt sql -q "
     DELETE FROM r1_one_pk where pk=0;
     USE repo2;
     DELETE FROM r2_one_pk where pk=0"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql --result-format csv -q "SELECT * FROM repo1.r1_one_pk ORDER BY pk"
+    run dolt sql --result-format csv -q "SELECT * FROM repo1.r1_one_pk ORDER BY pk"
     [ $status -eq 0 ]
     ! [[ $output =~ "0,," ]] || false
     [[ $output =~ "1,1," ]] || false
     [[ $output =~ "2,2,2" ]] || false
     [[ $output =~ "3,3,3" ]] || false
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo2 sql --result-format csv -q "SELECT * FROM repo2.r2_one_pk ORDER BY pk"
+    run dolt sql --result-format csv -q "SELECT * FROM repo2.r2_one_pk ORDER BY pk"
     [ $status -eq 0 ]
     ! [[ $output =~ "0,," ]] || false
     [[ $output =~ "1,1," ]] || false
     [[ $output =~ "2,2,2" ]] || false
     [[ $output =~ "3,3,3" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "
+    dolt sql -q "
     UPDATE r1_one_pk SET c2=1 WHERE pk=1;
     USE repo2;
     UPDATE r2_one_pk SET c4=1 where pk=1"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql --result-format csv -q "SELECT * FROM repo1.r1_one_pk ORDER BY pk"
+    run dolt sql --result-format csv -q "SELECT * FROM repo1.r1_one_pk ORDER BY pk"
     [ $status -eq 0 ]
     ! [[ $output =~ "0,," ]] || false
     ! [[ $output =~ "1,1, " ]] || false
@@ -385,7 +384,7 @@ SQL
     [[ $output =~ "2,2,2" ]] || false
     [[ $output =~ "3,3,3" ]] || false
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo2 sql --result-format csv -q "SELECT * FROM repo2.r2_one_pk ORDER BY pk"
+    run dolt sql --result-format csv -q "SELECT * FROM repo2.r2_one_pk ORDER BY pk"
     [ $status -eq 0 ]
     ! [[ $output =~ "0,," ]] || false
     ! [[ $output =~ "1,1, " ]] || false
@@ -398,14 +397,14 @@ SQL
     start_multi_db_server repo1
 
     # create a table in repo1
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "CREATE TABLE repo1.r1_one_pk (
+    dolt sql -q "CREATE TABLE repo1.r1_one_pk (
         pk BIGINT NOT NULL COMMENT 'tag:0',
         c1 BIGINT COMMENT 'tag:1',
         c2 BIGINT COMMENT 'tag:2',
         PRIMARY KEY (pk))"
 
     # create a table in repo2
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "CREATE TABLE repo2.r2_one_pk (
+    dolt sql -q "CREATE TABLE repo2.r2_one_pk (
         pk BIGINT NOT NULL COMMENT 'tag:0',
         c3 BIGINT COMMENT 'tag:1',
         c4 BIGINT COMMENT 'tag:2',
@@ -413,57 +412,57 @@ SQL
     )"
 
     # validate tables in repos
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SHOW tables"
+    run dolt --use-db repo1 sql -q "SHOW tables"
     [ $status -eq 0 ]
     [[ $output =~ "r1_one_pk" ]] || false
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo2 sql -q "SHOW tables"
+    run dolt --use-db repo2 sql -q "SHOW tables"
     [ $status -eq 0 ]
     [[ $output =~ "r2_one_pk" ]] || false
 
     # put data in both using database scoped inserts
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "INSERT INTO repo1.r1_one_pk (pk) VALUES (0)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "INSERT INTO repo1.r1_one_pk (pk,c1) VALUES (1,1)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "INSERT INTO repo1.r1_one_pk (pk,c1,c2) VALUES (2,2,2),(3,3,3)"
+    dolt sql -q "INSERT INTO repo1.r1_one_pk (pk) VALUES (0)"
+    dolt sql -q "INSERT INTO repo1.r1_one_pk (pk,c1) VALUES (1,1)"
+    dolt sql -q "INSERT INTO repo1.r1_one_pk (pk,c1,c2) VALUES (2,2,2),(3,3,3)"
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "INSERT INTO repo2.r2_one_pk (pk) VALUES (0)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "INSERT INTO repo2.r2_one_pk (pk,c3) VALUES (1,1)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "INSERT INTO repo2.r2_one_pk (pk,c3,c4) VALUES (2,2,2),(3,3,3)"
+    dolt sql -q "INSERT INTO repo2.r2_one_pk (pk) VALUES (0)"
+    dolt sql -q "INSERT INTO repo2.r2_one_pk (pk,c3) VALUES (1,1)"
+    dolt sql -q "INSERT INTO repo2.r2_one_pk (pk,c3,c4) VALUES (2,2,2),(3,3,3)"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql --result-format csv -q "SELECT * FROM repo1.r1_one_pk ORDER BY pk"
+    run dolt sql --result-format csv -q "SELECT * FROM repo1.r1_one_pk ORDER BY pk"
     [ $status -eq 0 ]
     [[ $output =~ "0,," ]] || false
     [[ $output =~ "1,1," ]] || false
     [[ $output =~ "2,2,2" ]] || false
     [[ $output =~ "3,3,3" ]] || false
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql --result-format csv -q "SELECT * FROM repo2.r2_one_pk ORDER BY pk"
+    run dolt sql --result-format csv -q "SELECT * FROM repo2.r2_one_pk ORDER BY pk"
     [ $status -eq 0 ]
     [[ $output =~ "0,," ]] || false
     [[ $output =~ "1,1," ]] || false
     [[ $output =~ "2,2,2" ]] || false
     [[ $output =~ "3,3,3" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "DELETE FROM repo1.r1_one_pk where pk=0"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "DELETE FROM repo2.r2_one_pk where pk=0"
+    dolt sql -q "DELETE FROM repo1.r1_one_pk where pk=0"
+    dolt sql -q "DELETE FROM repo2.r2_one_pk where pk=0"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql --result-format csv -q "SELECT * FROM repo1.r1_one_pk ORDER BY pk"
+    run dolt sql --result-format csv -q "SELECT * FROM repo1.r1_one_pk ORDER BY pk"
     [ $status -eq 0 ]
     ! [[ $output =~ "0,," ]] || false
     [[ $output =~ "1,1," ]] || false
     [[ $output =~ "2,2,2" ]] || false
     [[ $output =~ "3,3,3" ]] || false
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql --result-format csv -q "SELECT * FROM repo2.r2_one_pk ORDER BY pk"
+    run dolt sql --result-format csv -q "SELECT * FROM repo2.r2_one_pk ORDER BY pk"
     [ $status -eq 0 ]
     ! [[ $output =~ "0,," ]] || false
     [[ $output =~ "1,1," ]] || false
     [[ $output =~ "2,2,2" ]] || false
     [[ $output =~ "3,3,3" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "UPDATE repo1.r1_one_pk SET c2=1 WHERE pk=1"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "UPDATE repo2.r2_one_pk SET c4=1 where pk=1"
+    dolt sql -q "UPDATE repo1.r1_one_pk SET c2=1 WHERE pk=1"
+    dolt sql -q "UPDATE repo2.r2_one_pk SET c4=1 where pk=1"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql --result-format csv -q "SELECT * FROM repo1.r1_one_pk ORDER BY pk"
+    run dolt sql --result-format csv -q "SELECT * FROM repo1.r1_one_pk ORDER BY pk"
     [ $status -eq 0 ]
     ! [[ $output =~ "0,," ]] || false
     ! [[ $output =~ "1,1, " ]] || false
@@ -471,7 +470,7 @@ SQL
     [[ $output =~ "2,2,2" ]] || false
     [[ $output =~ "3,3,3" ]] || false
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql --result-format csv -q "SELECT * FROM repo2.r2_one_pk ORDER BY pk"
+    run dolt sql --result-format csv -q "SELECT * FROM repo2.r2_one_pk ORDER BY pk"
     [ $status -eq 0 ]
     ! [[ $output =~ "0,," ]] || false
     ! [[ $output =~ "1,1, " ]] || false
@@ -486,21 +485,21 @@ SQL
      cd repo1
      start_sql_server repo1
 
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "CREATE TABLE test (
+     dolt sql -q "CREATE TABLE test (
          pk int primary key
      )"
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "INSERT INTO test VALUES (0),(1),(2)"
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "CALL DOLT_ADD('test')"
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "CALL DOLT_COMMIT('-a', '-m', 'Step 1')"
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "CALL DOLT_CHECKOUT('-b', 'feature-branch')"
+     dolt sql -q "INSERT INTO test VALUES (0),(1),(2)"
+     dolt sql -q "CALL DOLT_ADD('test')"
+     dolt sql -q "CALL DOLT_COMMIT('-a', '-m', 'Step 1')"
+     dolt sql -q "CALL DOLT_CHECKOUT('-b', 'feature-branch')"
 
-     run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SELECT * FROM test"
+     run dolt sql -q "SELECT * FROM test"
      [ $status -eq 0 ]
      [[ $output =~ " 0 " ]] || false
      [[ $output =~ " 1 " ]] || false
      [[ $output =~ " 2 " ]] || false
 
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "
+     dolt sql -q "
      CALL DOLT_CHECKOUT('feature-branch');
      INSERT INTO test VALUES (3);
      INSERT INTO test VALUES (4);
@@ -509,7 +508,7 @@ SQL
      UPDATE test SET pk=21 WHERE pk=21232;
      "
 
-     run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SELECT * FROM test"
+     run dolt sql -q "SELECT * FROM test"
      [ $status -eq 0 ]
      [[ $output =~ " 0 " ]] || false
      [[ $output =~ " 1 " ]] || false
@@ -517,12 +516,12 @@ SQL
      ! [[ $output =~ " 3 " ]] || false
      ! [[ $output =~ " 21 " ]] || false
 
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "
+     dolt sql -q "
      CALL DOLT_CHECKOUT('feature-branch');
      CALL DOLT_COMMIT('-a', '-m', 'Insert 3');
      "
 
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "
+     dolt sql -q "
      INSERT INTO test VALUES (500000);
      INSERT INTO test VALUES (500001);
      DELETE FROM test WHERE pk=500001;
@@ -532,7 +531,7 @@ SQL
      CALL DOLT_MERGE('feature-branch','-m','merge feature-branch');
      "
 
-     run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SELECT * FROM test"
+     run dolt sql -q "SELECT * FROM test"
      [ $status -eq 0 ]
      [[ $output =~ " 0 " ]] || false
      [[ $output =~ " 1 " ]] || false
@@ -551,7 +550,7 @@ SQL
     dolt branch branch1
     start_sql_server repo1
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "CALL DOLT_CHECKOUT('branch1'); CALL DOLT_BRANCH('-D', 'main');"
+    run dolt sql -q "CALL DOLT_CHECKOUT('branch1'); CALL DOLT_BRANCH('-D', 'main');"
     [ $status -eq 1 ]
     [[ $output =~ "default branch for database 'repo1'" ]] || false
 }
@@ -562,7 +561,7 @@ SQL
      cd repo1
      start_sql_server repo1
 
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "
+     dolt sql -q "
      CREATE TABLE test (
           pk int primary key
      );
@@ -577,7 +576,7 @@ SQL
      call dolt_merge('feature-branch');
      "
 
-     run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SELECT * FROM test"
+     run dolt sql -q "SELECT * FROM test"
      [ $status -eq 0 ]
      echo $output
      [[ $output =~ " 1 " ]] || false
@@ -586,7 +585,7 @@ SQL
      [[ $output =~ " 1000 " ]] || false
      ! [[ $output =~ " 0 " ]] || false
 
-     run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SELECT COUNT(*) FROM dolt_log"
+     run dolt sql -q "SELECT COUNT(*) FROM dolt_log"
      [ $status -eq 0 ]
      [[ $output =~ " 3 " ]] || false
 }
@@ -597,66 +596,66 @@ SQL
      start_multi_db_server repo1
 
      # create table with autocommit on and verify table creation
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "CREATE TABLE repo2.one_pk (
+     dolt sql -q "CREATE TABLE repo2.one_pk (
         pk int,
         PRIMARY KEY (pk))"
 
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "INSERT INTO repo2.one_pk VALUES (0), (1), (2)"
-     run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "SELECT * FROM repo2.one_pk"
+     dolt sql -q "INSERT INTO repo2.one_pk VALUES (0), (1), (2)"
+     run dolt sql -q "SELECT * FROM repo2.one_pk"
      [ $status -eq 0 ]
      [[ $output =~ " 0 " ]] || false
      [[ $output =~ " 1 " ]] || false
      [[ $output =~ " 2 " ]] || false
 
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "UPDATE repo2.one_pk SET pk=3 WHERE pk=2"
-     run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "SELECT * FROM repo2.one_pk"
+     dolt sql -q "UPDATE repo2.one_pk SET pk=3 WHERE pk=2"
+     run dolt sql -q "SELECT * FROM repo2.one_pk"
      [ $status -eq 0 ]
      [[ $output =~ " 0 " ]] || false
      [[ $output =~ " 1 " ]] || false
      [[ $output =~ " 3 " ]] || false
      ! [[ $output =~ " 2 " ]] || false
 
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "DELETE FROM repo2.one_pk WHERE pk=3"
-     run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "SELECT * FROM repo2.one_pk"
+     dolt sql -q "DELETE FROM repo2.one_pk WHERE pk=3"
+     run dolt sql -q "SELECT * FROM repo2.one_pk"
      [ $status -eq 0 ]
      [[ $output =~ " 0 " ]] || false
      [[ $output =~ " 1 " ]] || false
      ! [[ $output =~ " 3 " ]] || false
 
      # Empty commit statements should not error
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "commit"
+     dolt sql -q "commit"
 
      # create a new database and table and rerun
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "CREATE DATABASE testdb"
+     dolt sql -q "CREATE DATABASE testdb"
      dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "CREATE TABLE testdb.one_pk (
         pk int,
         PRIMARY KEY (pk))"
 
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "INSERT INTO testdb.one_pk VALUES (0), (1), (2)"
-     run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "SELECT * FROM testdb.one_pk"
+     dolt sql -q "INSERT INTO testdb.one_pk VALUES (0), (1), (2)"
+     run dolt sql -q "SELECT * FROM testdb.one_pk"
      [ $status -eq 0 ]
      [[ $output =~ " 0 " ]] || false
      [[ $output =~ " 1 " ]] || false
      [[ $output =~ " 2 " ]] || false
 
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "UPDATE testdb.one_pk SET pk=3 WHERE pk=2"
-     run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "SELECT * FROM testdb.one_pk"
+     dolt sql -q "UPDATE testdb.one_pk SET pk=3 WHERE pk=2"
+     run dolt sql -q "SELECT * FROM testdb.one_pk"
      [ $status -eq 0 ]
      [[ $output =~ " 0 " ]] || false
      [[ $output =~ " 1 " ]] || false
      [[ $output =~ " 3 " ]] || false
      ! [[ $output =~ " 2 " ]] || false
 
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "DELETE FROM testdb.one_pk WHERE pk=3"
-     run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "SELECT * FROM testdb.one_pk"
+     dolt sql -q "DELETE FROM testdb.one_pk WHERE pk=3"
+     run dolt sql -q "SELECT * FROM testdb.one_pk"
      [ $status -eq 0 ]
      [[ $output =~ " 0 " ]] || false
      [[ $output =~ " 1 " ]] || false
      ! [[ $output =~ " 3 " ]] || false
 
      # one last query on insert db.
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "INSERT INTO repo2.one_pk VALUES (4)"
-     run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "SELECT * FROM repo2.one_pk"
+     dolt sql -q "INSERT INTO repo2.one_pk VALUES (4)"
+     run dolt sql -q "SELECT * FROM repo2.one_pk"
      [ $status -eq 0 ]
      [[ $output =~ " 0 " ]] || false
      [[ $output =~ " 1 " ]] || false
@@ -680,8 +679,8 @@ SQL
 
      start_multi_db_server repo1
 
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "CREATE DATABASE newdb"
-     dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "CREATE TABLE newdb.test (a int primary key)"
+     dolt sql -q "CREATE DATABASE newdb"
+     dolt sql -q "CREATE TABLE newdb.test (a int primary key)"
      stop_sql_server 1
 
      # verify changes outside the session
@@ -698,12 +697,12 @@ SQL
     start_sql_server repo1
 
     # check no tables on main
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SHOW Tables"
+    run dolt sql -q "SHOW Tables"
     [ $status -eq 0 ]
     [ "${#lines[@]}" -eq 0 ]
 
     # make some changes to main and commit to branch test_branch
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "
+    dolt sql -q "
     CALL DOLT_CHECKOUT('main');
     CREATE TABLE one_pk (
         pk BIGINT NOT NULL,
@@ -723,8 +722,8 @@ SQL
     [ "$status" -eq 0 ]
     [[ "$output" =~ "starting remote mode" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "call dolt_add('.')"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "call dolt_commit('-am', 'Dropped table one_pk')"
+    dolt sql -q "call dolt_add('.')"
+    dolt sql -q "call dolt_commit('-am', 'Dropped table one_pk')"
 
     run dolt ls
     [ "$status" -eq 0 ]
@@ -739,17 +738,17 @@ SQL
     dolt checkout main
     start_sql_server repo1
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db "repo1/feature-branch" sql -q "CREATE TABLE test (
+    dolt --use-db "repo1/feature-branch" sql -q "CREATE TABLE test (
         pk int,
         c1 int,
         PRIMARY KEY (pk)
     )"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SHOW Tables"
+    run dolt sql -q "SHOW Tables"
     [ $status -eq 0 ]
     [ "${#lines[@]}" -eq 0 ]
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db "repo1/feature-branch" sql -q "SHOW Tables"
+    run dolt --use-db "repo1/feature-branch" sql -q "SHOW Tables"
     [ $status -eq 0 ]
     [[ $output =~ "feature-branch" ]] || false
     [[ $output =~ "test" ]] || false
@@ -772,22 +771,22 @@ SQL
     # get the second-to-last commit hash
     hash=`dolt log | grep commit | cut -d" " -f2 | tail -n+2 | head -n1`
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db "repo1/$hash" sql -q"select count(*) from test"
+    run dolt --use-db "repo1/$hash" sql -q"select count(*) from test"
     [ $status -eq 0 ]
     [[ $output =~ " 3 " ]] || false
 
     # fails
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db "repo1/$hash" sql -q"insert into test values (7)"
+    run dolt --use-db "repo1/$hash" sql -q"insert into test values (7)"
     [ $status -ne 0 ]
     [[ $output =~ "read-only" ]] || false
 
     # dolt checkout can't create new branches on a read only database
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db "repo1/$hash" sql -q"call dolt_checkout('-b', 'newBranch');"
+    run dolt --use-db "repo1/$hash" sql -q"call dolt_checkout('-b', 'newBranch');"
     [ $status -ne 0 ]
     [[ $output =~ "unable to create new branch in a read-only database" ]] || false
 
     # server should still be alive after an error
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db "repo1/$hash" sql -q"select count(*) from test"
+    run dolt --use-db "repo1/$hash" sql -q"select count(*) from test"
     [ $status -eq 0 ]
     [[ $output =~ " 3 " ]] || false
 }
@@ -800,24 +799,24 @@ SQL
     dolt checkout main
     start_sql_server repo1
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q '
+    run dolt sql -q '
     CALL dolt_checkout("new");
     CREATE TABLE t (a int primary key, b int);
     INSERT INTO t VALUES (2,2),(3,3);'
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SHOW Tables"
+    run dolt sql -q "SHOW Tables"
     [ $status -eq 0 ]
     [ "${#lines[@]}" -eq 0 ]
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "set GLOBAL repo1_default_branch = 'refs/heads/new'"
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "select @@GLOBAL.repo1_default_branch;"
+    dolt sql -q "set GLOBAL repo1_default_branch = 'refs/heads/new'"
+    run dolt sql -q "select @@GLOBAL.repo1_default_branch;"
     [ $status -eq 0 ]
     [[ $output =~ "refs/heads/new" ]] || false
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "select active_branch()"
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "select active_branch()"
+    dolt sql -q "select active_branch()"
+    run dolt sql -q "select active_branch()"
     [ $status -eq 0 ]
     [[ $output =~ "new" ]] || false
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SHOW Tables"
+    run dolt sql -q "SHOW Tables"
     [ $status -eq 0 ]
     [[ $output =~ " t " ]] || false
 }
@@ -830,23 +829,23 @@ SQL
     dolt checkout main
     start_sql_server repo1
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q '
+    run dolt sql -q '
     call dolt_checkout("new");
     CREATE TABLE t (a int primary key, b int);
     INSERT INTO t VALUES (2,2),(3,3);'
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SHOW Tables"
+    run dolt sql -q "SHOW Tables"
     [ $status -eq 0 ]
     [ "${#lines[@]}" -eq 0 ]
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "set GLOBAL repo1_default_branch = 'new'"
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "select @@GLOBAL.repo1_default_branch;"
+    dolt sql -q "set GLOBAL repo1_default_branch = 'new'"
+    run dolt sql -q "select @@GLOBAL.repo1_default_branch;"
     [ $status -eq 0 ]
     [[ $output =~ " new " ]] || false
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "select active_branch()"
+    run dolt sql -q "select active_branch()"
     [ $status -eq 0 ]
     [[ $output =~ " new " ]] || false
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SHOW Tables"
+    run dolt sql -q "SHOW Tables"
     [ $status -eq 0 ]
     [[ $output =~ " t " ]] || false
     stop_sql_server 1
@@ -954,32 +953,31 @@ END""")
     cd repo1
     start_sql_server repo1
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "CREATE TABLE t1(pk bigint primary key auto_increment, val int)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "INSERT INTO t1 (val) VALUES (1)"
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql --result-format=csv -q "SELECT * FROM t1"
-    echo "$output"
+    dolt sql -q "CREATE TABLE t1(pk bigint primary key auto_increment, val int)"
+    dolt sql -q "INSERT INTO t1 (val) VALUES (1)"
+    run dolt sql --result-format=csv -q "SELECT * FROM t1"
     [ $status -eq 0 ]
     [[ $output =~ "1,1" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "INSERT INTO t1 (val) VALUES (2)"
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql --result-format=csv -q "SELECT * FROM t1"
+    dolt sql -q "INSERT INTO t1 (val) VALUES (2)"
+    run dolt sql --result-format=csv -q "SELECT * FROM t1"
     [ $status -eq 0 ]
     [[ $output =~ "1,1" ]] || false
     [[ $output =~ "2,2" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "call dolt_add('.')"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "call dolt_commit('-am', 'table with two values')"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "call dolt_branch('new_branch')"
+    dolt sql -q "call dolt_add('.')"
+    dolt sql -q "call dolt_commit('-am', 'table with two values')"
+    dolt sql -q "call dolt_branch('new_branch')"
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1/new_branch sql -q "INSERT INTO t1 (val) VALUES (3)"
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1/new_branch sql --result-format=csv -q "SELECT * FROM t1"
+    dolt --use-db repo1/new_branch sql -q "INSERT INTO t1 (val) VALUES (3)"
+    run dolt --use-db repo1/new_branch sql --result-format=csv -q "SELECT * FROM t1"
     [ $status -eq 0 ]
     [[ $output =~ "1,1" ]] || false
     [[ $output =~ "2,2" ]] || false
     [[ $output =~ "3,3" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "INSERT INTO t1 (val) VALUES (4)"
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql --result-format=csv -q "SELECT * FROM t1"
+    dolt sql -q "INSERT INTO t1 (val) VALUES (4)"
+    run dolt sql --result-format=csv -q "SELECT * FROM t1"
     [ $status -eq 0 ]
     [[ $output =~ "1,1" ]] || false
     [[ $output =~ "2,2" ]] || false
@@ -987,10 +985,10 @@ END""")
     ! [[ $output =~ "3,3" ]] || false
 
     # drop the table on main, should keep counting from 4
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "drop table t1"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "CREATE TABLE t1(pk bigint primary key auto_increment, val int)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "INSERT INTO t1 (val) VALUES (4)"
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql --result-format=csv -q "SELECT * FROM t1"
+    dolt sql -q "drop table t1"
+    dolt sql -q "CREATE TABLE t1(pk bigint primary key auto_increment, val int)"
+    dolt sql -q "INSERT INTO t1 (val) VALUES (4)"
+    run dolt sql --result-format=csv -q "SELECT * FROM t1"
     [[ $output =~ "4,4" ]] || false
     ! [[ $output =~ "1,1" ]] || false
     ! [[ $output =~ "2,2" ]] || false
@@ -1006,13 +1004,13 @@ END""")
     dolt push origin main
     start_sql_server repo1
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "call  dolt_push()"
+    run dolt sql -q "call  dolt_push()"
     [ $status -ne 0 ]
     [[ "$output" =~ "The current branch main has no upstream branch" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "call dolt_push('--set-upstream', 'origin', 'main')"
+    dolt sql -q "call dolt_push('--set-upstream', 'origin', 'main')"
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "call dolt_push()"
+    dolt sql -q "call dolt_push()"
 }
 
 @test "sql-server: replicate to backup after sql-session commit" {
@@ -1024,10 +1022,10 @@ END""")
     dolt config --local --add sqlserver.global.DOLT_REPLICATE_TO_REMOTE backup1
     start_sql_server repo1
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "CREATE TABLE test (pk int primary key);"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "INSERT INTO test VALUES (0),(1),(2)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "CALL DOLT_ADD('.')"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "CALL DOLT_COMMIT('-m', 'Step 1');"
+    dolt sql -q "CREATE TABLE test (pk int primary key);"
+    dolt sql -q "INSERT INTO test VALUES (0),(1),(2)"
+    dolt sql -q "CALL DOLT_ADD('.')"
+    dolt sql -q "CALL DOLT_COMMIT('-m', 'Step 1');"
     stop_sql_server 1
 
     cd ..
@@ -1047,8 +1045,8 @@ END""")
     mkdir no_dolt && cd no_dolt
     start_sql_server
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "create database test1"
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "show databases"
+    dolt sql -q "create database test1"
+    run dolt sql -q "show databases"
     [ $status -eq 0 ]
     [[ $output =~ "mysql" ]] || false
     [[ $output =~ "information_schema" ]] || false
@@ -1057,16 +1055,16 @@ END""")
     # Make sure the sql-server lock file is set for a newly created database
     [[ -f "$PWD/test1/.dolt/sql-server.lock" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db 'test1' sql -q "create table a(x int)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db 'test1' sql -q "call dolt_add('.')"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db 'test1' sql -q "insert into a values (1), (2)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db 'test1' sql -q "call dolt_commit('-a', '-m', 'new table a')"
+    dolt sql -q "create table a(x int)"
+    dolt sql -q "call dolt_add('.')"
+    dolt sql -q "insert into a values (1), (2)"
+    dolt sql -q "call dolt_commit('-a', '-m', 'new table a')"
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "create database test2"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db 'test2' sql -q "create table b(x int)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db 'test2' sql -q "call dolt_add('.')"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db 'test2' sql -q "insert into b values (1), (2)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db 'test2' sql -q "call dolt_commit('-a', '-m', 'new table b')"
+    dolt sql -q "create database test2"
+    dolt --use-db 'test2' sql -q "create table b(x int)"
+    dolt --use-db 'test2' sql -q "call dolt_add('.')"
+    dolt --use-db 'test2' sql -q "insert into b values (1), (2)"
+    dolt --use-db 'test2' sql -q "call dolt_commit('-a', '-m', 'new table b')"
     stop_sql_server 1
 
     cd test1
@@ -1090,12 +1088,12 @@ END""")
     cd ..
 
     start_sql_server
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "create database test3"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db 'test3' sql -q "create table c(x int)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db 'test3' sql -q "call dolt_add('.')"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db 'test3' sql -q "insert into c values (1), (2)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db 'test3' sql -q "call dolt_commit('-a', '-m', 'new table c')"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "drop database test2"
+    dolt sql -q "create database test3"
+    dolt --use-db 'test3' sql -q "create table c(x int)"
+    dolt --use-db 'test3' sql -q "call dolt_add('.')"
+    dolt --use-db 'test3' sql -q "insert into c values (1), (2)"
+    dolt --use-db 'test3' sql -q "call dolt_commit('-a', '-m', 'new table c')"
+    dolt sql -q "drop database test2"
 
     [ -d test3 ]
     [ ! -d test2 ]
@@ -1103,7 +1101,7 @@ END""")
     # make sure the databases exist on restart
     stop_sql_server
     start_sql_server
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "show databases"
+    run dolt sql -q "show databases"
     [ $status -eq 0 ]
     [[ $output =~ "mysql" ]] || false
     [[ $output =~ "information_schema" ]] || false
@@ -1118,11 +1116,11 @@ END""")
     mkdir no_dolt && cd no_dolt
     start_sql_server
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "create database test1"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "create database test2"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "create database test3"
+    dolt sql -q "create database test1"
+    dolt sql -q "create database test2"
+    dolt sql -q "create database test3"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "show databases"
+    run dolt sql -q "show databases"
     [ $status -eq 0 ]
     [[ $output =~ "mysql" ]] || false
     [[ $output =~ "information_schema" ]] || false
@@ -1130,52 +1128,52 @@ END""")
     [[ $output =~ "test2" ]] || false
     [[ $output =~ "test3" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test1 sql -q "create table a(x int)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test1 sql -q "call dolt_add('.')"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test1 sql -q "insert into a values (1), (2)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test1 sql -q "call dolt_commit('-a', '-m', 'new table a')"
+    dolt --use-db test1 sql -q "create table a(x int)"
+    dolt --use-db test1 sql -q "call dolt_add('.')"
+    dolt --use-db test1 sql -q "insert into a values (1), (2)"
+    dolt --use-db test1 sql -q "call dolt_commit('-a', '-m', 'new table a')"
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test2 sql -q "create table a(x int)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test2 sql -q "call dolt_add('.')"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test2 sql -q "insert into a values (3), (4)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test2 sql -q "call dolt_commit('-a', '-m', 'new table a')"
+    dolt --use-db test2 sql -q "create table a(x int)"
+    dolt --use-db test2 sql -q "call dolt_add('.')"
+    dolt --use-db test2 sql -q "insert into a values (3), (4)"
+    dolt --use-db test2 sql -q "call dolt_commit('-a', '-m', 'new table a')"
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test3 sql -q "create table a(x int)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test3 sql -q "call dolt_add('.')"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test3 sql -q "insert into a values (5), (6)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test3 sql -q "call dolt_commit('-a', '-m', 'new table a')"
+    dolt --use-db test3 sql -q "create table a(x int)"
+    dolt --use-db test3 sql -q "call dolt_add('.')"
+    dolt --use-db test3 sql -q "insert into a values (5), (6)"
+    dolt --use-db test3 sql -q "call dolt_commit('-a', '-m', 'new table a')"
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test1 sql -q "call dolt_branch('newbranch')"
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db "test1/newbranch" sql -q "select * from a"
+    dolt --use-db test1 sql -q "call dolt_branch('newbranch')"
+    run dolt --use-db "test1/newbranch" sql -q "select * from a"
     [ $status -eq 0 ]
     [[ $output =~ " 1 " ]] || false
     [[ $output =~ " 2 " ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test2 sql -q "call dolt_branch('newbranch')"
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db "test2/newbranch" sql -q "select * from a"
+    dolt --use-db test2 sql -q "call dolt_branch('newbranch')"
+    run dolt --use-db "test2/newbranch" sql -q "select * from a"
     [ $status -eq 0 ]
     [[ $output =~ " 3 " ]] || false
     [[ $output =~ " 4 " ]] || false
 
     # uppercase to ensure db names are treated case insensitive
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "drop database TEST1"
+    dolt sql -q "drop database TEST1"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db "test1/newbranch" sql -q "select * from a"
+    run dolt --use-db "test1/newbranch" sql -q "select * from a"
     [ $status -ne 0 ]
-    [[ "$output" =~ "database not found" ]] || false
+    [[ "$output" =~ "The provided --use-db test1 does not exist." ]] || false
 
     # can't drop a branch-qualified database name
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "drop database \`test2/newbranch\`"
+    run dolt sql -q "drop database \`test2/newbranch\`"
     [ $status -ne 0 ]
     [[ "$output" =~ "unable to drop revision database: test2/newbranch" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "drop database TEST2"
+    dolt sql -q "drop database TEST2"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db "test2/newbranch" sql -q "select * from a"
+    run dolt --use-db "test2/newbranch" sql -q "select * from a"
     [ $status -ne 0 ]
-    [[ "$output" =~ "database not found" ]] || false
+    [[ "$output" =~ "The provided --use-db test2 does not exist." ]] || false
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test3 sql -q "select * from a"
+    run dolt --use-db test3 sql -q "select * from a"
     [ $status -eq 0 ]
     [[ $output =~ " 5 " ]] || false
     [[ $output =~ " 6 " ]] || false
@@ -1187,25 +1185,25 @@ END""")
     mkdir no_dolt && cd no_dolt
     start_sql_server
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q"create database Test1"
+    dolt sql -q "create database Test1"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q"show databases"
+    run dolt sql -q "show databases"
     [ $status -eq 0 ]
     [[ $output =~ "mysql" ]] || false
     [[ $output =~ "information_schema" ]] || false
     [[ $output =~ "Test1" ]] || false
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "use test1; create table a(x int);"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "use TEST1; insert into a values (1), (2);"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "use test1; call dolt_add('.'); call dolt_commit('-a', '-m', 'new table a');"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "use test1; call dolt_checkout('-b', 'newbranch');"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "use \`TEST1/newbranch\`; select * from a order by x"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "use \`test1/newbranch\`; select * from a order by x"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "use \`TEST1/NEWBRANCH\`"
+    dolt sql -q "use test1; create table a(x int);"
+    dolt sql -q "use TEST1; insert into a values (1), (2);"
+    dolt sql -q "use test1; call dolt_add('.'); call dolt_commit('-a', '-m', 'new table a');"
+    dolt sql -q "use test1; call dolt_checkout('-b', 'newbranch');"
+    dolt sql -q "use \`TEST1/newbranch\`; select * from a order by x"
+    dolt sql -q "use \`test1/newbranch\`; select * from a order by x"
+    dolt sql -q "use \`TEST1/NEWBRANCH\`"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "create database test2; use test2; select database();"
+    run dolt sql -q "create database test2; use test2; select database();"
     [ $status -eq 0 ]
     [[ $output =~ "test2" ]] || false
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "use test2; drop database TEST2; select database();"
+    run dolt sql -q "use test2; drop database TEST2; select database();"
     [ $status -eq 0 ]
     [[ $output =~ "NULL" ]] || false
 }
@@ -1272,19 +1270,19 @@ END""")
     touch file_exists
     start_sql_server
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "create database test1"
+    dolt sql -q "create database test1"
 
     # Error on creation, already exists
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "create database test1"
+    run dolt sql -q "create database test1"
     [ $status -ne 0 ]
     [[ $output =~ exists ]] || false
 
     # Files / dirs in the way
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "create database dir_exists"
+    run dolt sql -q "create database dir_exists"
     [ $status -ne 0 ]
     [[ $output =~ exists ]] || false
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "create database file_exists"
+    run dolt sql -q "create database file_exists"
     [ $status -ne 0 ]
     [[ $output =~ exists ]] || false
 }
@@ -1295,23 +1293,23 @@ END""")
     cd repo1
     start_sql_server
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "create database test1"
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "show databases"
+    dolt sql -q "create database test1"
+    run dolt sql -q "show databases"
     [ $status -eq 0 ]
     [[ $output =~ "mysql" ]] || false
     [[ $output =~ "information_schema" ]] || false
     [[ $output =~ "test1" ]] || false
     [[ $output =~ "repo1" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test1 sql -q "create table a(x int)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test1 sql -q "call dolt_add('.')"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test1 sql -q "insert into a values (1), (2)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test1 sql -q "call dolt_commit('-a', '-m', 'new table a')"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "create database test2"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test2 sql -q "create table b(x int)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test2 sql -q "call dolt_add('.')"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test2 sql -q "insert into b values (1), (2)"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db test2 sql -q "call dolt_commit('-a', '-m', 'new table b')"
+    dolt --use-db test1 sql -q "create table a(x int)"
+    dolt --use-db test1 sql -q "call dolt_add('.')"
+    dolt --use-db test1 sql -q "insert into a values (1), (2)"
+    dolt --use-db test1 sql -q "call dolt_commit('-a', '-m', 'new table a')"
+    dolt --use-db repo1 sql -q "create database test2"
+    dolt --use-db test2 sql -q "create table b(x int)"
+    dolt --use-db test2 sql -q "call dolt_add('.')"
+    dolt --use-db test2 sql -q "insert into b values (1), (2)"
+    dolt --use-db test2 sql -q "call dolt_commit('-a', '-m', 'new table b')"
     stop_sql_server 1
 
     cd test1
@@ -1335,7 +1333,7 @@ END""")
     cd ../
     # make sure the databases exist on restart
     start_sql_server
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "show databases"
+    run dolt --use-db repo1 sql -q "show databases"
     [ $status -eq 0 ]
     [[ $output =~ "mysql" ]] || false
     [[ $output =~ "information_schema" ]] || false
@@ -1460,7 +1458,7 @@ data_dir: $DATA_DIR
 @test "sql-server: sql-server lock for new databases" {
     cd repo1
     start_sql_server
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "create database newdb"
+    dolt sql -q "create database newdb"
 
     # Make sure the sql-server lock file is set for the new database
     [[ -f "$PWD/newdb/.dolt/sql-server.lock" ]] || false
@@ -1482,7 +1480,7 @@ data_dir: $DATA_DIR
     SERVER_PID=$!
     wait_for_connection $PORT 5000
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo2 sql -q "select 1 as col1"
+    run dolt sql -q "select 1 as col1"
     [ $status -eq 0 ]
     [[ $output =~ col1 ]] || false
     [[ $output =~ " 1 " ]] || false
@@ -1495,7 +1493,7 @@ data_dir: $DATA_DIR
     [ "$status" -eq 0 ]
     [[ "$output" =~ "1" ]] || false
 
-    run dolt --host=0.0.0.0 --port=$PORT --no-tls --user=dolt sql -q "select 1"
+    run dolt sql -q "select 1"
     [ "$status" -eq 0 ]
     [[ "$output" =~ "1" ]] || false
 }
@@ -1510,7 +1508,7 @@ data_dir: $DATA_DIR
     SERVER_PID=$!
     wait_for_connection $PORT 5000
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo2 sql -q "select 1 as col1"
+    run dolt sql -q "select 1 as col1"
     [ $status -eq 0 ]
     [[ $output =~ col1 ]] || false
     [[ $output =~ " 1 " ]] || false
@@ -1570,12 +1568,12 @@ behavior:
     SERVER_PID=$!
     wait_for_connection $PORT 5000
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo2 sql -q "select 1 as col1"
+    run dolt sql -q "select 1 as col1"
     [ $status -eq 0 ]
     [[ $output =~ col1 ]] || false
     [[ $output =~ " 1 " ]] || false
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo2 sql -q "select @@dolt_transaction_commit"
+    run dolt sql -q "select @@dolt_transaction_commit"
     [ $status -eq 0 ]
     [[ $output =~ " 1 " ]] || false
 
@@ -1634,7 +1632,7 @@ behavior:
     [[ "$output" =~ "sql-server.lock" ]] || false
 
     start_sql_server
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo2 sql -q "select 1 as col1"
+    run dolt sql -q "select 1 as col1"
     [ $status -eq 0 ]
     [[ $output =~ col1 ]] || false
     [[ $output =~ " 1 " ]] || false
@@ -1676,7 +1674,7 @@ behavior:
     SERVER_PID=$! # will get killed by teardown_common
     wait_for_connection $PORT 5000
 
-    dolt --host=0.0.0.0 --port=$PORT --no-tls --user=dolt sql -q "create database mydb1;"
+    dolt sql -q "create database mydb1;"
     stop_sql_server 1
     [ -d mydb1 ]
 
@@ -1691,15 +1689,15 @@ behavior:
     cd nodb
     start_sql_server >> server_log.txt 2>&1
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "CREATE DATABASE mydb1"
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "CREATE DATABASE mydb2"
+    dolt sql -q "CREATE DATABASE mydb1"
+    dolt sql -q "CREATE DATABASE mydb2"
 
     [ -d mydb1 ]
     [ -d mydb2 ]
 
     rm -rf mydb2
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "SHOW DATABASES"
+    run dolt sql -q "SHOW DATABASES"
     [ $status -eq 0 ]
 
     skip "Forcefully deleting a database doesn't cause direct panics, but also doesn't stop the server"
@@ -1726,12 +1724,12 @@ behavior:
 
     start_sql_server >> server_log.txt 2>&1
     # 'doltdb' will be nested database inside 'mydb'
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "CREATE DATABASE doltdb"
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "SHOW DATABASES"
+    dolt sql -q "CREATE DATABASE doltdb"
+    run dolt sql -q "SHOW DATABASES"
     [[ "$output" =~ "mydb" ]] || false
     [[ "$output" =~ "doltdb" ]] || false
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "DROP DATABASE mydb"
+    dolt sql -q "DROP DATABASE mydb"
     stop_sql_server 1
     [ ! -d .dolt ]
 
@@ -1756,7 +1754,7 @@ behavior:
     [[ "$output" =~ "mydb" ]] || false
 
     start_sql_server >> server_log.txt 2>&1
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "DROP DATABASE mydb;"
+    dolt sql -q "DROP DATABASE mydb;"
 
     run grep "database not found: mydb" server_log.txt
     [ "${#lines[@]}" -eq 0 ]
@@ -1774,16 +1772,16 @@ behavior:
     cd mydbs
 
     start_sql_server >> server_log.txt 2>&1
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "CREATE DATABASE mydb1;"
+    dolt sql -q "CREATE DATABASE mydb1;"
     [ -d mydb1 ]
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "DROP DATABASE mydb1;"
+    dolt sql -q "DROP DATABASE mydb1;"
     [ ! -d mydb1 ]
 
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "CREATE DATABASE mydb1;"
+    dolt sql -q "CREATE DATABASE mydb1;"
     [ -d mydb1 ]
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "SHOW DATABASES;"
+    run dolt sql -q "SHOW DATABASES;"
     [ $status -eq 0 ]
     [[ "$output" =~ "mydb1" ]] || false
 }
@@ -1797,7 +1795,7 @@ behavior:
     cd ..
 
     start_sql_server >> server_log.txt 2>&1
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql -q "DROP DATABASE my_db;"
+    dolt sql -q "DROP DATABASE my_db;"
 
     run grep "database not found: my_db" server_log.txt
     [ "${#lines[@]}" -eq 0 ]
@@ -1844,12 +1842,12 @@ behavior:
 @test "sql-server: locks made in session should be released on session end" {
     start_sql_server
     EXPECTED=$(echo -e "\"GET_LOCK('mylock', 1000)\"\n1\nIS_FREE_LOCK('mylock')\n0")
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql --result-format csv -q "SELECT GET_LOCK('mylock', 1000); SELECT IS_FREE_LOCK('mylock');"
+    run dolt sql --result-format csv -q "SELECT GET_LOCK('mylock', 1000); SELECT IS_FREE_LOCK('mylock');"
     [ $status -eq 0 ]
     [[ "$output" =~ "$EXPECTED" ]] || false
 
     EXPECTED=$(echo -e "IS_FREE_LOCK('mylock')\n1")
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db '' sql --result-format csv -q "SELECT IS_FREE_LOCK('mylock');"
+    run dolt sql --result-format csv -q "SELECT IS_FREE_LOCK('mylock');"
     [ $status -eq 0 ]
     [[ "$output" =~ "$EXPECTED" ]] || false
 }
@@ -1857,9 +1855,9 @@ behavior:
 @test "sql-server: binary literal is printed as hex string for utf8 charset result set" {
     cd repo1
     start_sql_server
-    dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "SET character_set_results = utf8; CREATE TABLE mapping(branch_id binary(16) PRIMARY KEY, user_id binary(16) NOT NULL, company_id binary(16) NOT NULL);"
+    dolt sql -q "SET character_set_results = utf8; CREATE TABLE mapping(branch_id binary(16) PRIMARY KEY, user_id binary(16) NOT NULL, company_id binary(16) NOT NULL);"
 
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "EXPLAIN SELECT m.* FROM mapping m WHERE user_id = uuid_to_bin('1c4c4e33-8ad7-4421-8450-9d5182816ac3');"
+    run dolt sql -q "EXPLAIN SELECT m.* FROM mapping m WHERE user_id = uuid_to_bin('1c4c4e33-8ad7-4421-8450-9d5182816ac3');"
     [ $status -eq 0 ]
     [[ "$output" =~ "0x1C4C4E338AD7442184509D5182816AC3" ]] || false
 }
@@ -1868,7 +1866,7 @@ behavior:
     cd repo1
     dolt branch other
     start_sql_server
-    run dolt --port $PORT --host 0.0.0.0 --no-tls -u dolt --use-db repo1 sql -q "call dolt_checkout('other'); call dolt_branch('-m', 'other', 'newOther'); select active_branch();"
+    run dolt sql -q "call dolt_checkout('other'); call dolt_branch('-m', 'other', 'newOther'); select active_branch();"
     [ $status -eq 0 ]
     [[ "$output" =~ "newOther" ]] || false
     run dolt --user dolt branch