Formatting

dolthub · Nov 22, 2023 · 887ed96 · 887ed96
1 parent 693a909
commit 887ed96
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 21 deletions.
diff --git a/postgres/messages/bind.go b/postgres/messages/bind.go
@@ -18,8 +18,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/dolthub/doltgresql/postgres/connection"
 	"github.com/dolthub/go-mysql-server/sql"
+
+	"github.com/dolthub/doltgresql/postgres/connection"
 )
 
 func init() {
@@ -222,4 +223,4 @@ func (m Bind) DebugString() string {
 	builder.WriteString("}")
 
 	return builder.String()
-}
+}
diff --git a/postgres/messages/describe.go b/postgres/messages/describe.go
@@ -17,8 +17,9 @@ package messages
 import (
 	"fmt"
 
-	"github.com/dolthub/doltgresql/postgres/connection"
 	"github.com/dolthub/go-mysql-server/sql"
+
+	"github.com/dolthub/doltgresql/postgres/connection"
 )
 
 func init() {

diff --git a/postgres/messages/execute.go b/postgres/messages/execute.go
@@ -17,8 +17,9 @@ package messages
 import (
 	"fmt"
 
-	"github.com/dolthub/doltgresql/postgres/connection"
 	"github.com/dolthub/go-mysql-server/sql"
+
+	"github.com/dolthub/doltgresql/postgres/connection"
 )
 
 func init() {
@@ -91,4 +92,3 @@ func (m Execute) DefaultMessage() *connection.MessageFormat {
 func (m Execute) DebugString() string {
 	return fmt.Sprintf("Execute {\n  Portal: %s\n  RowMax: %d\n}", m.Portal, m.RowMax)
 }
-
diff --git a/postgres/messages/parse.go b/postgres/messages/parse.go
@@ -18,8 +18,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/dolthub/doltgresql/postgres/connection"
 	"github.com/dolthub/go-mysql-server/sql"
+
+	"github.com/dolthub/doltgresql/postgres/connection"
 )
 
 func init() {
@@ -113,7 +114,6 @@ func (m Parse) DefaultMessage() *connection.MessageFormat {
 	return &parseDefault
 }
 
-
 // DebugString returns a debug representation of the Parse message.
 func (m Parse) DebugString() string {
 	var builder strings.Builder
@@ -129,4 +129,4 @@ func (m Parse) DebugString() string {
 	builder.WriteString("}")
 
 	return builder.String()
-}
+}
diff --git a/postgres/messages/query.go b/postgres/messages/query.go
@@ -17,8 +17,9 @@ package messages
 import (
 	"fmt"
 
-	"github.com/dolthub/doltgresql/postgres/connection"
 	"github.com/dolthub/go-mysql-server/sql"
+
+	"github.com/dolthub/doltgresql/postgres/connection"
 )
 
 func init() {

diff --git a/postgres/messages/sync.go b/postgres/messages/sync.go
@@ -15,8 +15,9 @@
 package messages
 
 import (
-	"github.com/dolthub/doltgresql/postgres/connection"
 	"github.com/dolthub/go-mysql-server/sql"
+
+	"github.com/dolthub/doltgresql/postgres/connection"
 )
 
 func init() {

diff --git a/postgres/parser/sem/tree/expr.go b/postgres/parser/sem/tree/expr.go
@@ -1775,6 +1775,6 @@ func (node *UnaryExpr) String() string        { return AsString(node) }
 func (node DefaultVal) String() string        { return AsString(node) }
 func (node PartitionMaxVal) String() string   { return AsString(node) }
 func (node PartitionMinVal) String() string   { return AsString(node) }
-func (node *Placeholder) String() string { return AsString(node) }
-func (d NullLiteral) String() string     { return AsString(d) }
-func (list *NameList) String() string    { return AsString(list) }
+func (node *Placeholder) String() string      { return AsString(node) }
+func (d NullLiteral) String() string          { return AsString(d) }
+func (list *NameList) String() string         { return AsString(list) }
diff --git a/server/converted_query.go b/server/converted_query.go
@@ -24,4 +24,3 @@ type ConvertedQuery struct {
 	String string
 	AST    vitess.Statement
 }
-
diff --git a/server/listener.go b/server/listener.go
@@ -148,7 +148,7 @@ func (l *Listener) HandleConnection(conn net.Conn) {
 			returnErr = err
 			return
 		}
-		
+
 		if ds, ok := message.(sql.DebugStringer); ok {
 			if logrus.IsLevelEnabled(logrus.DebugLevel) {
 				logrus.Debugf("Received message: %s", ds.DebugString())
@@ -430,7 +430,7 @@ func (l *Listener) execute(conn net.Conn, mysqlConn *mysql.Conn, query Converted
 // describe handles the description of the given query. This will post the ParameterDescription and RowDescription messages.
 func (l *Listener) describe(conn net.Conn, mysqlConn *mysql.Conn, message messages.Describe, statement ConvertedQuery) (err error) {
 	logrus.Tracef("describing statement %v", statement)
-	
+
 	//TODO: fully support prepared statements
 	if err := connection.Send(conn, messages.ParameterDescription{
 		ObjectIDs: nil,

diff --git a/testing/go/prepared_statement_test.go b/testing/go/prepared_statement_test.go
@@ -31,7 +31,7 @@ func TestPreparedStatements(t *testing.T) {
 		},
 		Assertions: []ScriptTestAssertion{
 			{
-				Query:    "select v1 from doesNotExist where pk = 1;",
+				Query:       "select v1 from doesNotExist where pk = 1;",
 				ExpectedErr: true,
 			},
 			{
@@ -104,7 +104,7 @@ func RunScriptN(t *testing.T, script ScriptTest, n int) {
 					} else {
 						require.NoError(t, err)
 					}
-					
+
 					defer rows.Close()
 					foundRows, err := ReadRows(rows)
 					assert.Equal(t, NormalizeRows(assertion.Expected), foundRows)

diff --git a/testing/logictest/harness/doltgres_harness.go b/testing/logictest/harness/doltgres_harness.go
@@ -34,7 +34,7 @@ const (
 // sqllogictest harness for postgres databases.
 type PostgresqlServerHarness struct {
 	dsn string
-	db *sql.DB
+	db  *sql.DB
 }
 
 // compile check for interface compliance
@@ -49,7 +49,7 @@ func NewPostgresqlHarness(dsn string) *PostgresqlServerHarness {
 	}
 	return &PostgresqlServerHarness{
 		dsn: dsn,
-		db: db,
+		db:  db,
 	}
 }
 
@@ -83,7 +83,7 @@ func (h *PostgresqlServerHarness) ExecuteQuery(statement string) (schema string,
 	if rows != nil {
 		defer rows.Close()
 	}
-	
+
 	if err != nil {
 		return "", nil, err
 	}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,4 +24,3 @@ type ConvertedQuery struct {
		String string
		AST vitess.Statement
		}