fix: Rename MergeOptions to Merge

rlch · Aug 22, 2023 · 4140139 · 4140139
1 parent cfc7899
commit 4140139
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/db/update.go b/db/update.go
@@ -74,7 +74,7 @@ func RemoveLabels(identifier client.PropertyIdentifier, labels ...string) intern
 // [MERGE]: https://neo4j.com/docs/cypher-manual/current/clauses/merge/
 func OnCreate(set ...internal.SetItem) internal.MergeOption {
 	return &internal.Configurer{
-		MergeOptions: func(mo *internal.MergeOptions) {
+		Merge: func(mo *internal.Merge) {
 			mo.OnCreate = append(mo.OnCreate, set...)
 		},
 	}
@@ -89,7 +89,7 @@ func OnCreate(set ...internal.SetItem) internal.MergeOption {
 // [MERGE]: https://neo4j.com/docs/cypher-manual/current/clauses/merge/
 func OnMatch(set ...internal.SetItem) internal.MergeOption {
 	return &internal.Configurer{
-		MergeOptions: func(mo *internal.MergeOptions) {
+		Merge: func(mo *internal.Merge) {
 			mo.OnMatch = append(mo.OnMatch, set...)
 		},
 	}

diff --git a/internal/cypher.go b/internal/cypher.go
@@ -351,9 +351,9 @@ func (cy *cypher) writeMergeClause(
 	node *nodePattern,
 	opts ...MergeOption,
 ) {
-	merge := &MergeOptions{}
+	merge := &Merge{}
 	for _, opt := range opts {
-		opt.configureMergeOptions(merge)
+		opt.configureMerge(merge)
 	}
 	cy.catch(func() {
 		cy.WriteString("MERGE ")

diff --git a/internal/option.go b/internal/option.go
@@ -2,8 +2,8 @@ package internal
 
 import "github.com/goccy/go-json"
 
-func ConfigureMergeOptions(o *MergeOptions, configurer MergeOption) {
-	configurer.configureMergeOptions(o)
+func ConfigureMerge(o *Merge, configurer MergeOption) {
+	configurer.configureMerge(o)
 }
 
 func ConfigureVariable(v *Variable, configurer VariableOption) {
@@ -19,7 +19,7 @@ func ConfigureWhere(w *Where, configurer WhereOption) {
 }
 
 type Configurer struct {
-	MergeOptions   func(*MergeOptions)
+	Merge   func(*Merge)
 	Variable       func(*Variable)
 	ProjectionBody func(*ProjectionBody)
 	Where          func(*Where)
@@ -32,8 +32,8 @@ var _ interface {
 	WhereOption
 } = (*Configurer)(nil)
 
-func (c *Configurer) configureMergeOptions(o *MergeOptions) {
-	c.MergeOptions(o)
+func (c *Configurer) configureMerge(o *Merge) {
+	c.Merge(o)
 }
 
 func (c *Configurer) configureVariable(v *Variable) {
@@ -50,9 +50,9 @@ func (c *Configurer) configureWhere(w *Where) {
 
 type (
 	MergeOption interface {
-		configureMergeOptions(*MergeOptions)
+		configureMerge(*Merge)
 	}
-	MergeOptions struct {
+	Merge struct {
 		OnCreate []SetItem
 		OnMatch  []SetItem
 	}