Revert go version change and mariadb.
This commit is contained in:
parent
950b33191e
commit
97f1b46352
9 changed files with 19 additions and 16 deletions
|
|
@ -8,7 +8,7 @@ jobs:
|
|||
build_and_tests:
|
||||
docker:
|
||||
# specify the version
|
||||
- image: cimg/go:1.23.6
|
||||
- image: cimg/go:1.22.8
|
||||
|
||||
# Please keep the version in sync with test/docker-compose.yaml
|
||||
- image: cimg/postgres:14.1
|
||||
|
|
|
|||
2
.github/workflows/code_scanner.yml
vendored
2
.github/workflows/code_scanner.yml
vendored
|
|
@ -11,7 +11,7 @@ permissions:
|
|||
contents: read
|
||||
|
||||
env:
|
||||
go_version: "1.23.6"
|
||||
go_version: "1.22.8"
|
||||
|
||||
|
||||
jobs:
|
||||
|
|
|
|||
2
go.mod
2
go.mod
|
|
@ -1,6 +1,6 @@
|
|||
module github.com/go-jet/jet/v2
|
||||
|
||||
go 1.21
|
||||
go 1.22
|
||||
|
||||
// used by jet generator
|
||||
require (
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ func (s *SQLBuilder) WriteProjections(statement StatementType, projections []Pro
|
|||
s.DecreaseIdent()
|
||||
}
|
||||
|
||||
// WriteRowToJsonProjections serializes slice of projections intended for row_to_json json aggregation
|
||||
func (s *SQLBuilder) WriteRowToJsonProjections(statement StatementType, projections []Projection) {
|
||||
for i, projection := range projections {
|
||||
if i > 0 {
|
||||
|
|
@ -109,6 +110,7 @@ func (s *SQLBuilder) WriteString(str string) {
|
|||
s.write([]byte(str))
|
||||
}
|
||||
|
||||
// WriteJsonObjKey serializes json object key
|
||||
func (s *SQLBuilder) WriteJsonObjKey(key string) {
|
||||
s.WriteString(fmt.Sprintf(`'%s', `, key))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import (
|
|||
)
|
||||
|
||||
var (
|
||||
castOverFlowError = fmt.Errorf("cannot cast a negative value to an unsigned value, buffer overflow error")
|
||||
errCastOverFlow = fmt.Errorf("cannot cast a negative value to an unsigned value, buffer overflow error")
|
||||
)
|
||||
|
||||
// NullBool struct
|
||||
|
|
@ -92,31 +92,31 @@ func (n *NullUInt64) Scan(value interface{}) error {
|
|||
return nil
|
||||
case int64:
|
||||
if v < 0 {
|
||||
return castOverFlowError
|
||||
return errCastOverFlow
|
||||
}
|
||||
n.UInt64, n.Valid = uint64(v), true
|
||||
return nil
|
||||
case int32:
|
||||
if v < 0 {
|
||||
return castOverFlowError
|
||||
return errCastOverFlow
|
||||
}
|
||||
n.UInt64, n.Valid = uint64(v), true
|
||||
return nil
|
||||
case int16:
|
||||
if v < 0 {
|
||||
return castOverFlowError
|
||||
return errCastOverFlow
|
||||
}
|
||||
n.UInt64, n.Valid = uint64(v), true
|
||||
return nil
|
||||
case int8:
|
||||
if v < 0 {
|
||||
return castOverFlowError
|
||||
return errCastOverFlow
|
||||
}
|
||||
n.UInt64, n.Valid = uint64(v), true
|
||||
return nil
|
||||
case int:
|
||||
if v < 0 {
|
||||
return castOverFlowError
|
||||
return errCastOverFlow
|
||||
}
|
||||
n.UInt64, n.Valid = uint64(v), true
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -103,25 +103,25 @@ func TestNullUInt64(t *testing.T) {
|
|||
//Validate negative use cases
|
||||
err := nullUInt64.Scan(int64(-5))
|
||||
assert.NotNil(t, err)
|
||||
assert.Error(t, err, castOverFlowError)
|
||||
assert.Error(t, err, errCastOverFlow)
|
||||
|
||||
//Validate negative use cases
|
||||
err = nullUInt64.Scan(-5)
|
||||
assert.NotNil(t, err)
|
||||
assert.Error(t, err, castOverFlowError)
|
||||
assert.Error(t, err, errCastOverFlow)
|
||||
|
||||
//Validate negative use cases
|
||||
err = nullUInt64.Scan(int32(-5))
|
||||
assert.NotNil(t, err)
|
||||
assert.Error(t, err, castOverFlowError)
|
||||
assert.Error(t, err, errCastOverFlow)
|
||||
|
||||
//Validate negative use cases
|
||||
err = nullUInt64.Scan(int16(-5))
|
||||
assert.NotNil(t, err)
|
||||
assert.Error(t, err, castOverFlowError)
|
||||
assert.Error(t, err, errCastOverFlow)
|
||||
|
||||
//Validate negative use cases
|
||||
err = nullUInt64.Scan(int8(-5))
|
||||
assert.NotNil(t, err)
|
||||
assert.Error(t, err, castOverFlowError)
|
||||
assert.Error(t, err, errCastOverFlow)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ var Decimal = jet.Decimal
|
|||
// String creates new string literal expression
|
||||
var String = jet.String
|
||||
|
||||
// Blob creates new blob literal expression
|
||||
func Blob(data []byte) BlobExpression {
|
||||
return BlobExp(jet.Literal(data))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ services:
|
|||
- ./testdata/init/mysql:/docker-entrypoint-initdb.d
|
||||
|
||||
mariadb:
|
||||
image: mariadb:11.7
|
||||
image: mariadb:11.4
|
||||
command: ['--default-authentication-plugin=mysql_native_password', '--log_bin_trust_function_creators=1']
|
||||
restart: always
|
||||
environment:
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ package sqlite
|
|||
|
||||
import (
|
||||
"github.com/go-jet/jet/v2/internal/testutils"
|
||||
"github.com/go-jet/jet/v2/qrm"
|
||||
"github.com/go-jet/jet/v2/internal/utils/ptr"
|
||||
"github.com/go-jet/jet/v2/qrm"
|
||||
"github.com/stretchr/testify/require"
|
||||
"testing"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue