From 97f1b463521f37fe4d80e3b3a2670ff820834b36 Mon Sep 17 00:00:00 2001 From: go-jet Date: Sun, 9 Mar 2025 18:22:31 +0100 Subject: [PATCH] Revert go version change and mariadb. --- .circleci/config.yml | 2 +- .github/workflows/code_scanner.yml | 2 +- go.mod | 2 +- internal/jet/sql_builder.go | 2 ++ qrm/internal/null_types.go | 12 ++++++------ qrm/internal/null_types_test.go | 10 +++++----- sqlite/literal.go | 1 + tests/docker-compose.yaml | 2 +- tests/sqlite/sample_test.go | 2 +- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c54388..1518364 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 diff --git a/.github/workflows/code_scanner.yml b/.github/workflows/code_scanner.yml index 961a13f..d4ecc5d 100644 --- a/.github/workflows/code_scanner.yml +++ b/.github/workflows/code_scanner.yml @@ -11,7 +11,7 @@ permissions: contents: read env: - go_version: "1.23.6" + go_version: "1.22.8" jobs: diff --git a/go.mod b/go.mod index fade9ff..8707040 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/go-jet/jet/v2 -go 1.21 +go 1.22 // used by jet generator require ( diff --git a/internal/jet/sql_builder.go b/internal/jet/sql_builder.go index d4113a0..7077af4 100644 --- a/internal/jet/sql_builder.go +++ b/internal/jet/sql_builder.go @@ -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)) } diff --git a/qrm/internal/null_types.go b/qrm/internal/null_types.go index 6f7a270..1881b72 100644 --- a/qrm/internal/null_types.go +++ b/qrm/internal/null_types.go @@ -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 diff --git a/qrm/internal/null_types_test.go b/qrm/internal/null_types_test.go index eab2dd2..3feeffc 100644 --- a/qrm/internal/null_types_test.go +++ b/qrm/internal/null_types_test.go @@ -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) } diff --git a/sqlite/literal.go b/sqlite/literal.go index 2069711..296bee9 100644 --- a/sqlite/literal.go +++ b/sqlite/literal.go @@ -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)) } diff --git a/tests/docker-compose.yaml b/tests/docker-compose.yaml index 3bef6b7..8c0d2a2 100644 --- a/tests/docker-compose.yaml +++ b/tests/docker-compose.yaml @@ -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: diff --git a/tests/sqlite/sample_test.go b/tests/sqlite/sample_test.go index 0655f1f..2740f8b 100644 --- a/tests/sqlite/sample_test.go +++ b/tests/sqlite/sample_test.go @@ -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"