Add support for Update statements.

tests/generator_test.go

@@ -25,13 +25,13 @@ func TestGenerateModel(t *testing.T) {
 
 func TestSelect_ScanToStruct(t *testing.T) {
 	actor := model.Actor{}
-	query := Actor.SELECT(Actor.AllColumns)
+	query := Actor.SELECT(Actor.AllColumns).OrderBy(Actor.ActorID.Asc())
 
 	queryStr, err := query.String()
 
 	fmt.Println(queryStr)
 
-	assert.Equal(t, queryStr, `SELECT actor.actor_id AS "actor.actor_id", actor.first_name AS "actor.first_name", actor.last_name AS "actor.last_name", actor.last_update AS "actor.last_update" FROM dvds.actor`)
+	assert.Equal(t, queryStr, `SELECT actor.actor_id AS "actor.actor_id", actor.first_name AS "actor.first_name", actor.last_name AS "actor.last_name", actor.last_update AS "actor.last_update" FROM dvds.actor ORDER BY actor.actor_id ASC`)
 
 	err = query.Execute(db, &actor)
 
@@ -74,7 +74,7 @@ func TestSelect_ScanToSlice(t *testing.T) {
 //		INNER_JOIN(Film, FilmActor.FilmID.Eq(Film.FilmID)).
 //		INNER_JOIN(Language, Film.LanguageID.Eq(Language.LanguageID)).
 //		SELECT(FilmActor.AllColumns, Film.AllColumns, Language.AllColumns, Actor.AllColumns).
-//		Where(FilmActor.ActorID.GtEq(1).And(FilmActor.ActorID.LteLiteral(2)))
+//		WHERE(FilmActor.ActorID.GtEq(1).And(FilmActor.ActorID.LteLiteral(2)))
 //
 //	queryStr, err := query.String()
 //	assert.NilError(t, err)
@@ -405,7 +405,7 @@ func TestSubQuery(t *testing.T) {
 	//Customer.
 	//	INNER_JOIN(selectStmtTable, Customer.LastName.Eq(selectStmtTable.RefStringColumn(Actor.FirstName))).
 	//	SELECT(Customer.AllColumns, selectStmtTable.RefIntColumnName("first_name")).
-	//	Where(Actor.LastName.Neq(avrgCustomer))
+	//	WHERE(Actor.LastName.Neq(avrgCustomer))
 
 	rFilmsOnly := Film.SELECT(Film.FilmID, Film.Title, Film.Rating).
 		Where(Film.Rating.EqL("R")).

tests/insert_test.go

@@ -24,7 +24,7 @@ func TestInsertValues(t *testing.T) {
 
 	fmt.Println(insertQueryStr)
 
-	assert.Equal(t, insertQueryStr, `INSERT INTO test_sample.link (url,name,rel) VALUES ('http://www.postgresqltutorial.com','PostgreSQL Tutorial',DEFAULT), ('http://www.google.com','Google',DEFAULT), ('http://www.yahoo.com','Yahoo',DEFAULT), ('http://www.bing.com','Bing',DEFAULT) RETURNING link.id;`)
+	assert.Equal(t, insertQueryStr, `INSERT INTO test_sample.link (url,name,rel) VALUES ('http://www.postgresqltutorial.com','PostgreSQL Tutorial',DEFAULT), ('http://www.google.com','Google',DEFAULT), ('http://www.yahoo.com','Yahoo',DEFAULT), ('http://www.bing.com','Bing',DEFAULT) RETURNING link.id AS "link.id";`)
 	res, err := insertQuery.Execute(db)
 
 	assert.NilError(t, err)

tests/main_test.go

@@ -3,6 +3,7 @@ package tests
 import (
 	"database/sql"
 	"fmt"
+	_ "github.com/lib/pq"
 	"os"
 	"testing"
 )
@@ -19,7 +20,8 @@ const (
 
 var connectString = fmt.Sprintf("host=%s port=%d user=%s "+"password=%s dbname=%s sslmode=disable", host, port, user, password, dbname)
 var db *sql.DB
-var tx *sql.Tx
+
+//var tx *sql.Tx
 
 //go:generate generator -db "host=localhost port=5432 user=postgres password=postgres dbname=dvd_rental sslmode=disable" -dbName dvd_rental -schema dvds -path .test_files
 //go:generate generator -db "host=localhost port=5432 user=postgres password=postgres dbname=dvd_rental sslmode=disable" -dbName dvd_rental -schema test_sample -path .test_files
@@ -32,7 +34,7 @@ func TestMain(m *testing.M) {
 	if err != nil {
 		panic("Failed to connect to test db")
 	}
-	tx, _ = db.Begin()
+	//tx, _ = db.Begin()
 	defer cleanUp()
 
 	dbInit()
@@ -48,7 +50,7 @@ func TestMain(m *testing.M) {
 func cleanUp() {
 	fmt.Println("CLEAN UP")
 
-	tx.Rollback()
+	//tx.Rollback()
 	db.Close()
 }
 

tests/update_test.go

@@ -0,0 +1,83 @@
+package tests
+
+import (
+	"fmt"
+	"github.com/sub0zero/go-sqlbuilder/sqlbuilder"
+	"github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/test_sample/model"
+	"github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/test_sample/table"
+	"gotest.tools/assert"
+	"testing"
+)
+
+func TestUpdateValues(t *testing.T) {
+	_, err := table.Link.INSERT(table.Link.URL, table.Link.Name, table.Link.Rel).
+		VALUES("http://www.postgresqltutorial.com", "PostgreSQL Tutorial", sqlbuilder.DEFAULT).
+		VALUES("http://www.yahoo.com", "Yahoo", sqlbuilder.DEFAULT).
+		VALUES("http://www.bing.com", "Bing", sqlbuilder.DEFAULT).
+		RETURNING(table.Link.ID).Execute(db)
+
+	assert.NilError(t, err)
+
+	query := table.Link.
+		UPDATE(table.Link.Name, table.Link.URL).
+		SET("Bong", "http://bong.com").
+		WHERE(table.Link.Name.EqL("Bing"))
+
+	queryStr, err := query.String()
+
+	assert.NilError(t, err)
+
+	fmt.Println(queryStr)
+
+	res, err := query.Execute(db)
+
+	assert.NilError(t, err)
+
+	fmt.Println(res)
+
+	links := []model.Link{}
+
+	err = table.Link.SELECT(table.Link.AllColumns).
+		Where(table.Link.Name.EqL("Bong")).
+		Execute(db, &links)
+
+	assert.NilError(t, err)
+
+	//spew.Dump(links)
+}
+
+func TestUpdateAndReturning(t *testing.T) {
+	_, err := table.Link.INSERT(table.Link.URL, table.Link.Name, table.Link.Rel).
+		VALUES("http://www.postgresqltutorial.com", "PostgreSQL Tutorial", sqlbuilder.DEFAULT).
+		VALUES("http://www.ask.com", "Ask", sqlbuilder.DEFAULT).
+		VALUES("http://www.ask.com", "Ask", sqlbuilder.DEFAULT).
+		VALUES("http://www.yahoo.com", "Yahoo", sqlbuilder.DEFAULT).
+		VALUES("http://www.bing.com", "Bing", sqlbuilder.DEFAULT).
+		RETURNING(table.Link.ID).Execute(db)
+
+	assert.NilError(t, err)
+
+	stmt := table.Link.
+		UPDATE(table.Link.Name, table.Link.URL).
+		SET("DuckDuckGo", "http://www.duckduckgo.com").
+		WHERE(table.Link.Name.EqL("Ask")).
+		RETURNING(table.Link.AllColumns)
+
+	stmtStr, err := stmt.String()
+
+	assert.NilError(t, err)
+
+	fmt.Println(stmtStr)
+
+	links := []model.Link{}
+
+	err = stmt.Query(db, &links)
+
+	assert.NilError(t, err)
+
+	assert.Equal(t, len(links), 2)
+
+	assert.Equal(t, links[0].Name, "DuckDuckGo")
+
+	assert.Equal(t, links[1].Name, "DuckDuckGo")
+}