Added the ability to compose UPSERTs with column bindings

relops · Feb 19, 2014 · e72de39 · e72de39
1 parent 6bfc24e
commit e72de39
Show file tree

Hide file tree

Showing 2 changed files with 104 additions and 24 deletions.
diff --git a/cqlc/cqlc.go b/cqlc/cqlc.go
@@ -94,6 +94,7 @@ type SelectSelectStep interface {
 type SetValueStep interface {
 	Executable
 	SelectWhereStep
+	Apply(cols ...ColumnBinding) SetValueStep
 	SetString(col StringColumn, value string) SetValueStep
 	SetInt32(col Int32Column, value int32) SetValueStep
 	SetInt64(col Int64Column, value int64) SetValueStep
@@ -136,7 +137,7 @@ type Column interface {
 }
 
 type Bindable interface {
-	Bind(...ColumnBinding) UniqueFetchable
+	Bind(cols ...ColumnBinding) UniqueFetchable
 }
 
 type Condition struct {
@@ -232,6 +233,14 @@ func (c *Context) Store(b TableBinding) Executable {
 	return c
 }
 
+// Adds each column binding as a `SET col = ?` fragment in the resulting CQL
+func (c *Context) Apply(cols ...ColumnBinding) SetValueStep {
+	for _, col := range cols {
+		set(c, col.Column, col.Value)
+	}
+	return c
+}
+
 func (c *Context) SetString(col StringColumn, value string) SetValueStep {
 	set(c, col, value)
 	return c

diff --git a/test/.fixtures/composition/composition.go b/test/.fixtures/composition/composition.go
@@ -1,10 +1,12 @@
 package main
 
 import (
+	"fmt"
 	"github.com/gocql/gocql"
 	"github.com/relops/cqlc/cqlc"
 	"github.com/relops/cqlc/integration"
 	"log"
+	"math"
 	"os"
 )
 
@@ -14,6 +16,7 @@ var SECOND_TIMELINE = SecondTimelineTableDef()
 type WhenRowKey interface {
 	cqlc.Table
 	WhenColumn() cqlc.LastPartitionedTimeUUIDColumn
+	SupportsUpsert() bool
 }
 
 func main() {
@@ -45,42 +48,110 @@ func main() {
 		os.Exit(1)
 	}
 
-	err = deleteByTimestamp(session, FIRST_TIMELINE, timestamp)
-	err = deleteByTimestamp(session, SECOND_TIMELINE, timestamp)
-
-	if err != nil {
-		log.Fatalf("Could not execute delete: %v", err)
-		os.Exit(1)
-	}
-
 	var tag string
 	var latitude float32
 
-	err = ctx.Select().
-		From(FIRST_TIMELINE).
-		Where(FIRST_TIMELINE.WHEN.Eq(timestamp)).
-		Bind(FIRST_TIMELINE.TAG.To(&tag)).
-		FetchOne(session)
+	/*
+		err = ctx.Select().
+			From(FIRST_TIMELINE).
+			Where(FIRST_TIMELINE.WHEN.Eq(timestamp)).
+			Bind(FIRST_TIMELINE.TAG.To(&tag)).
+			FetchOne(session)
+
+		err = ctx.Select().
+			From(SECOND_TIMELINE).
+			Where(SECOND_TIMELINE.WHEN.Eq(timestamp)).
+			Bind(SECOND_TIMELINE.LATITUDE.To(&latitude)).
+			FetchOne(session)
+	*/
 
-	err = ctx.Select().
-		From(SECOND_TIMELINE).
-		Where(SECOND_TIMELINE.WHEN.Eq(timestamp)).
-		Bind(SECOND_TIMELINE.LATITUDE.To(&latitude)).
-		FetchOne(session)
+	err = fetchOne(ctx, session, FIRST_TIMELINE, timestamp, FIRST_TIMELINE.TAG.To(&tag))
+	err = fetchOne(ctx, session, SECOND_TIMELINE, timestamp, SECOND_TIMELINE.LATITUDE.To(&latitude))
 
 	if err != nil {
 		log.Fatalf("Could not execute select: %v", err)
 		os.Exit(1)
 	}
 
-	if tag == "" && latitude == 0.0 {
-		result = "PASSED"
+	if tag == "foobar" && math.Float32bits(latitude) == math.Float32bits(50.12) {
+
+		// TODO Implement a FROM binding
+		t := "bar"
+		l := float32(72.34)
+
+		err = upsert(ctx, session, FIRST_TIMELINE, timestamp, FIRST_TIMELINE.TAG.To(&t))
+		err = upsert(ctx, session, SECOND_TIMELINE, timestamp, SECOND_TIMELINE.LATITUDE.To(&l))
+
+		if err != nil {
+			log.Fatalf("Could not execute upsert: %v", err)
+			os.Exit(1)
+		}
+
+		err = fetchOne(ctx, session, FIRST_TIMELINE, timestamp, FIRST_TIMELINE.TAG.To(&tag))
+		err = fetchOne(ctx, session, SECOND_TIMELINE, timestamp, SECOND_TIMELINE.LATITUDE.To(&latitude))
+
+		if err != nil {
+			log.Fatalf("Could not execute select: %v", err)
+			os.Exit(1)
+		}
+
+		if tag == t && math.Float32bits(latitude) == math.Float32bits(l) {
+
+			err = deleteByTimestamp(ctx, session, FIRST_TIMELINE, timestamp)
+			err = deleteByTimestamp(ctx, session, SECOND_TIMELINE, timestamp)
+
+			if err != nil {
+				log.Fatalf("Could not execute delete: %v", err)
+				os.Exit(1)
+			}
+
+			var tag string
+			var latitude float32
+
+			err = fetchOne(ctx, session, FIRST_TIMELINE, timestamp, FIRST_TIMELINE.TAG.To(&tag))
+			err = fetchOne(ctx, session, SECOND_TIMELINE, timestamp, SECOND_TIMELINE.LATITUDE.To(&latitude))
+
+			if err != nil {
+				log.Fatalf("Could not execute select: %v", err)
+				os.Exit(1)
+			}
+
+			if tag == "" && latitude == 0.0 {
+				result = "PASSED"
+			} else {
+				result = fmt.Sprintf("After delete - Tag was: %s; Latitude was %f", tag, latitude)
+			}
+		} else {
+			result = fmt.Sprintf("After upsert - Tag was: %s; Latitude was %f", tag, latitude)
+		}
+
+	} else {
+		result = fmt.Sprintf("Before delete - Tag was: %s; Latitude was %f", tag, latitude)
 	}
 
 	os.Stdout.WriteString(result)
 }
 
-func deleteByTimestamp(s *gocql.Session, w WhenRowKey, t gocql.UUID) error {
-	ctx := cqlc.NewContext()
-	return ctx.Delete().From(w).Where(w.WhenColumn().Eq(t)).Exec(s)
+func upsert(ctx *cqlc.Context, s *gocql.Session, w WhenRowKey, t gocql.UUID, binding cqlc.ColumnBinding) error {
+	return ctx.Upsert(w).
+		Apply(binding).
+		Where(w.WhenColumn().Eq(t)).
+		Exec(s)
+}
+
+func fetchOne(ctx *cqlc.Context, s *gocql.Session, w WhenRowKey, t gocql.UUID, binding cqlc.ColumnBinding) error {
+	return ctx.
+		Select().
+		From(w).
+		Where(w.WhenColumn().Eq(t)).
+		Bind(binding).
+		FetchOne(s)
+}
+
+func deleteByTimestamp(ctx *cqlc.Context, s *gocql.Session, w WhenRowKey, t gocql.UUID) error {
+	return ctx.
+		Delete().
+		From(w).
+		Where(w.WhenColumn().Eq(t)).
+		Exec(s)
 }