Gleipnir/jet
4
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Add support for INSERT select query.

Browse source
This commit is contained in:
zer0sub 2019-04-07 16:54:06 +02:00
parent 0971573338
commit b287521f1a
5 changed files with 154 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

65
sqlbuilder/insert_statement.go
View file

@ -20,6 +20,8 @@ type InsertStatement interface {
RETURNING(column ...Expression) InsertStatement
QUERY(selectStatement SelectStatement) InsertStatement
Execute(db types.Db) (sql.Result, error)
}
@ -27,7 +29,7 @@ func newInsertStatement(t WritableTable, columns ...Column) InsertStatement {
return &insertStatementImpl{
table: t,
columns: columns,
rows: make([][]Expression, 0, 1),
rows: make([][]Clause, 0, 1),
returning: make([]Expression, 0, 1),
}
}
@ -40,7 +42,8 @@ type columnAssignment struct {
type insertStatementImpl struct {
table WritableTable
columns []Column
rows [][]Expression
rows [][]Clause
query SelectStatement
returning []Expression
errors []string
@ -58,24 +61,16 @@ func (i *insertStatementImpl) Execute(db types.Db) (res sql.Result, err error) {
return
}
//func (i *insertStatementImpl) ExecuteInTx(tx *sql.Tx) (res sql.Result, err error) {
// query, err := i.String()
//
// if err != nil {
// return
// }
//
// res, err = tx.Exec(query)
//
// return
//}
func (s *insertStatementImpl) VALUES(values ...interface{}) InsertStatement {
literalRow := []Expression{}
literalRow := []Clause{}
for _, value := range values {
if clause, ok := value.(Clause); ok {
literalRow = append(literalRow, clause)
} else {
literalRow = append(literalRow, Literal(value))
}
}
s.rows = append(s.rows, literalRow)
return s
@ -98,7 +93,7 @@ func (i *insertStatementImpl) VALUES_MAPPING(data interface{}) InsertStatement {
return i
}
rowValues := []Expression{}
rowValues := []Clause{}
for _, column := range i.columns {
columnName := column.Name()
@ -125,6 +120,12 @@ func (i *insertStatementImpl) RETURNING(column ...Expression) InsertStatement {
return i
}
func (i *insertStatementImpl) QUERY(selectStatement SelectStatement) InsertStatement {
i.query = selectStatement
return i
}
func (i *insertStatementImpl) addError(err string) {
i.errors = append(i.errors, err)
}
@ -144,12 +145,7 @@ func (s *insertStatementImpl) String() (sql string, err error) {
buf.WriteString(s.table.SchemaName() + "." + s.table.TableName())
if len(s.columns) == 0 {
return "", errors.Newf(
"No column specified. Generated sql: %s",
buf.String())
}
if len(s.columns) > 0 {
_, _ = buf.WriteString(" (")
for i, col := range s.columns {
if i > 0 {
@ -165,13 +161,19 @@ func (s *insertStatementImpl) String() (sql string, err error) {
buf.WriteString(col.Name())
}
if len(s.rows) == 0 {
return "", errors.Newf(
"No row specified. Generated sql: %s",
buf.String())
buf.WriteString(") ")
}
_, _ = buf.WriteString(") VALUES (")
if len(s.rows) == 0 && s.query == nil {
return "", errors.Newf("No row or query specified. Generated sql: %s", buf.String())
}
if len(s.rows) > 0 && s.query != nil {
return "", errors.Newf("Only new rows or query has to be specified. Generated sql: %s", buf.String())
}
if len(s.rows) > 0 {
_, _ = buf.WriteString("VALUES (")
for row_i, row := range s.rows {
if row_i > 0 {
_, _ = buf.WriteString(", (")
@ -202,6 +204,15 @@ func (s *insertStatementImpl) String() (sql string, err error) {
}
_ = buf.WriteByte(')')
}
}
if s.query != nil {
err = s.query.SerializeSql(buf)
if err != nil {
return
}
}
if len(s.returning) > 0 {
buf.WriteString(" RETURNING ")

23
sqlbuilder/insert_statement_test.go
View file

@ -123,3 +123,26 @@ func TestInsertValuesFromModelColumnMismatch(t *testing.T) {
fmt.Println(err)
assert.Assert(t, err != nil)
}
func TestInsertQuery(t *testing.T) {
stmt := table1.INSERT(table1Col1).
QUERY(table1.SELECT(table1Col1))
stmtStr, err := stmt.String()
assert.NilError(t, err)
fmt.Println(stmtStr)
}
func TestInsertDefaultValue(t *testing.T) {
stmt := table1.INSERT(table1Col1, table1Col2).
VALUES(DEFAULT, "two")
stmtStr, err := stmt.String()
assert.NilError(t, err)
fmt.Println(stmtStr)
}

15
sqlbuilder/keyword.go Normal file
View file

@ -0,0 +1,15 @@
package sqlbuilder
import "bytes"
const (
DEFAULT keywordClause = "DEFAULT"
)
type keywordClause string
func (k keywordClause) SerializeSql(out *bytes.Buffer, options ...serializeOption) error {
out.WriteString(string(k))
return nil
}

2
sqlbuilder/select_statement.go
View file

@ -73,7 +73,7 @@ func (s *selectStatementImpl) SerializeSql(out *bytes.Buffer, options ...seriali
return err
}
out.WriteString("( ")
out.WriteString("(")
out.WriteString(str)
out.WriteString(")")

45
tests/insert_test.go
View file

@ -2,6 +2,8 @@ package tests
import (
"fmt"
"github.com/davecgh/go-spew/spew"
"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"
@ -9,11 +11,11 @@ import (
)
func TestInsertValues(t *testing.T) {
insertQuery := table.Link.INSERT(table.Link.URL, table.Link.Name).
VALUES("http://www.postgresqltutorial.com", "PostgreSQL Tutorial").
VALUES("http://www.google.com", "Google").
VALUES("http://www.yahoo.com", "Yahoo").
VALUES("http://www.bing.com", "Bing").
insertQuery := table.Link.INSERT(table.Link.URL, table.Link.Name, table.Link.Rel).
VALUES("http://www.postgresqltutorial.com", "PostgreSQL Tutorial", sqlbuilder.DEFAULT).
VALUES("http://www.google.com", "Google", sqlbuilder.DEFAULT).
VALUES("http://www.yahoo.com", "Yahoo", sqlbuilder.DEFAULT).
VALUES("http://www.bing.com", "Bing", sqlbuilder.DEFAULT).
RETURNING(table.Link.ID)
insertQueryStr, err := insertQuery.String()
@ -22,7 +24,7 @@ func TestInsertValues(t *testing.T) {
fmt.Println(insertQueryStr)
assert.Equal(t, insertQueryStr, `INSERT INTO test_sample.link (url,name) VALUES ('http://www.postgresqltutorial.com','PostgreSQL Tutorial'), ('http://www.google.com','Google'), ('http://www.yahoo.com','Yahoo'), ('http://www.bing.com','Bing') 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;`)
res, err := insertQuery.Execute(db)
assert.NilError(t, err)
@ -62,7 +64,8 @@ func TestInsertDataObject(t *testing.T) {
Rel: nil,
}
query := table.Link.INSERT(table.Link.URL, table.Link.Name).
query := table.Link.
INSERT(table.Link.URL, table.Link.Name).
VALUES_MAPPING(linkData)
queryStr, err := query.String()
@ -77,3 +80,31 @@ func TestInsertDataObject(t *testing.T) {
fmt.Println(result)
}
func TestInsertQuery(t *testing.T) {
_, err := table.Link.INSERT(table.Link.URL, table.Link.Name).
VALUES("http://www.postgresqltutorial.com", "PostgreSQL Tutorial").Execute(db)
assert.NilError(t, err)
query := table.Link.
INSERT(table.Link.URL, table.Link.Name).
QUERY(table.Link.SELECT(table.Link.URL, table.Link.Name))
queryStr, err := query.String()
assert.NilError(t, err)
fmt.Println(queryStr)
_, err = query.Execute(db)
assert.NilError(t, err)
allLinks := []model.Link{}
err = table.Link.SELECT(table.Link.AllColumns).Execute(db, &allLinks)
assert.NilError(t, err)
spew.Dump(allLinks)
}