Skip to content

Commit aeb7cd5

Browse files
committed
[ga-format-pr] Run ./format_repo.sh to fix formatting
1 parent 70a452a commit aeb7cd5

File tree

4 files changed

+23
-24
lines changed

4 files changed

+23
-24
lines changed

enginetest/queries/procedure_queries.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2827,11 +2827,11 @@ var ProcedureCreateInSubroutineTests = []ScriptTest{
28272827
Name: "procedure must not contain CREATE TABLE",
28282828
Assertions: []ScriptTestAssertion{
28292829
{
2830-
Query: "create procedure p() create table t (pk int);",
2830+
Query: "create procedure p() create table t (pk int);",
28312831
ExpectedErrStr: "creating tables in stored procedures is currently unsupported and will be added in a future release",
28322832
},
28332833
{
2834-
Query: "create procedure p() begin create table t (pk int); end;",
2834+
Query: "create procedure p() begin create table t (pk int); end;",
28352835
ExpectedErrStr: "creating tables in stored procedures is currently unsupported and will be added in a future release",
28362836
},
28372837
},
@@ -2843,44 +2843,43 @@ var ProcedureCreateInSubroutineTests = []ScriptTest{
28432843
},
28442844
Assertions: []ScriptTestAssertion{
28452845
{
2846-
Query: "create procedure p() create trigger trig before insert on t for each row begin select 1; end;",
2846+
Query: "create procedure p() create trigger trig before insert on t for each row begin select 1; end;",
28472847
ExpectedErrStr: "creating triggers in stored procedures is currently unsupported and will be added in a future release",
28482848
},
28492849
{
2850-
Query: "create procedure p() begin create trigger trig before insert on t for each row begin select 1; end; end;",
2850+
Query: "create procedure p() begin create trigger trig before insert on t for each row begin select 1; end; end;",
28512851
ExpectedErrStr: "creating triggers in stored procedures is currently unsupported and will be added in a future release",
28522852
},
28532853
},
28542854
},
28552855
{
2856-
Name: "procedure must not contain CREATE DB",
2856+
Name: "procedure must not contain CREATE DB",
28572857
SetUpScript: []string{},
28582858
Assertions: []ScriptTestAssertion{
28592859
{
2860-
Query: "create procedure p() create database procdb;",
2860+
Query: "create procedure p() create database procdb;",
28612861
ExpectedErrStr: "creating databases in stored procedures is currently unsupported and will be added in a future release",
28622862
},
28632863
{
2864-
Query: "create procedure p() begin create database procdb; end;",
2864+
Query: "create procedure p() begin create database procdb; end;",
28652865
ExpectedErrStr: "creating databases in stored procedures is currently unsupported and will be added in a future release",
28662866
},
28672867
},
28682868
},
28692869
{
2870-
Name: "procedure must not contain CREATE VIEW",
2870+
Name: "procedure must not contain CREATE VIEW",
28712871
SetUpScript: []string{},
28722872
Assertions: []ScriptTestAssertion{
28732873
{
2874-
Query: "create procedure p() create view v as select 1;",
2874+
Query: "create procedure p() create view v as select 1;",
28752875
ExpectedErrStr: "creating views in stored procedures is currently unsupported and will be added in a future release",
28762876
},
28772877
{
2878-
Query: "create procedure p() begin create view v as select 1; end;",
2878+
Query: "create procedure p() begin create view v as select 1; end;",
28792879
ExpectedErrStr: "creating views in stored procedures is currently unsupported and will be added in a future release",
28802880
},
28812881
},
28822882
},
2883-
28842883
}
28852884

28862885
var NoDbProcedureTests = []ScriptTestAssertion{

sql/analyzer/stored_procedures.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
package analyzer
1616

1717
import (
18-
19-
"fmt"
20-
"github.com/dolthub/go-mysql-server/sql"
21-
"github.com/dolthub/go-mysql-server/sql/expression"
22-
"github.com/dolthub/go-mysql-server/sql/plan"
23-
"github.com/dolthub/go-mysql-server/sql/planbuilder"
24-
"github.com/dolthub/go-mysql-server/sql/transform"
25-
"slices"
18+
"fmt"
19+
"slices"
20+
21+
"github.com/dolthub/go-mysql-server/sql"
22+
"github.com/dolthub/go-mysql-server/sql/expression"
23+
"github.com/dolthub/go-mysql-server/sql/plan"
24+
"github.com/dolthub/go-mysql-server/sql/planbuilder"
25+
"github.com/dolthub/go-mysql-server/sql/transform"
2626
)
2727

2828
// loadStoredProcedures loads non-built-in stored procedures for all databases on relevant calls.

sql/planbuilder/create_ddl.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ package planbuilder
1616

1717
import (
1818
"fmt"
19-
"github.com/dolthub/go-mysql-server/sql/transform"
20-
"strings"
19+
"strings"
2120
"time"
2221
"unicode"
2322

@@ -26,6 +25,7 @@ import (
2625
"github.com/dolthub/go-mysql-server/sql"
2726
"github.com/dolthub/go-mysql-server/sql/expression"
2827
"github.com/dolthub/go-mysql-server/sql/plan"
28+
"github.com/dolthub/go-mysql-server/sql/transform"
2929
"github.com/dolthub/go-mysql-server/sql/types"
3030
)
3131

@@ -134,7 +134,7 @@ func getCurrentUserForDefiner(ctx *sql.Context, definer string) string {
134134

135135
func (b *Builder) buildCreateProcedure(inScope *scope, subQuery string, fullQuery string, c *ast.DDL) (outScope *scope) {
136136
b.qFlags.Set(sql.QFlagCreateProcedure)
137-
defer func() {b.qFlags.Unset(sql.QFlagCreateProcedure)}()
137+
defer func() { b.qFlags.Unset(sql.QFlagCreateProcedure) }()
138138

139139
var params []plan.ProcedureParam
140140
for _, param := range c.ProcedureSpec.Params {
@@ -207,7 +207,7 @@ func (b *Builder) buildCreateProcedure(inScope *scope, subQuery string, fullQuer
207207
b.validateStoredProcedure(bodyScope.node)
208208

209209
// Check for recursive calls to same procedure
210-
transform.Inspect(bodyScope.node, func(node sql.Node) (bool) {
210+
transform.Inspect(bodyScope.node, func(node sql.Node) bool {
211211
switch n := node.(type) {
212212
case *plan.Call:
213213
if strings.EqualFold(procName, n.Name) {

sql/planbuilder/proc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ package planbuilder
1616

1717
import (
1818
"fmt"
19-
"gopkg.in/src-d/go-errors.v1"
2019
"strconv"
2120
"strings"
2221

2322
ast "github.com/dolthub/vitess/go/vt/sqlparser"
23+
"gopkg.in/src-d/go-errors.v1"
2424

2525
"github.com/dolthub/go-mysql-server/sql"
2626
"github.com/dolthub/go-mysql-server/sql/expression"

0 commit comments

Comments
 (0)