Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

formatting: fixed formatting issues #59

Merged
merged 2 commits into from
Sep 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/DigitalChinaOpenSource/DCParser v0.0.0-20210901083130-295ed319e8ab h1:OpXxX9O/w9Iyew29NSyb1EE2TPCrh3EU/dXZ03OweEM=
github.com/DigitalChinaOpenSource/DCParser v0.0.0-20210901083130-295ed319e8ab/go.mod h1:3n404SkCabBM0pYRgCyXEKttOLdrmMyBaWMGvaRs/ns=
github.com/DigitalChinaOpenSource/DCParser v0.0.0-20210906032539-5020c84eb0ab h1:H25pUoHH6J1OPNIZjFeHgeCsKvdpBL0iiMSMAt8SlTo=
github.com/DigitalChinaOpenSource/DCParser v0.0.0-20210906032539-5020c84eb0ab/go.mod h1:3n404SkCabBM0pYRgCyXEKttOLdrmMyBaWMGvaRs/ns=
github.com/DigitalChinaOpenSource/dcbr v4.0.11+incompatible h1:ICQTYSnJC7i3Ns4xXGS5DMi1wTfg44woW4eWQi2ZNTQ=
Expand Down
2 changes: 1 addition & 1 deletion session/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -2134,7 +2134,7 @@ var builtinGlobalVariable = []string{
variable.TiDBMultiStatementMode,

/* PostgreSQL System Variable: */
variable.PgExtraFloatDigit,
variable.PgExtraFloatDigits,
variable.PgSearchPath,
variable.PgClientMinMessage,
variable.PgDateStyle,
Expand Down
2 changes: 1 addition & 1 deletion sessionctx/variable/sysvar.go
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ var defaultSysVars = []*SysVar{
{ScopeGlobal | ScopeSession, TiDBEnableAmendPessimisticTxn, boolToOnOff(DefTiDBEnableAmendPessimisticTxn)},
{ScopeGlobal | ScopeSession, TiDBMultiStatementMode, Warn},
//PostgreSQL Global System Variable
{ScopeGlobal | ScopeSession, PgExtraFloatDigit, strconv.FormatInt(DefPgExtraFloatDigits, 10)},
{ScopeGlobal | ScopeSession, PgExtraFloatDigits, strconv.FormatInt(DefPgExtraFloatDigits, 10)},
{ScopeGlobal | ScopeSession, PgSearchPath, DefPgSearchPath},
{ScopeGlobal | ScopeSession, PgDateStyle, DefPgDateStyle},
{ScopeGlobal | ScopeSession, PgClientEncoding, DefPgClientEncoding},
Expand Down
6 changes: 3 additions & 3 deletions sessionctx/variable/tidb_vars.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ import (
// TiDB system variable names that only in session scope.
// Add PostgreSQL system variable
const (
//PgExtraFloatDigit is the database system variable
PgExtraFloatDigit = "extra_float_digit"
//PgExtraFloatDigits is the database system variable
PgExtraFloatDigits = "extra_float_digits"

//PgSearchPath is the database system variable
PgSearchPath = "search_path"
Expand Down Expand Up @@ -571,7 +571,7 @@ const (
DefPgDateStyle = "ISO"
DefPgClientMinMessage = "notice"
DefPgByteaOutput = "hex"
DefPgSearchPath = "public"
DefPgSearchPath = "public"
DefPgExtraFloatDigits = 1
)

Expand Down
2 changes: 2 additions & 0 deletions tools/check/go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
github.com/BurntSushi/toml v0.3.0 h1:e1/Ivsx3Z0FVTV0NSOv/aVgbUWyQuzj7DDnFblkRvsY=
github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
Expand Down Expand Up @@ -100,6 +101,7 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw
golang.org/x/tools v0.0.0-20190925020647-22afafe3322a h1:3GxqzBPBt1O2dIiPnzldQ5d25CAMWJFBZTpqxLPfjs8=
golang.org/x/tools v0.0.0-20190925020647-22afafe3322a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs=
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/alecthomas/gometalinter.v2 v2.0.12 h1:/xBWwtjmOmVxn8FXfIk9noV8m2E2Id9jFfUY/Mh9QAI=
Expand Down