Merge branch 'main' into nicktobey/autoinclock

.github/workflows/cd-release-pgo.yaml

@@ -1,3 +1,5 @@
+name: Release PGO Dolt
+
 on:
   workflow_dispatch:
     inputs:
@@ -59,7 +61,7 @@ jobs:
       - name: Update dolt version command
         run: sed -i -e 's/	Version = ".*"/	Version = "'"$NEW_VERSION"'"/' "$FILE"
         env:
-          FILE: ${{ format('{0}/go/cmd/dolt/dolt.go', github.workspace) }}
+          FILE: ${{ format('{0}/go/cmd/dolt/doltversion/version.go', github.workspace) }}
           NEW_VERSION: ${{ needs.format-version.outputs.version }}
       - name: Set minver TBD to version
         run: sed -i -e 's/minver:"TBD"/minver:"'"$NEW_VERSION"'"/' "$FILE"

go/cmd/dolt/commands/version.go

@@ -52,6 +52,7 @@ The out-of-date check can be disabled by running {{.EmphasisLeft}}dolt config --
 }
 
 type VersionCmd struct {
+	BinaryName string
 	VersionStr string
 }
 
@@ -90,7 +91,15 @@ func (cmd VersionCmd) Exec(ctx context.Context, commandStr string, args []string
 	help, usage := cli.HelpAndUsagePrinters(cli.CommandDocsForCommandString(commandStr, versionDocs, ap))
 	apr := cli.ParseArgsOrDie(ap, args, help)
 
-	cli.Println("dolt version", cmd.VersionStr)
+	return cmd.ExecWithArgParser(ctx, apr, usage, dEnv)
+}
+
+func (cmd VersionCmd) ExecWithArgParser(ctx context.Context, apr *argparser.ArgParseResults, usage cli.UsagePrinter, dEnv *env.DoltEnv) int {
+	binName := "dolt"
+	if cmd.BinaryName != "" {
+		binName = cmd.BinaryName
+	}
+	cli.Printf("%s version %s\n", binName, cmd.VersionStr)
 
 	versionCheckDisabled := dEnv.Config.GetStringOrDefault(config.VersionCheckDisabled, "false")
 	if versionCheckDisabled == "false" {

go/cmd/dolt/dolt.go

@@ -52,6 +52,7 @@ import (
 	"github.com/dolthub/dolt/go/cmd/dolt/commands/sqlserver"
 	"github.com/dolthub/dolt/go/cmd/dolt/commands/stashcmds"
 	"github.com/dolthub/dolt/go/cmd/dolt/commands/tblcmds"
+	"github.com/dolthub/dolt/go/cmd/dolt/doltversion"
 	"github.com/dolthub/dolt/go/libraries/doltcore/dbfactory"
 	"github.com/dolthub/dolt/go/libraries/doltcore/dconfig"
 	"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
@@ -66,10 +67,6 @@ import (
 	"github.com/dolthub/dolt/go/store/util/tempfiles"
 )
 
-const (
-	Version = "1.35.8"
-)
-
 var dumpDocsCommand = &commands.DumpDocsCmd{}
 var dumpZshCommand = &commands.GenZshCompCmd{}
 
@@ -81,9 +78,9 @@ var doltSubCommands = []cli.Command{
 	commands.ResetCmd{},
 	commands.CleanCmd{},
 	commands.CommitCmd{},
-	commands.SqlCmd{VersionStr: Version},
+	commands.SqlCmd{VersionStr: doltversion.Version},
 	admin.Commands,
-	sqlserver.SqlServerCmd{VersionStr: Version},
+	sqlserver.SqlServerCmd{VersionStr: doltversion.Version},
 	commands.LogCmd{},
 	commands.ShowCmd{},
 	commands.BranchCmd{},
@@ -115,7 +112,7 @@ var doltSubCommands = []cli.Command{
 	commands.FilterBranchCmd{},
 	commands.MergeBaseCmd{},
 	commands.RootsCmd{},
-	commands.VersionCmd{VersionStr: Version},
+	commands.VersionCmd{VersionStr: doltversion.Version},
 	commands.DumpCmd{},
 	commands.InspectCmd{},
 	dumpDocsCommand,
@@ -131,7 +128,7 @@ var doltSubCommands = []cli.Command{
 
 var commandsWithoutCliCtx = []cli.Command{
 	admin.Commands,
-	sqlserver.SqlServerCmd{VersionStr: Version},
+	sqlserver.SqlServerCmd{VersionStr: doltversion.Version},
 	commands.CloneCmd{},
 	commands.RemoteCmd{},
 	commands.BackupCmd{},
@@ -145,7 +142,7 @@ var commandsWithoutCliCtx = []cli.Command{
 	commands.ReadTablesCmd{},
 	commands.FilterBranchCmd{},
 	commands.RootsCmd{},
-	commands.VersionCmd{VersionStr: Version},
+	commands.VersionCmd{VersionStr: doltversion.Version},
 	commands.DumpCmd{},
 	commands.InspectCmd{},
 	dumpDocsCommand,
@@ -163,14 +160,14 @@ var commandsWithoutGlobalArgSupport = []cli.Command{
 	commands.ReadTablesCmd{},
 	commands.LoginCmd{},
 	credcmds.Commands,
-	sqlserver.SqlServerCmd{VersionStr: Version},
-	commands.VersionCmd{VersionStr: Version},
+	sqlserver.SqlServerCmd{VersionStr: doltversion.Version},
+	commands.VersionCmd{VersionStr: doltversion.Version},
 	commands.ConfigCmd{},
 }
 
 // commands that do not need write access for the current directory
 var commandsWithoutCurrentDirWrites = []cli.Command{
-	commands.VersionCmd{VersionStr: Version},
+	commands.VersionCmd{VersionStr: doltversion.Version},
 	commands.ConfigCmd{},
 	commands.ProfileCmd{},
 }
@@ -220,7 +217,7 @@ func init() {
 	dumpDocsCommand.GlobalDocs = globalDocs
 	dumpDocsCommand.GlobalSpecialMsg = globalSpecialMsg
 	dumpZshCommand.DoltCommand = doltCommand
-	dfunctions.VersionString = Version
+	dfunctions.VersionString = doltversion.Version
 	if _, ok := os.LookupEnv(disableEventFlushEnvVar); ok {
 		eventFlushDisabled = true
 	}
@@ -469,7 +466,7 @@ func runMain() int {
 
 	var fs filesys.Filesys
 	fs = filesys.LocalFS
-	dEnv := env.Load(ctx, env.GetCurrentUserHomeDir, fs, doltdb.LocalDirDoltDB, Version)
+	dEnv := env.Load(ctx, env.GetCurrentUserHomeDir, fs, doltdb.LocalDirDoltDB, doltversion.Version)
 
 	homeDir, err := env.GetCurrentUserHomeDir()
 	if err != nil {
@@ -485,7 +482,7 @@ func runMain() int {
 		metricsEmitter = events.NullEmitter{}
 	}
 
-	events.SetGlobalCollector(events.NewCollector(Version, metricsEmitter))
+	events.SetGlobalCollector(events.NewCollector(doltversion.Version, metricsEmitter))
 
 	if dEnv.CfgLoadErr != nil {
 		cli.PrintErrln(color.RedString("Failed to load the global config. %v", dEnv.CfgLoadErr))
@@ -817,7 +814,7 @@ func emitUsageEvents(emitter events.Emitter, args []string) {
 	// write events
 	collector := events.GlobalCollector()
 	ctx := context.Background()
-	_ = emitter.LogEvents(ctx, Version, collector.Close())
+	_ = emitter.LogEvents(ctx, doltversion.Version, collector.Close())
 
 	// flush events
 	if !eventFlushDisabled && len(args) > 0 && shouldFlushEvents(args[0]) {
@@ -861,7 +858,7 @@ func interceptSendMetrics(ctx context.Context, args []string) (bool, int) {
 	if len(args) < 1 || args[0] != commands.SendMetricsCommand {
 		return false, 0
 	}
-	dEnv := env.LoadWithoutDB(ctx, env.GetCurrentUserHomeDir, filesys.LocalFS, Version)
+	dEnv := env.LoadWithoutDB(ctx, env.GetCurrentUserHomeDir, filesys.LocalFS, doltversion.Version)
 	return true, doltCommand.Exec(ctx, "dolt", args, dEnv, nil)
 }
 

go/cmd/dolt/doltversion/version.go

@@ -0,0 +1,20 @@
+// Copyright 2024 Dolthub, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// dolt is the command line tool for working with Dolt databases.
+package doltversion
+
+const (
+	Version = "1.35.8"
+)

go/libraries/doltcore/sqle/enginetest/dolt_procedure_queries.go

@@ -223,7 +223,10 @@ end
 			"create table t(a int primary key auto_increment, b int);",
 			"create table t2(a int primary key auto_increment, b int);",
 			"call dolt_commit('-Am', 'new table');",
-			`create trigger branch_trigger after insert on t for each row
+		},
+		Assertions: []queries.ScriptTestAssertion{
+			{
+				Query: `create trigger branch_trigger after insert on t for each row
 begin
   declare i int default 1;
 	commits: loop
@@ -248,8 +251,9 @@ begin
 	end loop commits;
 end
 `,
-		},
-		Assertions: []queries.ScriptTestAssertion{
+				Skip:             true, // See https://github.com/dolthub/go-mysql-server/pull/2442
+				SkipResultsCheck: true,
+			},
 			{
 				Query:            "insert into t values (1, 1);",
 				Skip:             true,