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

69
mysql/dialect.go
View file

@ -1,7 +1,6 @@
package mysql
import (
"errors"
"github.com/go-jet/jet/internal/jet"
)
@ -31,63 +30,49 @@ func NewDialect() jet.Dialect {
}
func mysql_BIT_XOR(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 XOR")
}
lhs := expressions[0]
rhs := expressions[1]
if err := jet.Serialize(lhs, statement, out, options...); err != nil {
return err
}
jet.Serialize(lhs, statement, out, options...)
out.WriteString("^")
if err := jet.Serialize(rhs, statement, out, options...); err != nil {
return err
}
return nil
jet.Serialize(rhs, statement, out, options...)
}
}
func mysql_CONCAT_operator(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 CONCAT")
}
out.WriteString("CONCAT(")
if err := jet.Serialize(expressions[0], statement, out, options...); err != nil {
return err
}
jet.Serialize(expressions[0], statement, out, options...)
out.WriteString(", ")
if err := jet.Serialize(expressions[1], statement, out, options...); err != nil {
return err
}
jet.Serialize(expressions[1], statement, out, options...)
out.WriteString(")")
return nil
}
}
func mysql_DIVISION(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 DIV")
}
lhs := expressions[0]
rhs := expressions[1]
if err := jet.Serialize(lhs, statement, out, options...); err != nil {
return err
}
jet.Serialize(lhs, statement, out, options...)
_, isLhsInt := lhs.(IntegerExpression)
_, isRhsInt := rhs.(IntegerExpression)
@ -98,44 +83,26 @@ func mysql_DIVISION(expressions ...jet.Expression) jet.SerializeFunc {
out.WriteString("/")
}
if err := jet.Serialize(rhs, statement, out, options...); err != nil {
return err
}
return nil
jet.Serialize(rhs, statement, out, options...)
}
}
func mysql_IS_NOT_DISTINCT_FROM(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")
}
if err := jet.Serialize(expressions[0], statement, out); err != nil {
return err
panic("jet: invalid number of expressions for operator")
}
jet.Serialize(expressions[0], statement, out)
out.WriteString("<=>")
if err := jet.Serialize(expressions[1], statement, out); err != nil {
return err
}
return nil
jet.Serialize(expressions[1], statement, out)
}
}
func mysql_IS_DISTINCT_FROM(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) {
out.WriteString("NOT(")
err := mysql_IS_NOT_DISTINCT_FROM(expressions...)(statement, out, options...)
if err != nil {
return err
}
mysql_IS_NOT_DISTINCT_FROM(expressions...)(statement, out, options...)
out.WriteString(")")
return nil
}
}

4
mysql/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
mysql/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

2
mysql/update_statement_test.go
View file

@ -59,5 +59,5 @@ WHERE table1.col1 = ?;
func TestInvalidInputs(t *testing.T) {
assertStatementSqlErr(t, table1.UPDATE(table1ColInt).SET(1), "jet: WHERE clause not set")
assertStatementSqlErr(t, table1.UPDATE(nil).SET(1), "jet: nil column in columns list")
assertStatementSqlErr(t, table1.UPDATE(nil).SET(1), "jet: nil column in columns list for SET clause")
}