feedback

Author: James Cor

sql/analyzer/replace_count_star.go

@@ -35,16 +35,6 @@ func replaceCountStar(ctx *sql.Context, a *Analyzer, n sql.Node, _ *plan.Scope,
 
 	return transform.Node(n, func(n sql.Node) (sql.Node, transform.TreeIdentity, error) {
 		if agg, ok := n.(*plan.GroupBy); ok {
-			if !qFlags.JoinIsSet() {
-				print()
-			}
-			if !qFlags.SubqueryIsSet() {
-				print()
-			}
-			if !qFlags.IsSet(sql.QFlagAnyAgg) {
-				print()
-			}
-
 			if len(agg.GroupByExprs) == 0 && !qFlags.JoinIsSet() && !qFlags.SubqueryIsSet() && !qFlags.IsSet(sql.QFlagAnyAgg) && !qFlags.IsSet(sql.QFlagAnalyzeProcedure) {
 				// top-level aggregation with a single group and no "any_value" functions can only return one row
 				qFlags.Set(sql.QFlagMax1Row)

sql/plan/ddl_procedure.go

@@ -91,54 +91,10 @@ func (*CreateProcedure) CollationCoercibility(ctx *sql.Context) (collation sql.C
 
 // String implements the sql.Node interface.
 func (c *CreateProcedure) String() string {
-	// move this logic elsewhere
-	return "TODO"
-	//definer := ""
-	//if c.Procedure.Definer != "" {
-	//	definer = fmt.Sprintf(" DEFINER = %s", c.Procedure.Definer)
-	//}
-	//params := ""
-	//for i, param := range c.Procedure.Params {
-	//	if i > 0 {
-	//		params += ", "
-	//	}
-	//	params += param.String()
-	//}
-	//comment := ""
-	//if c.Procedure.Comment != "" {
-	//	comment = fmt.Sprintf(" COMMENT '%s'", c.Procedure.Comment)
-	//}
-	//characteristics := ""
-	//for _, characteristic := range c.Procedure.Characteristics {
-	//	characteristics += fmt.Sprintf(" %s", characteristic.String())
-	//}
-	//return fmt.Sprintf("CREATE%s PROCEDURE %s (%s) %s%s%s %s",
-	//	definer, c.Procedure.Name, params, c.Procedure.SecurityContext.String(), comment, characteristics, c.Procedure.String())
+	return c.StoredProcDetails.CreateStatement
 }
 
 // DebugString implements the sql.DebugStringer interface.
 func (c *CreateProcedure) DebugString() string {
-	// move this logic elsewhere
-	return "TODO"
-	//definer := ""
-	//if c.Procedure.Definer != "" {
-	//	definer = fmt.Sprintf(" DEFINER = %s", c.Procedure.Definer)
-	//}
-	//params := ""
-	//for i, param := range c.Procedure.Params {
-	//	if i > 0 {
-	//		params += ", "
-	//	}
-	//	params += param.String()
-	//}
-	//comment := ""
-	//if c.Procedure.Comment != "" {
-	//	comment = fmt.Sprintf(" COMMENT '%s'", c.Procedure.Comment)
-	//}
-	//characteristics := ""
-	//for _, characteristic := range c.Procedure.Characteristics {
-	//	characteristics += fmt.Sprintf(" %s", characteristic.String())
-	//}
-	//return fmt.Sprintf("CREATE%s PROCEDURE %s (%s) %s%s%s %s",
-	//	definer, c.Procedure.Name, params, c.Procedure.SecurityContext.String(), comment, characteristics, sql.DebugString(c.Procedure))
+	return c.StoredProcDetails.CreateStatement
 }