* feature extend readthrough for cache module (#5116) * feature 增加readthrough * feature: add write though for cache mode (#5117) * feature: add writethough for cache mode * feature add singleflight cache (#5119) * build(deps): bump go.opentelemetry.io/otel/trace from 1.8.0 to 1.11.2 Bumps [go.opentelemetry.io/otel/trace](https://github.com/open-telemetry/opentelemetry-go) from 1.8.0 to 1.11.2. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.8.0...v1.11.2) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/trace dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix 5129: must set formatter after init the logger * remove beego.vip * build(deps): bump actions/stale from 5 to 7 Bumps [actions/stale](https://github.com/actions/stale) from 5 to 7. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v5...v7) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix 5079: only log msg when the channel is not closed (#5132) * optimize test * upgrade otel dependencies to v1.11.2 * format code * Bloom filter cache (#5126) * feature: add bloom filter cache * feature upload remove all temp file * bugfix Controller SaveToFile remove all temp file * rft: motify BeeLogger signalChan (#5139) * add non-block write log in asynchronous mode (#5150) * add non-block write log in asynchronous mode --------- Co-authored-by: chenhaokun <chenhaokun@itiger.com> * fix the docsite URL (#5173) * Unified gopkg.in/yaml version to v2 (#5169) * Unified gopkg.in/yaml version to v2 and go mod tidy * update CHANGELOG * bugfix: protect field access with lock to avoid possible data race (#5211) * fix some comments (#5194) Signed-off-by: cui fliter <imcusg@gmail.com> * build(deps): bump github.com/prometheus/client_golang (#5213) Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.14.0 to 1.15.1. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.14.0...v1.15.1) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump go.etcd.io/etcd/client/v3 from 3.5.4 to 3.5.9 (#5209) Bumps [go.etcd.io/etcd/client/v3](https://github.com/etcd-io/etcd) from 3.5.4 to 3.5.9. - [Release notes](https://github.com/etcd-io/etcd/releases) - [Commits](https://github.com/etcd-io/etcd/compare/v3.5.4...v3.5.9) --- updated-dependencies: - dependency-name: go.etcd.io/etcd/client/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * cache: fix typo and optimize the naming * Release 2.1.0 change log * bugfix: beegoAppConfig String and Strings function has bug * httplib: fix unstable test, do not use httplib.org * chore: pkg imported more than once * chore: fmt modify * chore: Use github.com/go-kit/log * chore: unnecessary use of fmt.Sprintf * fix: golangci-lint error * orm: refactor ORM introducing internal/models pkg * remove adapter package * build(deps): bump github.com/bits-and-blooms/bloom/v3 Bumps [github.com/bits-and-blooms/bloom/v3](https://github.com/bits-and-blooms/bloom) from 3.3.1 to 3.5.0. - [Release notes](https://github.com/bits-and-blooms/bloom/releases) - [Commits](https://github.com/bits-and-blooms/bloom/compare/v3.3.1...v3.5.0) --- updated-dependencies: - dependency-name: github.com/bits-and-blooms/bloom/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * feat: add write-delete cache mode * fix: unnecessary assignment to the blank identifier * fix: add change into .CHANGELOG file * build(deps): bump golang.org/x/sync from 0.1.0 to 0.3.0 Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.1.0 to 0.3.0. - [Commits](https://github.com/golang/sync/compare/v0.1.0...v0.3.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump golang.org/x/crypto Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.0.0-20220315160706-3147a52a75dd to 0.10.0. - [Commits](https://github.com/golang/crypto/commits/v0.10.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * remove golang--lint-ci * Beego web.Run() runs the server twice * fix 5255: Check the rows.Err() if rows.Next() is false * closes 5254: %COL% should be a common placeholder * build(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.15.1 to 1.16.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.15.1...v1.16.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix: use of ioutil package (#5261) * fix ioutil.NopCloser * fix ioutil.ReadAll * fix ioutil.ReadFile * fix ioutil.WriteFile * run goimports -w -format-only ./ * update CHANGELOG.md * feature: add write-double-delete cache mode (#5263) * cache/redis: support skipEmptyPrefix option (#5264) * fix: refactor InsertValue method (#5267) * fix: refactor insertValue method and add the test * fix: exec goimports and add Licence file header * fix: modify construct method of dbBase * fix: add modify record into CHANGELOG * fix: modify InsertOrUpdate method (#5269) * fix: modify InsertOrUpdate method, Remove the isMulti variable and its associated code * fix: Delete unnecessary judgment branches * fix: add modify record into CHANGELOG * cache/redis: use redisConfig to receive incoming JSON (previously using a map) (#5268) * refactor cache/redis: Use redisConfig to receive incoming JSON (previously using a map). * refactor cache/redis: Use the string type to receive JSON parameters. --------- Co-authored-by: Tan <tanqianheng@gmail.com> * fix: refactor Delete method (#5271) * fix: refactor Delete method and add test * fix: add modify record into CHANGELOG * fix: refactor update sql (#5274) * fix: refactor UpdateSQL method and add test * fix: add modify record into CHANGELOG * fix: modify url in the CHANGELOG * fix: modify pr url in the CHANGELOG * Fix setPK function for table without primary key (#5276) --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: cui fliter <imcusg@gmail.com> Co-authored-by: Stone-afk <73482944+Stone-afk@users.noreply.github.com> Co-authored-by: hookokoko <hooko@tju.edu.cn> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: hookokoko <648646891@qq.com> Co-authored-by: Stone-afk <1711865140@qq.com> Co-authored-by: chenhaokun <chenhaokun@itiger.com> Co-authored-by: Xuing <admin@xuing.cn> Co-authored-by: cui fliter <imcusg@gmail.com> Co-authored-by: guoguangwu <guoguangwu@magic-shield.com> Co-authored-by: uzziah <uzziahlin@gmail.com> Co-authored-by: Hanjiang Yu <delacroix.yu@gmail.com> Co-authored-by: Kota <mdryzk64smsh@gmail.com> Co-authored-by: Uzziah <120019273+uzziahlin@users.noreply.github.com> Co-authored-by: Handkerchiefs-t <59816423+Handkerchiefs-t@users.noreply.github.com> Co-authored-by: Tan <tanqianheng@gmail.com> Co-authored-by: mlgd <mlgd17@gmail.com>
232 lines
5.4 KiB
Go
232 lines
5.4 KiB
Go
// Copyright 2020 beego
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package orm
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
"github.com/beego/beego/v2/client/orm/internal/models"
|
|
)
|
|
|
|
func TestDbBase_InsertValueSQL(t *testing.T) {
|
|
|
|
mi := &models.ModelInfo{
|
|
Table: "test_table",
|
|
}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
db *dbBase
|
|
isMulti bool
|
|
names []string
|
|
values []interface{}
|
|
|
|
wantRes string
|
|
}{
|
|
{
|
|
name: "single insert by dbBase",
|
|
db: &dbBase{
|
|
ins: &dbBase{},
|
|
},
|
|
isMulti: false,
|
|
names: []string{"name", "age"},
|
|
values: []interface{}{"test", 18},
|
|
wantRes: "INSERT INTO `test_table` (`name`, `age`) VALUES (?, ?)",
|
|
},
|
|
{
|
|
name: "single insert by dbBasePostgres",
|
|
db: &dbBase{
|
|
ins: newdbBasePostgres(),
|
|
},
|
|
isMulti: false,
|
|
names: []string{"name", "age"},
|
|
values: []interface{}{"test", 18},
|
|
wantRes: "INSERT INTO \"test_table\" (\"name\", \"age\") VALUES ($1, $2)",
|
|
},
|
|
{
|
|
name: "multi insert by dbBase",
|
|
db: &dbBase{
|
|
ins: &dbBase{},
|
|
},
|
|
isMulti: true,
|
|
names: []string{"name", "age"},
|
|
values: []interface{}{"test", 18, "test2", 19},
|
|
wantRes: "INSERT INTO `test_table` (`name`, `age`) VALUES (?, ?), (?, ?)",
|
|
},
|
|
{
|
|
name: "multi insert by dbBasePostgres",
|
|
db: &dbBase{
|
|
ins: newdbBasePostgres(),
|
|
},
|
|
isMulti: true,
|
|
names: []string{"name", "age"},
|
|
values: []interface{}{"test", 18, "test2", 19},
|
|
wantRes: "INSERT INTO \"test_table\" (\"name\", \"age\") VALUES ($1, $2), ($3, $4)",
|
|
},
|
|
{
|
|
name: "multi insert by dbBase but values is not enough",
|
|
db: &dbBase{
|
|
ins: &dbBase{},
|
|
},
|
|
isMulti: true,
|
|
names: []string{"name", "age"},
|
|
values: []interface{}{"test", 18, "test2"},
|
|
wantRes: "INSERT INTO `test_table` (`name`, `age`) VALUES (?, ?)",
|
|
},
|
|
{
|
|
name: "multi insert by dbBasePostgres but values is not enough",
|
|
db: &dbBase{
|
|
ins: newdbBasePostgres(),
|
|
},
|
|
isMulti: true,
|
|
names: []string{"name", "age"},
|
|
values: []interface{}{"test", 18, "test2"},
|
|
wantRes: "INSERT INTO \"test_table\" (\"name\", \"age\") VALUES ($1, $2)",
|
|
},
|
|
{
|
|
name: "single insert by dbBase but values is double to names",
|
|
db: &dbBase{
|
|
ins: &dbBase{},
|
|
},
|
|
isMulti: false,
|
|
names: []string{"name", "age"},
|
|
values: []interface{}{"test", 18, "test2", 19},
|
|
wantRes: "INSERT INTO `test_table` (`name`, `age`) VALUES (?, ?)",
|
|
},
|
|
{
|
|
name: "single insert by dbBasePostgres but values is double to names",
|
|
db: &dbBase{
|
|
ins: newdbBasePostgres(),
|
|
},
|
|
isMulti: false,
|
|
names: []string{"name", "age"},
|
|
values: []interface{}{"test", 18, "test2", 19},
|
|
wantRes: "INSERT INTO \"test_table\" (\"name\", \"age\") VALUES ($1, $2)",
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
|
|
res := tc.db.InsertValueSQL(tc.names, tc.values, tc.isMulti, mi)
|
|
|
|
assert.Equal(t, tc.wantRes, res)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestDbBase_UpdateSQL(t *testing.T) {
|
|
mi := &models.ModelInfo{
|
|
Table: "test_table",
|
|
}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
db *dbBase
|
|
|
|
setNames []string
|
|
pkName string
|
|
|
|
wantRes string
|
|
}{
|
|
{
|
|
name: "update by dbBase",
|
|
db: &dbBase{
|
|
ins: &dbBase{},
|
|
},
|
|
setNames: []string{"name", "age", "sender"},
|
|
pkName: "id",
|
|
wantRes: "UPDATE `test_table` SET `name` = ?, `age` = ?, `sender` = ? WHERE `id` = ?",
|
|
},
|
|
{
|
|
name: "update by dbBasePostgres",
|
|
db: &dbBase{
|
|
ins: newdbBasePostgres(),
|
|
},
|
|
setNames: []string{"name", "age", "sender"},
|
|
pkName: "id",
|
|
wantRes: "UPDATE \"test_table\" SET \"name\" = $1, \"age\" = $2, \"sender\" = $3 WHERE \"id\" = $4",
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
|
|
res := tc.db.UpdateSQL(tc.setNames, tc.pkName, mi)
|
|
|
|
assert.Equal(t, tc.wantRes, res)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestDbBase_DeleteSQL(t *testing.T) {
|
|
mi := &models.ModelInfo{
|
|
Table: "test_table",
|
|
}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
db *dbBase
|
|
|
|
whereCols []string
|
|
|
|
wantRes string
|
|
}{
|
|
{
|
|
name: "delete by dbBase with id",
|
|
db: &dbBase{
|
|
ins: &dbBase{},
|
|
},
|
|
whereCols: []string{"id"},
|
|
wantRes: "DELETE FROM `test_table` WHERE `id` = ?",
|
|
},
|
|
{
|
|
name: "delete by dbBase not id",
|
|
db: &dbBase{
|
|
ins: &dbBase{},
|
|
},
|
|
whereCols: []string{"name", "age"},
|
|
wantRes: "DELETE FROM `test_table` WHERE `name` = ? AND `age` = ?",
|
|
},
|
|
{
|
|
name: "delete by dbBasePostgres with id",
|
|
db: &dbBase{
|
|
ins: newdbBasePostgres(),
|
|
},
|
|
whereCols: []string{"id"},
|
|
wantRes: "DELETE FROM \"test_table\" WHERE \"id\" = $1",
|
|
},
|
|
{
|
|
name: "delete by dbBasePostgres not id",
|
|
db: &dbBase{
|
|
ins: newdbBasePostgres(),
|
|
},
|
|
whereCols: []string{"name", "age"},
|
|
wantRes: "DELETE FROM \"test_table\" WHERE \"name\" = $1 AND \"age\" = $2",
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
|
|
res := tc.db.DeleteSQL(tc.whereCols, mi)
|
|
|
|
assert.Equal(t, tc.wantRes, res)
|
|
})
|
|
}
|
|
}
|