merge jennifersp-88ae8c98

.github/workflows/regression-tests.yml

@@ -96,18 +96,6 @@ jobs:
           echo "EOF" >> $GITHUB_OUTPUT
           echo "$output"
 
-      - name: Print main tracker as hex
-        if: steps.check_trackers.outputs.trackers_exist == 'true'
-        run: |
-          cd testing/go/regression/out
-          xxd -p -c 60 results1.trackers
-
-      - name: Print PR tracker as hex
-        if: steps.check_trackers.outputs.trackers_exist == 'true'
-        run: |
-          cd testing/go/regression/out
-          xxd -p -c 60 results2.trackers
-
       - name: Post Comment
         if: steps.build_results.outputs.program_output
         uses: actions/github-script@v6

go.mod

@@ -8,11 +8,11 @@ require (
 	github.com/PuerkitoBio/goquery v1.8.1
 	github.com/cockroachdb/apd/v2 v2.0.3-0.20200518165714-d020e156310a
 	github.com/cockroachdb/errors v1.7.5
-	github.com/dolthub/dolt/go v0.40.5-0.20240918195522-7c2cd69829ec
+	github.com/dolthub/dolt/go v0.40.5-0.20240918224257-88ae8c98593a
 	github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20240827111219-e4bb9ca3442d
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
 	github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662
-	github.com/dolthub/go-mysql-server v0.18.2-0.20240918194055-f75a63f64679
+	github.com/dolthub/go-mysql-server v0.18.2-0.20240918214853-7e76e21750a6
 	github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216
 	github.com/dolthub/vitess v0.0.0-20240916204416-9d4d4a09b1d9
 	github.com/fatih/color v1.13.0

go.sum

@@ -214,8 +214,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/dolthub/dolt/go v0.40.5-0.20240918195522-7c2cd69829ec h1:xuZmCQJrEVSx8Sv3zDkS8dglsLCFV/y90vhgCPSnlH0=
-github.com/dolthub/dolt/go v0.40.5-0.20240918195522-7c2cd69829ec/go.mod h1:ezR9KWGkpIWGHEFPk9GgQfaHyF8PcdTlQbqJUah0GM0=
+github.com/dolthub/dolt/go v0.40.5-0.20240918224257-88ae8c98593a h1:PkWAP7KQ954Plu1qkEYJFTKZVNsud6Vf1sRNzSr6Pmg=
+github.com/dolthub/dolt/go v0.40.5-0.20240918224257-88ae8c98593a/go.mod h1:BQ/uK6QhfC8A0Lfik3JIwdVRY/JyGDsOJt1FkSvqEUk=
 github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20240827111219-e4bb9ca3442d h1:RZkQeYOrDrOWzCxaP2ttkvg4E2TM9n8lnEsIBLKjqkM=
 github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20240827111219-e4bb9ca3442d/go.mod h1:L5RDYZbC9BBWmoU2+TjTekeqqhFXX5EqH9ln00O0stY=
 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww=
@@ -224,8 +224,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
 github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
 github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662 h1:aC17hZD6iwzBwwfO5M+3oBT5E5gGRiQPdn+vzpDXqIA=
 github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
-github.com/dolthub/go-mysql-server v0.18.2-0.20240918194055-f75a63f64679 h1:O6eSicGwVPYnEzE0jgLakX2Ud54p6OGdcaqwBgNB+vU=
-github.com/dolthub/go-mysql-server v0.18.2-0.20240918194055-f75a63f64679/go.mod h1:m88EMm9OthVVa6qIhbpnRDpj/eYUXuNpvY/+0YWKVwc=
+github.com/dolthub/go-mysql-server v0.18.2-0.20240918214853-7e76e21750a6 h1:bqXlOmbV1cX3G83xLz4+czZUsAn4Fp2hRsypkz6N1fM=
+github.com/dolthub/go-mysql-server v0.18.2-0.20240918214853-7e76e21750a6/go.mod h1:m88EMm9OthVVa6qIhbpnRDpj/eYUXuNpvY/+0YWKVwc=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
 github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=

servercfg/config.go

@@ -285,7 +285,7 @@ func (cfg *DoltgresConfig) LogLevel() servercfg.LogLevel {
 	case LogLevel_Fatal:
 		return servercfg.LogLevel_Fatal
 	case LogLevel_Panic:
-		return servercfg.LogLevel_Fatal // TODO: add the panic level
+		return servercfg.LogLevel_Panic
 	default:
 		return servercfg.LogLevel_Info
 	}

testing/go/enginetest/doltgres_engine_test.go

@@ -114,49 +114,25 @@ func TestSingleScript(t *testing.T) {
 
 	var scripts = []queries.ScriptTest{
 		{
-			Name: "Delete branches with dolt_branch procedure",
+			Name: "dolt_reset('--soft') commits the active SQL transaction",
 			SetUpScript: []string{
-				"CALL DOLT_BRANCH('myNewBranch1')",
-				"CALL DOLT_BRANCH('myNewBranch2')",
-				"CALL DOLT_BRANCH('myNewBranch3')",
-				"CALL DOLT_BRANCH('myNewBranchWithCommit')",
-				"CALL DOLT_CHECKOUT('myNewBranchWithCommit')",
-				"CALL DOLT_COMMIT('--allow-empty', '-am', 'empty commit')",
-				"CALL DOLT_CHECKOUT('main')",
+				"create table t (pk int primary key);",
+				"insert into t values (1), (2);",
+				"call dolt_commit('-Am', 'creating table t');",
 			},
 			Assertions: []queries.ScriptTestAssertion{
 				{
-					Query:          "CALL DOLT_BRANCH('-d')",
-					ExpectedErrStr: "error: invalid usage",
+					Query:    "start transaction;",
+					Expected: []sql.Row{},
 				},
 				{
-					Query:          "CALL DOLT_BRANCH('-d', '')",
-					ExpectedErrStr: "error: cannot branch empty string",
-				},
-				{
-					Query:          "CALL DOLT_BRANCH('-d', 'branchDoesNotExist')",
-					ExpectedErrStr: "branch not found",
-				},
-				{
-					Query:    "CALL DOLT_BRANCH('-d', 'myNewBranch1')",
-					Expected: []sql.Row{{0}},
-				},
-				{
-					Query:    "SELECT COUNT(*) FROM DOLT_BRANCHES WHERE NAME='myNewBranch1'",
+					Query:    "call dolt_reset('--soft', 'HEAD~');",
 					Expected: []sql.Row{{0}},
 				},
 				{
-					Query:    "CALL DOLT_BRANCH('-d', 'myNewBranch2', 'myNewBranch3')",
-					Expected: []sql.Row{{0}},
-				},
-				{
-					// Trying to delete a branch with unpushed changes fails without force option
-					Query:          "CALL DOLT_BRANCH('-d', 'myNewBranchWithCommit')",
-					ExpectedErrStr: "branch 'myNewBranchWithCommit' is not fully merged",
-				},
-				{
-					Query:    "CALL DOLT_BRANCH('-df', 'myNewBranchWithCommit')",
-					Expected: []sql.Row{{0}},
+					// dolt_status should only show the unstaged table t being added
+					Query:    "select * from dolt_status",
+					Expected: []sql.Row{{"t", false, "new table"}},
 				},
 			},
 		},
@@ -1093,7 +1069,6 @@ func TestDoltMergeArtifacts(t *testing.T) {
 }
 
 func TestDoltReset(t *testing.T) {
-	t.Skip()
 	h := newDoltgresServerHarness(t)
 	denginetest.RunDoltResetTest(t, h)
 }
@@ -1110,7 +1085,6 @@ func TestDoltGC(t *testing.T) {
 }
 
 func TestDoltCheckout(t *testing.T) {
-	t.Skip("race condition in CI")
 	h := newDoltgresServerHarness(t).WithSkippedQueries([]string{
 		"dolt_checkout and base name resolution", // needs db-qualified table names
 		"branch last checked out is deleted",
@@ -1127,7 +1101,6 @@ func TestDoltCheckoutPrepared(t *testing.T) {
 }
 
 func TestDoltBranch(t *testing.T) {
-	t.Skip("race condition in CI")
 	h := newDoltgresServerHarness(t).WithSkippedQueries([]string{
 		"Create branch from startpoint",  // missing SET @var syntax
 		"Join same table at two commits", // needs different branch-qualified DB syntax

testing/go/enginetest/doltgres_harness_test.go

@@ -637,12 +637,6 @@ func toRow(schema sql.Schema, r []interface{}) (sql.Row, error) {
 			return nil, err
 		}
 
-		// special case: boolean results are returned as strings
-		if val == "t" || val == "f" {
-			row[i] = val == "t"
-			continue
-		}
-
 		row[i], _, err = col.Type.Convert(val)
 		if err != nil {
 			return nil, err