fix parameters

Author: James Cor

sql/base_session.go

@@ -53,6 +53,8 @@ type BaseSession struct {
 	// privilege set if our counter doesn't equal the database's counter.
 	privSetCounter uint64
 	privilegeSet   PrivilegeSet
+
+	storedProcParams map[string]*StoredProcParam
 }
 
 func (s *BaseSession) GetLogger() *logrus.Entry {
@@ -252,6 +254,29 @@ func (s *BaseSession) IncrementStatusVariable(ctx *Context, statVarName string,
 	return
 }
 
+func (s *BaseSession) NewStoredProcParam(name string, param *StoredProcParam) {
+	if _, ok := s.storedProcParams[name]; ok {
+		return
+	}
+	s.storedProcParams[name] = param
+}
+
+func (s *BaseSession) GetStoredProcParam(name string) *StoredProcParam {
+	if param, ok := s.storedProcParams[name]; ok {
+		return param
+	}
+	return nil
+}
+
+func (s *BaseSession) SetStoredProcParam(name string, val any) error {
+	param := s.GetStoredProcParam(name)
+	if  param == nil {
+		return fmt.Errorf("variable `%s` could not be found", name)
+	}
+	param.SetValue(val)
+	return nil
+}
+
 // GetCharacterSet returns the character set for this session (defined by the system variable `character_set_connection`).
 func (s *BaseSession) GetCharacterSet() CharacterSetID {
 	sysVar, _ := s.systemVars[characterSetConnectionSysVarName]
@@ -504,17 +529,18 @@ func NewBaseSessionWithClientServer(server string, client Client, id uint32) *Ba
 		statusVars = make(map[string]StatusVarValue)
 	}
 	return &BaseSession{
-		addr:           server,
-		client:         client,
-		id:             id,
-		systemVars:     systemVars,
-		statusVars:     statusVars,
-		userVars:       NewUserVars(),
-		idxReg:         NewIndexRegistry(),
-		viewReg:        NewViewRegistry(),
-		locks:          make(map[string]bool),
-		lastQueryInfo:  defaultLastQueryInfo(),
-		privSetCounter: 0,
+		addr:             server,
+		client:           client,
+		id:               id,
+		systemVars:       systemVars,
+		statusVars:       statusVars,
+		userVars:         NewUserVars(),
+		storedProcParams: make(map[string]*StoredProcParam),
+		idxReg:           NewIndexRegistry(),
+		viewReg:          NewViewRegistry(),
+		locks:            make(map[string]bool),
+		lastQueryInfo:    defaultLastQueryInfo(),
+		privSetCounter:   0,
 	}
 }
 
@@ -534,14 +560,15 @@ func NewBaseSession() *BaseSession {
 		statusVars = make(map[string]StatusVarValue)
 	}
 	return &BaseSession{
-		id:             atomic.AddUint32(&autoSessionIDs, 1),
-		systemVars:     systemVars,
-		statusVars:     statusVars,
-		userVars:       NewUserVars(),
-		idxReg:         NewIndexRegistry(),
-		viewReg:        NewViewRegistry(),
-		locks:          make(map[string]bool),
-		lastQueryInfo:  defaultLastQueryInfo(),
-		privSetCounter: 0,
+		id:               atomic.AddUint32(&autoSessionIDs, 1),
+		systemVars:       systemVars,
+		statusVars:       statusVars,
+		userVars:         NewUserVars(),
+		storedProcParams: make(map[string]*StoredProcParam),
+		idxReg:           NewIndexRegistry(),
+		viewReg:          NewViewRegistry(),
+		locks:            make(map[string]bool),
+		lastQueryInfo:    defaultLastQueryInfo(),
+		privSetCounter:   0,
 	}
 }

sql/core.go

@@ -880,6 +880,21 @@ func IncrementStatusVariable(ctx *Context, name string, val int) {
 	ctx.Session.IncrementStatusVariable(ctx, name, val)
 }
 
+type StoredProcParam struct {
+	Type       Type
+	Value      any
+	HasBeenSet bool
+	Reference  *StoredProcParam
+}
+
+func (s *StoredProcParam) SetValue(val any) {
+	s.Value = val
+	s.HasBeenSet = true
+	if s.Reference != nil {
+		s.Reference.SetValue(val)
+	}
+}
+
 // OrderAndLimit stores the context of an ORDER BY ... LIMIT statement, and is used by index lookups and iterators.
 type OrderAndLimit struct {
 	OrderBy       Expression

sql/planbuilder/proc.go

@@ -345,8 +345,26 @@ func (b *Builder) buildCall(inScope *scope, c *ast.Call) (outScope *scope) {
 		b.handleErr(err)
 	}
 
+	// TODO: build references here?
+	// TODO: here fill in x from session
 	params := make([]sql.Expression, len(c.Params))
 	for i, param := range c.Params {
+		if len(proc.Params) == len(c.Params) {
+			procParam := proc.Params[i]
+			rspp := &sql.StoredProcParam{Type: procParam.Type}
+			b.ctx.Session.NewStoredProcParam(procParam.Name, rspp)
+			if col, isCol := param.(*ast.ColName); isCol {
+				colName := col.Name.String() // TODO: to lower?
+				if spp := b.ctx.Session.GetStoredProcParam(colName); spp != nil {
+					iv := &procedures.InterpreterVariable{
+						Type:  spp.Type,
+						Value: spp.Value,
+					}
+					param = iv.ToAST()
+					rspp.Reference = spp
+				}
+			}
+		}
 		expr := b.buildScalar(inScope, param)
 		params[i] = expr
 	}