Merge pull request #2697 from dolthub/jennifer/domain

expose planbuilder methods for domain support in Doltgres

Author: jennifersp

sql/constraints.go

@@ -76,8 +76,8 @@ func (f *ForeignKeyConstraint) DebugString() string {
 
 type ForeignKeyConstraints []*ForeignKeyConstraint
 
-// CheckDefinition defines a trigger. Integrators are not expected to parse or understand the trigger definitions,
-// but must store and return them when asked.
+// CheckDefinition defines a check constraint. Integrators are not expected to parse or
+// understand the check constraint definitions, but must store and return them when asked.
 type CheckDefinition struct {
 	Name            string // The name of this check. Check names in a database are unique.
 	CheckExpression string // String serialization of the check expression

sql/plan/common.go

@@ -30,7 +30,7 @@ func IsBinary(node sql.Node) bool {
 	return len(node.Children()) == 2
 }
 
-// NillaryNode is a node with no children. This is a common WithChildren implementation for all nodes that have none.
+// NillaryWithChildren is a node with no children. This is a common WithChildren implementation for all nodes that have none.
 func NillaryWithChildren(node sql.Node, children ...sql.Node) (sql.Node, error) {
 	if len(children) != 0 {
 		return nil, sql.ErrInvalidChildrenNumber.New(node, len(children), 0)

sql/planbuilder/builder.go

@@ -439,3 +439,21 @@ func assignColumnIndexes(e sql.Expression, schema sql.Schema) sql.Expression {
 	})
 	return e
 }
+
+// Below methods are used in Doltgres. TODO: maybe find way to not expose these methods
+
+func (b *Builder) BuildScalarWithTable(expr ast.Expr, tableExpr ast.TableExpr) sql.Expression {
+	outscope := b.newScope()
+	if tableExpr != nil {
+		outscope = b.buildDataSource(outscope, tableExpr)
+	}
+	return b.buildScalar(outscope, expr)
+}
+
+func (b *Builder) BuildColumnDefaultValueWithTable(defExpr ast.Expr, tableExpr ast.TableExpr, typ sql.Type, nullable bool) *sql.ColumnDefaultValue {
+	outscope := b.newScope()
+	if tableExpr != nil {
+		outscope = b.buildDataSource(outscope, tableExpr)
+	}
+	return b.convertDefaultExpression(outscope, defExpr, typ, nullable)
+}