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

SQL Builder panics on invalid SQL.

Browse source 
Query execution panics on invalid destination.
This commit is contained in:
go-jet 2019-08-13 13:57:26 +02:00
parent 14c2c9d745
commit 486e45db5c
42 changed files with 357 additions and 713 deletions
Download patch file Download diff file Expand all files Collapse all files

7
postgres/clauses.go
View file

@ -8,14 +8,13 @@ type ClauseReturning struct {
Projections []jet.Projection
}
func (r *ClauseReturning) Serialize(statementType jet.StatementType, out *jet.SqlBuilder) error {
func (r *ClauseReturning) Serialize(statementType jet.StatementType, out *jet.SqlBuilder) {
if len(r.Projections) == 0 {
return nil
return
}
out.NewLine()
out.WriteString("RETURNING")
out.IncreaseIdent()
return out.WriteProjections(statementType, r.Projections)
out.WriteProjections(statementType, r.Projections)
}

28
postgres/dialect.go
View file

@ -1,7 +1,6 @@
package postgres
import (
"errors"
"github.com/go-jet/jet/internal/jet"
"strconv"
"strings"
@ -30,9 +29,9 @@ func NewDialect() jet.Dialect {
}
func postgresCAST(expressions ...jet.Expression) jet.SerializeFunc {
return func(statement jet.StatementType, out *jet.SqlBuilder, options ...jet.SerializeOption) error {
return func(statement jet.StatementType, out *jet.SqlBuilder, options ...jet.SerializeOption) {
if len(expressions) < 2 {
return errors.New("jet: invalid number of expressions for operator")
panic("jet: invalid number of expressions for operator")
}
expression := expressions[0]
@ -40,32 +39,27 @@ func postgresCAST(expressions ...jet.Expression) jet.SerializeFunc {
litExpr, ok := expressions[1].(jet.LiteralExpression)
if !ok {
return errors.New("jet: cast invalid cast type")
panic("jet: cast invalid cast type")
}
castType, ok := litExpr.Value().(string)
if !ok {
return errors.New("jet: cast type is not string")
panic("jet: cast type is not string")
}
if err := jet.Serialize(expression, statement, out, options...); err != nil {
return err
}
jet.Serialize(expression, statement, out, options...)
out.WriteString("::" + castType)
return nil
}
}
func postgres_REGEXP_LIKE_function(expressions ...jet.Expression) jet.SerializeFunc {
return func(statement jet.StatementType, out *jet.SqlBuilder, options ...jet.SerializeOption) error {
return func(statement jet.StatementType, out *jet.SqlBuilder, options ...jet.SerializeOption) {
if len(expressions) < 2 {
return errors.New("jet: invalid number of expressions for operator")
panic("jet: invalid number of expressions for operator")
}
if err := jet.Serialize(expressions[0], statement, out, options...); err != nil {
return err
}
jet.Serialize(expressions[0], statement, out, options...)
caseSensitive := false
@ -83,10 +77,6 @@ func postgres_REGEXP_LIKE_function(expressions ...jet.Expression) jet.SerializeF
out.WriteString("~*")
}
if err := jet.Serialize(expressions[1], statement, out, options...); err != nil {
return err
}
return nil
jet.Serialize(expressions[1], statement, out, options...)
}
}

4
postgres/insert_statement_test.go
View file

@ -7,7 +7,7 @@ import (
)
func TestInvalidInsert(t *testing.T) {
assertStatementSqlErr(t, table1.INSERT(table1Col1), "jet: no row values or query specified")
assertStatementSqlErr(t, table1.INSERT(table1Col1), "jet: VALUES or QUERY has to be specified for INSERT statement")
assertStatementSqlErr(t, table1.INSERT(nil).VALUES(1), "jet: nil column in columns list")
}
@ -114,7 +114,7 @@ func TestInsertFromNonStructModel(t *testing.T) {
defer func() {
r := recover()
assert.Equal(t, r, "argument mismatch: expected struct, got []int")
assert.Equal(t, r, "jet: data has to be a struct")
}()
table2.INSERT(table2ColInt).MODEL([]int{})

4
postgres/select_table.go
View file

@ -8,13 +8,13 @@ type SelectTable interface {
}
type selectTableImpl struct {
jet.SelectTableImpl2
jet.SelectTableImpl
readableTableInterfaceImpl
}
func newSelectTable(selectStmt jet.StatementWithProjections, alias string) SelectTable {
subQuery := &selectTableImpl{
SelectTableImpl2: jet.NewSelectTable(selectStmt, alias),
SelectTableImpl: jet.NewSelectTable(selectStmt, alias),
}
subQuery.readableTableInterfaceImpl.parent = subQuery

19
postgres/update_statement.go
View file

@ -1,7 +1,6 @@
package postgres
import (
"errors"
"github.com/go-jet/jet/internal/jet"
)
@ -62,23 +61,19 @@ type ClauseSet struct {
Values []jet.Serializer
}
func (s *ClauseSet) Serialize(statementType jet.StatementType, out *jet.SqlBuilder) error {
func (s *ClauseSet) Serialize(statementType jet.StatementType, out *jet.SqlBuilder) {
out.NewLine()
out.WriteString("SET")
if len(s.Columns) == 0 {
return errors.New("jet: no columns selected")
panic("jet: no columns selected")
}
if len(s.Columns) > 1 {
out.WriteString("(")
}
err := jet.SerializeColumnNames(s.Columns, out)
if err != nil {
return err
}
jet.SerializeColumnNames(s.Columns, out)
if len(s.Columns) > 1 {
out.WriteString(")")
@ -90,15 +85,9 @@ func (s *ClauseSet) Serialize(statementType jet.StatementType, out *jet.SqlBuild
out.WriteString("(")
}
err = jet.SerializeClauseList(statementType, s.Values, out)
if err != nil {
return err
}
jet.SerializeClauseList(statementType, s.Values, out)
if len(s.Values) > 1 {
out.WriteString(")")
}
return nil
}