Skip to content

Commit 75d72ee

Browse files
committed
[ga-format-pr] Run scripts/format_repo.sh
1 parent 63f78df commit 75d72ee

5 files changed

Lines changed: 19 additions & 16 deletions

File tree

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,15 @@ func init() {
6767
// server. All of our doltgres binary invocations are done through DoltUser.
6868
//
6969
// For our purposes, it does the following:
70-
// * owns a tmpdir, to which it sets DOLT_ROOT_PATH when invoking doltgres.
71-
// * writes some initial dolt global config (user.name, user.email,
72-
// metrics.disabled = true) into that root path. Doltgres has no `config`
73-
// CLI command, so unlike Dolt we write the config file directly.
7470
//
75-
// * can create repo stores, which will be a tmpdir to store a data-dir
76-
// containing one or more databases.
71+
// - owns a tmpdir, to which it sets DOLT_ROOT_PATH when invoking doltgres.
72+
//
73+
// - writes some initial dolt global config (user.name, user.email,
74+
// metrics.disabled = true) into that root path. Doltgres has no `config`
75+
// CLI command, so unlike Dolt we write the config file directly.
76+
//
77+
// - can create repo stores, which will be a tmpdir to store a data-dir
78+
// containing one or more databases.
7779
type DoltUser struct {
7880
tmpdir string
7981
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"crypto/x509/pkix"
2323
"encoding/pem"
2424
"fmt"
25-
"path/filepath"
2625
"math/big"
2726
"net/url"
2827
"os"
28+
"path/filepath"
2929
"time"
3030
)
3131

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ package main
1717
import (
1818
"testing"
1919

20-
driver "github.com/dolthub/doltgresql/integration-tests/go-sql-server-driver/driver"
2120
"github.com/stretchr/testify/require"
21+
22+
driver "github.com/dolthub/doltgresql/integration-tests/go-sql-server-driver/driver"
2223
)
2324

2425
// newPorts returns a DynamicResources bound to the global port pool for use in

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ package main
1717
import (
1818
"bytes"
1919
"context"
20+
"database/sql"
2021
"fmt"
22+
"io"
2123
"os"
2224
"path/filepath"
2325
"sync"
2426
"testing"
2527
"text/template"
2628
"time"
2729

28-
"database/sql"
29-
"io"
30-
31-
driver "github.com/dolthub/doltgresql/integration-tests/go-sql-server-driver/driver"
3230
"github.com/stretchr/testify/assert"
3331
"github.com/stretchr/testify/require"
3432
yaml "gopkg.in/yaml.v3"
33+
34+
driver "github.com/dolthub/doltgresql/integration-tests/go-sql-server-driver/driver"
3535
)
3636

3737
var GlobalPorts GlobalDynamicResources

servercfg/cfgdetails/config.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ type DoltgresConfig struct {
203203
// that ported cluster config files parse under UnmarshalStrict. These fields
204204
// are accepted but not yet wired into the server.
205205
type DoltgresClusterConfig struct {
206-
StandbyRemotes []DoltgresStandbyRemoteConfig `yaml:"standby_remotes"`
207-
BootstrapRole string `yaml:"bootstrap_role"`
208-
BootstrapEpoch int `yaml:"bootstrap_epoch"`
209-
RemotesAPI DoltgresClusterRemotesAPIConfig `yaml:"remotesapi"`
206+
StandbyRemotes []DoltgresStandbyRemoteConfig `yaml:"standby_remotes"`
207+
BootstrapRole string `yaml:"bootstrap_role"`
208+
BootstrapEpoch int `yaml:"bootstrap_epoch"`
209+
RemotesAPI DoltgresClusterRemotesAPIConfig `yaml:"remotesapi"`
210210
}
211211

212212
type DoltgresStandbyRemoteConfig struct {

0 commit comments

Comments
 (0)