Merge branch 'zachmu/sql-driver-tests' of github.com:dolthub/doltgresql into zachmu/sql-driver-tests

Author: zachmu

integration-tests/go-sql-server-driver/driver/cmd.go

@@ -67,13 +67,15 @@ func init() {
 // server. All of our doltgres binary invocations are done through DoltUser.
 //
 // For our purposes, it does the following:
-// * owns a tmpdir, to which it sets DOLT_ROOT_PATH when invoking doltgres.
-// * writes some initial dolt global config (user.name, user.email,
-//   metrics.disabled = true) into that root path. Doltgres has no `config`
-//   CLI command, so unlike Dolt we write the config file directly.
 //
-// * can create repo stores, which will be a tmpdir to store a data-dir
-//   containing one or more databases.
+//   - owns a tmpdir, to which it sets DOLT_ROOT_PATH when invoking doltgres.
+//
+//   - writes some initial dolt global config (user.name, user.email,
+//     metrics.disabled = true) into that root path. Doltgres has no `config`
+//     CLI command, so unlike Dolt we write the config file directly.
+//
+//   - can create repo stores, which will be a tmpdir to store a data-dir
+//     containing one or more databases.
 type DoltUser struct {
 	tmpdir string
 }

integration-tests/go-sql-server-driver/gencerts_test.go

@@ -22,10 +22,10 @@ import (
 	"crypto/x509/pkix"
 	"encoding/pem"
 	"fmt"
-	"path/filepath"
 	"math/big"
 	"net/url"
 	"os"
+	"path/filepath"
 	"time"
 )
 

integration-tests/go-sql-server-driver/helpers_test.go

@@ -17,8 +17,9 @@ package main
 import (
 	"testing"
 
-	driver "github.com/dolthub/doltgresql/integration-tests/go-sql-server-driver/driver"
 	"github.com/stretchr/testify/require"
+
+	driver "github.com/dolthub/doltgresql/integration-tests/go-sql-server-driver/driver"
 )
 
 // newPorts returns a DynamicResources bound to the global port pool for use in

integration-tests/go-sql-server-driver/testdef.go

@@ -17,21 +17,21 @@ package main
 import (
 	"bytes"
 	"context"
+	"database/sql"
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 	"sync"
 	"testing"
 	"text/template"
 	"time"
 
-	"database/sql"
-	"io"
-
-	driver "github.com/dolthub/doltgresql/integration-tests/go-sql-server-driver/driver"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	yaml "gopkg.in/yaml.v3"
+
+	driver "github.com/dolthub/doltgresql/integration-tests/go-sql-server-driver/driver"
 )
 
 var GlobalPorts GlobalDynamicResources

servercfg/cfgdetails/config.go

@@ -203,10 +203,10 @@ type DoltgresConfig struct {
 // that ported cluster config files parse under UnmarshalStrict. These fields
 // are accepted but not yet wired into the server.
 type DoltgresClusterConfig struct {
-	StandbyRemotes []DoltgresStandbyRemoteConfig    `yaml:"standby_remotes"`
-	BootstrapRole  string                           `yaml:"bootstrap_role"`
-	BootstrapEpoch int                              `yaml:"bootstrap_epoch"`
-	RemotesAPI     DoltgresClusterRemotesAPIConfig  `yaml:"remotesapi"`
+	StandbyRemotes []DoltgresStandbyRemoteConfig   `yaml:"standby_remotes"`
+	BootstrapRole  string                          `yaml:"bootstrap_role"`
+	BootstrapEpoch int                             `yaml:"bootstrap_epoch"`
+	RemotesAPI     DoltgresClusterRemotesAPIConfig `yaml:"remotesapi"`
 }
 
 type DoltgresStandbyRemoteConfig struct {