Skip to content

Commit

Permalink
修复 deepsource 和 codecov 的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
flycash committed Feb 25, 2023
1 parent 96404a4 commit f57e3af
Show file tree
Hide file tree
Showing 64 changed files with 232 additions and 238 deletions.
126 changes: 63 additions & 63 deletions .CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
## 开发中
- [eorm: Distinct功能](https://github.com/ecodehub/eorm/pull/116)
- [eorm: aop方案的支持](https://github.com/ecodehub/eorm/pull/117)
- [eorm: 利用 aop 接口打印 SQL](https://github.com/ecodehub/eorm/pull/123)
- [eorm: 插入忽略主键](https://github.com/ecodehub/eorm/pull/126)
- [eorm: join查询](https://github.com/ecodehub/eorm/pull/122)
- [eorm: 重构 JOIN 查询](https://github.com/ecodehub/eorm/pull/130)
- [eorm: 新增子查詢](https://github.com/ecodehub/eorm/pull/131)
- [eorm: 取消支持 Having 中使用 alias](https://github.com/ecodehub/eorm/pull/135)
- [eorm: 删除 IsAutoIncrement 字段](https://github.com/ecodehub/eorm/pull/136)
- [eorm: 删除 IsHolderType](https://github.com/ecodehub/eorm/pull/137)
- [eorm: MasterSlaveDB实现](https://github.com/ecodehub/eorm/pull/146)
- [eorm: 重构 Update 语句忽略零值和Nil](https://github.com/ecodehub/eorm/pull/138)
- [eorm: 基于dns的slave发现](https://github.com/ecodehub/eorm/pull/152)
- [eorm: Distinct功能](https://github.com/ecodeclub/eorm/pull/116)
- [eorm: aop方案的支持](https://github.com/ecodeclub/eorm/pull/117)
- [eorm: 利用 aop 接口打印 SQL](https://github.com/ecodeclub/eorm/pull/123)
- [eorm: 插入忽略主键](https://github.com/ecodeclub/eorm/pull/126)
- [eorm: join查询](https://github.com/ecodeclub/eorm/pull/122)
- [eorm: 重构 JOIN 查询](https://github.com/ecodeclub/eorm/pull/130)
- [eorm: 新增子查詢](https://github.com/ecodeclub/eorm/pull/131)
- [eorm: 取消支持 Having 中使用 alias](https://github.com/ecodeclub/eorm/pull/135)
- [eorm: 删除 IsAutoIncrement 字段](https://github.com/ecodeclub/eorm/pull/136)
- [eorm: 删除 IsHolderType](https://github.com/ecodeclub/eorm/pull/137)
- [eorm: MasterSlaveDB实现](https://github.com/ecodeclub/eorm/pull/146)
- [eorm: 重构 Update 语句忽略零值和Nil](https://github.com/ecodeclub/eorm/pull/138)
- [eorm: 基于dns的slave发现](https://github.com/ecodeclub/eorm/pull/152)

## v0.0.1:
- [Init Project](https://github.com/ecodehub/eorm/pull/1)
- [Selector Definition](https://github.com/ecodehub/eorm/pull/2)
- [Deleter Definition](https://github.com/ecodehub/eorm/pull/4)
- [Updater Definition](https://github.com/ecodehub/eorm/pull/8)
- [Rft: remove NilAsNullFunc](https://github.com/ecodehub/eorm/pull/48)
- [Metadata API](https://github.com/ecodehub/eorm/pull/16)
- [Add model register examples](https://github.com/ecodehub/eorm/pull/54)
- [tagMetaRegistry: default implementation of MetaRegistry](https://github.com/ecodehub/eorm/pull/25)
- [Rft: remove defaultRegistry](https://github.com/ecodehub/eorm/pull/46)
- [Use `bytebufferpool` for builder](https://github.com/ecodehub/eorm/pull/39)
- [Refactor: move Insert function into db.file](https://github.com/ecodehub/eorm/pull/28)
- [Selector implementation, excluding WHERE and HAVING clauses](https://github.com/ecodehub/eorm/pull/32)
- [Ignore columns by Tag and Option](https://github.com/ecodehub/eorm/pull/49)
- [Selector WHERE clause](https://github.com/ecodehub/eorm/pull/40)
- [Support Aggregate Functions](https://github.com/ecodehub/eorm/pull/37)
- [Updater implementation, excluding WHERE clause](https://github.com/ecodehub/eorm/pull/36)
- [Force test and lint in pre-push](https://github.com/ecodehub/eorm/pull/35)
- [Insert implementation ](https://github.com/ecodehub/eorm/pull/38)
- [Delete implementation ](https://github.com/ecodehub/eorm/pull/43)
- [Having implementation ](https://github.com/ecodehub/eorm/pull/45)
- [RawExpr accepts arguments ](https://github.com/ecodehub/eorm/pull/53)
- [Support having with alias functions](https://github.com/ecodehub/eorm/pull/55)
- [Add `NewSelector` function](https://github.com/ecodehub/eorm/pull/56)
- [Support using `RawExpr` as `Predicate`](https://github.com/ecodehub/eorm/pull/57)
- [Remove WithNil and WithZero function](https://github.com/ecodehub/eorm/pull/58)
- [改名为 eorm, 并且改为纯中文项目](https://github.com/ecodehub/eorm/pull/59)
- [internal/value: 抽象 Value 接口与基于反射的实现](https://github.com/ecodehub/eorm/pull/60)
- [eorm: 改为依赖 value 包来获取值](https://github.com/ecodehub/eorm/pull/62)
- [eorm: 使用eorm作为标签名字](https://github.com/ecodehub/eorm/pull/72)
- [eorm, valuer: 提供基于 unsafe 的 Value 实现](https://github.com/ecodehub/eorm/pull/75)
- [valuer: 删除对类型的特殊处理](https://github.com/ecodehub/eorm/pull/97)
- [eorm: 支持插入语句](https://github.com/ecodehub/eorm/pull/76)
- [eorm: 支持SELECT的 GET 方法](https://github.com/ecodehub/eorm/pull/76)
- [eorm: transaction API](https://github.com/ecodehub/eorm/pull/78)
- [eorm, internal/valuer: 摒弃中间表达,直接依赖于 Scan](https://github.com/ecodehub/eorm/pull/79)
- [eorm:修改 ErrNoRows 的语义,只有在 Get 才会返回](https://github.com/ecodehub/eorm/pull/80)
- [all: Field 取代 FieldByName](https://github.com/ecodehub/eorm/pull/90)
- [eorm: Delete的执行完成](https://github.com/ecodehub/eorm/pull/90)
- [eorm:Update 补充 Exec 方法](https://github.com/ecodehub/eorm/pull/98)
- [eorm: 支持使用组合定义模型](https://github.com/ecodehub/eorm/pull/99)
- [eorm: 增加 Result 抽象](https://github.com/ecodehub/eorm/pull/100)
- [eorm: 实现in查询功能](https://github.com/ecodehub/eorm/pull/102)
- [eorm: 补充实现组合定义模型后的测试用例](https://github.com/ecodehub/eorm/pull/104)
- [eorm: LIKE 查询](https://github.com/ecodehub/eorm/pull/105)
- [eorm: GetMulti功能](https://github.com/ecodehub/eorm/pull/109)
- [eorm: 支持基本类型作为返回值](https://github.com/ecodehub/eorm/pull/110)
- [eorm: 为组合模型增加集成测试](https://github.com/ecodehub/eorm/pull/111)
- [Add examples and docs for Aggregate and Assign](https://github.com/ecodehub/eorm/pull/50)
- [Add examples for Column and columns](https://github.com/ecodehub/eorm/pull/51)
- [Add examples for DB, Predicate, Deleter, Inserter](https://github.com/ecodehub/eorm/pull/520)
- [Init Project](https://github.com/ecodeclub/eorm/pull/1)
- [Selector Definition](https://github.com/ecodeclub/eorm/pull/2)
- [Deleter Definition](https://github.com/ecodeclub/eorm/pull/4)
- [Updater Definition](https://github.com/ecodeclub/eorm/pull/8)
- [Rft: remove NilAsNullFunc](https://github.com/ecodeclub/eorm/pull/48)
- [Metadata API](https://github.com/ecodeclub/eorm/pull/16)
- [Add model register examples](https://github.com/ecodeclub/eorm/pull/54)
- [tagMetaRegistry: default implementation of MetaRegistry](https://github.com/ecodeclub/eorm/pull/25)
- [Rft: remove defaultRegistry](https://github.com/ecodeclub/eorm/pull/46)
- [Use `bytebufferpool` for builder](https://github.com/ecodeclub/eorm/pull/39)
- [Refactor: move Insert function into db.file](https://github.com/ecodeclub/eorm/pull/28)
- [Selector implementation, excluding WHERE and HAVING clauses](https://github.com/ecodeclub/eorm/pull/32)
- [Ignore columns by Tag and Option](https://github.com/ecodeclub/eorm/pull/49)
- [Selector WHERE clause](https://github.com/ecodeclub/eorm/pull/40)
- [Support Aggregate Functions](https://github.com/ecodeclub/eorm/pull/37)
- [Updater implementation, excluding WHERE clause](https://github.com/ecodeclub/eorm/pull/36)
- [Force test and lint in pre-push](https://github.com/ecodeclub/eorm/pull/35)
- [Insert implementation ](https://github.com/ecodeclub/eorm/pull/38)
- [Delete implementation ](https://github.com/ecodeclub/eorm/pull/43)
- [Having implementation ](https://github.com/ecodeclub/eorm/pull/45)
- [RawExpr accepts arguments ](https://github.com/ecodeclub/eorm/pull/53)
- [Support having with alias functions](https://github.com/ecodeclub/eorm/pull/55)
- [Add `NewSelector` function](https://github.com/ecodeclub/eorm/pull/56)
- [Support using `RawExpr` as `Predicate`](https://github.com/ecodeclub/eorm/pull/57)
- [Remove WithNil and WithZero function](https://github.com/ecodeclub/eorm/pull/58)
- [改名为 eorm, 并且改为纯中文项目](https://github.com/ecodeclub/eorm/pull/59)
- [internal/value: 抽象 Value 接口与基于反射的实现](https://github.com/ecodeclub/eorm/pull/60)
- [eorm: 改为依赖 value 包来获取值](https://github.com/ecodeclub/eorm/pull/62)
- [eorm: 使用eorm作为标签名字](https://github.com/ecodeclub/eorm/pull/72)
- [eorm, valuer: 提供基于 unsafe 的 Value 实现](https://github.com/ecodeclub/eorm/pull/75)
- [valuer: 删除对类型的特殊处理](https://github.com/ecodeclub/eorm/pull/97)
- [eorm: 支持插入语句](https://github.com/ecodeclub/eorm/pull/76)
- [eorm: 支持SELECT的 GET 方法](https://github.com/ecodeclub/eorm/pull/76)
- [eorm: transaction API](https://github.com/ecodeclub/eorm/pull/78)
- [eorm, internal/valuer: 摒弃中间表达,直接依赖于 Scan](https://github.com/ecodeclub/eorm/pull/79)
- [eorm:修改 ErrNoRows 的语义,只有在 Get 才会返回](https://github.com/ecodeclub/eorm/pull/80)
- [all: Field 取代 FieldByName](https://github.com/ecodeclub/eorm/pull/90)
- [eorm: Delete的执行完成](https://github.com/ecodeclub/eorm/pull/90)
- [eorm:Update 补充 Exec 方法](https://github.com/ecodeclub/eorm/pull/98)
- [eorm: 支持使用组合定义模型](https://github.com/ecodeclub/eorm/pull/99)
- [eorm: 增加 Result 抽象](https://github.com/ecodeclub/eorm/pull/100)
- [eorm: 实现in查询功能](https://github.com/ecodeclub/eorm/pull/102)
- [eorm: 补充实现组合定义模型后的测试用例](https://github.com/ecodeclub/eorm/pull/104)
- [eorm: LIKE 查询](https://github.com/ecodeclub/eorm/pull/105)
- [eorm: GetMulti功能](https://github.com/ecodeclub/eorm/pull/109)
- [eorm: 支持基本类型作为返回值](https://github.com/ecodeclub/eorm/pull/110)
- [eorm: 为组合模型增加集成测试](https://github.com/ecodeclub/eorm/pull/111)
- [Add examples and docs for Aggregate and Assign](https://github.com/ecodeclub/eorm/pull/50)
- [Add examples for Column and columns](https://github.com/ecodeclub/eorm/pull/51)
- [Add examples for DB, Predicate, Deleter, Inserter](https://github.com/ecodeclub/eorm/pull/520)
8 changes: 2 additions & 6 deletions .deepsource.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021 ecodehub
# Copyright 2021 ecodeclub
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -19,9 +19,5 @@ name = "go"
enabled = true

[analyzers.meta]
import_root = "github.com/ecodehub/eorm"
import_root = "github.com/ecodeclub/eorm"
dependencies_vendored = false

[[analyzers]]
name = "test-coverage"
enabled = true
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ assignees: ''

**仅限中文**

在提之前请先查找[已有 issues](https://github.com/ecodehub/eorm/issues),避免重复上报。
在提之前请先查找[已有 issues](https://github.com/ecodeclub/eorm/issues),避免重复上报。

并且确保自己已经:
- [ ] 阅读过文档
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ labels: question

**仅限中文**

在提之前请先查找[已有 issues](https://github.com/ecodehub/eorm/issues),避免重复上报。
在提之前请先查找[已有 issues](https://github.com/ecodeclub/eorm/issues),避免重复上报。

并且确保自己已经:
- [ ] 阅读过文档
Expand Down
63 changes: 0 additions & 63 deletions .github/linters/.golangci.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/pre-commit
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# Copyright 2021 ecodehub
# Copyright 2021 ecodeclub
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .github/pre-push
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# Copyright 2021 ecodehub
# Copyright 2021 ecodeclub
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021 ecodehub
# Copyright 2021 ecodeclub
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go-fmt.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021 ecodehub
# Copyright 2021 ecodeclub
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021 ecodehub
# Copyright 2021 ecodeclub
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
61 changes: 61 additions & 0 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Copyright 2021 ecodeclub
#
# 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.

name: golangci-lint
on:
push:
tags:
- v*
branches:
- master
- main
- dev
pull_request:
permissions:
contents: read
# Optional: allow read access to pull request. Use with `only-new-issues` option.
# pull-requests: read
jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v3
with:
go-version: '1.18'
- uses: actions/checkout@v3
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: latest

# Optional: working directory, useful for monorepos
# working-directory: somedir

# Optional: golangci-lint command line arguments.
# args: --issues-exit-code=0

# Optional: show only new issues if it's a pull request. The default value is `false`.
only-new-issues: true

# Optional: if set to true then the all caching functionality will be complete disabled,
# takes precedence over all other caching options.
# skip-cache: true

# Optional: if set to true then the action don't cache or restore ~/go/pkg.
# skip-pkg-cache: true

# Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
# skip-build-cache: true
2 changes: 1 addition & 1 deletion .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021 ecodehub
# Copyright 2021 ecodeclub
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/license.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021 ecodehub
# Copyright 2021 ecodeclub
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021 ecodehub
# Copyright 2021 ecodeclub
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .licenserc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"**/*.go": "// Copyright 2021 ecodehub",
"**/*.{yml,toml}": "# Copyright 2021 ecodehub"
"**/*.{yml,toml}": "# Copyright 2021 ecodeclub"
}
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ tidy:

.PHONY: check
check:
@$(MAKE) fmt
@$(MAKE) tidy
@$(MAKE) --no-print-directory fmt
@$(MAKE) --no-print-directory tidy

# e2e 测试
.PHONY: e2e
Expand Down
4 changes: 2 additions & 2 deletions builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"database/sql"

"github.com/ecodehub/eorm/internal/errs"
"github.com/ecodehub/eorm/internal/model"
"github.com/ecodeclub/eorm/internal/errs"
"github.com/ecodeclub/eorm/internal/model"
"github.com/valyala/bytebufferpool"
)

Expand Down
4 changes: 2 additions & 2 deletions builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"testing"

"github.com/DATA-DOG/go-sqlmock"
"github.com/ecodehub/eorm/internal/errs"
"github.com/ecodehub/eorm/internal/valuer"
"github.com/ecodeclub/eorm/internal/errs"
"github.com/ecodeclub/eorm/internal/valuer"
"github.com/stretchr/testify/assert"
)

Expand Down
8 changes: 4 additions & 4 deletions core.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (
"context"
"reflect"

"github.com/ecodehub/eorm/internal/dialect"
"github.com/ecodehub/eorm/internal/errs"
"github.com/ecodehub/eorm/internal/model"
"github.com/ecodehub/eorm/internal/valuer"
"github.com/ecodeclub/eorm/internal/dialect"
"github.com/ecodeclub/eorm/internal/errs"
"github.com/ecodeclub/eorm/internal/model"
"github.com/ecodeclub/eorm/internal/valuer"
)

type core struct {
Expand Down
Loading

0 comments on commit f57e3af

Please sign in to comment.