Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: resolve conflict #1

Merged
merged 259 commits into from
May 21, 2024
Merged

fix: resolve conflict #1

merged 259 commits into from
May 21, 2024

Conversation

ecmadao
Copy link

@ecmadao ecmadao commented May 21, 2024

No description provided.

ecmadao and others added 30 commits April 25, 2024 12:41
@ecmadao
chore: support AWS RDS connection (bytebase#11796)
66adfea
@ecmadao
chore: remove maximum limit in pagination (bytebase#11798)
2dfbf46 
* fix: database limit

* chore: remove maximum limit in pagination
@RainbowDashy
chore: redact query response (bytebase#11791)
103cfdb
@LiuJi-Jim
chore: default pagesize (bytebase#11795)
5204f4f
@RainbowDashy
feat: migrate sql query export activity to audit log (bytebase#11794)
ccd200f
@LiuJi-Jim
feat(schema-editor): support procedure and function nodes (bytebase#1…
e15dcf8 
…1693)

* chore: support procedure and function nodes

* chore: extend tree node types

* feat: procedure and function nodes

* chore: add and drop procedures

* feat: diff-merge functions

* feat: apply selected procedures and functions

* feat: tree and tab list

* chore: edit procedure

* chore: edit function

* chore: remove unused

* chore: create and edit function

* chore: minor updates

* chore: select functions to rollout

* chore: update filter for procedures and functions

* chore: labels and i18n

* chore: extract NodePrefix

* fix: wrong parameters

* chore: remove log

* feat: render empty nodes

* chore: icons

* chore: lint

* chore: types

* chore: missing type imports

* chore: lint
@h3n4l
feat(auto-complete): SQL Server auto completion (bytebase#11793)
a57ae95
@boojack
chore(issue): remove unused query field (bytebase#11799)
20c5c2a 
* chore: remove unused query field

* chore: update

* chore: update
@boojack
chore: disable switch when task done (bytebase#11801)
560d9eb
@RainbowDashy
fix: immediate defer rows.Close() (bytebase#11800)
cc353a1
@d-bytebase
chore: no bb (bytebase#11802)
c4303de
@boojack
chore: update helm (bytebase#11803)
56a9fa8
@boojack
chore: remove bb script (bytebase#11804)
006536a
@d-bytebase
fix: NPE (bytebase#11805)
5f7b3cc
@Azusain
feat(sql-review): check table size on DDLs (bytebase#11788)
ecf8f28 
* feat(sql-review): check table size on DDLs

* chore: i18n

* chore: lint

* fix: add line info

* fix: add line info
@RainbowDashy
fix: mysql tls (bytebase#11807)
0e62780
@d-bytebase
chore: tls2 (bytebase#11808)
4eaa8c4
@ecmadao
chore: support pg dump for rds with iam (bytebase#11809)
2942a89 
* chore: support AWS RDS connection

* chore: support pg dump for rds with iam

* chore: update
@ecmadao
fix: feature guard for data source update (bytebase#11810)
70b70ea 
* chore: support AWS RDS connection

* chore: support pg dump for rds with iam

* chore: update

* fix: feature guard for data source update
@ecmadao
chore: frontend update (bytebase#11814)
cf59fc7 
* chore: support AWS RDS connection

* chore: support pg dump for rds with iam

* chore: update

* fix: feature guard for data source update

* chore: frontend update
@h3n4l
chore: add limit.table-size in mergeIndividualConfigAsRule (bytebase#…
cd9761b 
…11812)

Signed-off-by: h3n4l <[email protected]>
@RainbowDashy
feat: impl search audit logs iam (bytebase#11815)
8f28b3f
@d-bytebase
chore: move const (bytebase#11813)
a36526b
@Azusain
chore: remove Hive from getAdvisorTypeByRule() and rename advisor's f…
7abdc12 
…ilename (bytebase#11816)
@boojack
chore: allow to edit statement for db group issue (bytebase#11811)
2ffda76
@d-bytebase
chore: exceeded error (bytebase#11817)
92ff6d1
@Azusain
fix: unspecified change db type in table.limit-size (bytebase#11819)
4e562ee 
* chore: remove Hive from getAdvisorTypeByRule() and rename advisor's filename

* fix: unspecified change db type in table.limit-size
@boojack
chore: fix dynamic suggestions (bytebase#11820)
44575a9
@d-bytebase
chore: check result size on the loop (bytebase#11821)
9e44bcd
@RainbowDashy
chore: enable audit logs by default (bytebase#11823)
9997877
RainbowDashy and others added 28 commits May 17, 2024 02:57
@RainbowDashy
fix: task run log for mssql & oracle (bytebase#12028)
c8b8389 
* fix: oracle

* fix: mssql

* fix lint

* fix test
@ecmadao
chore: support upload algorithm json file (bytebase#12033)
5bd3ffe
@ecmadao
chore: add example for upload json file (bytebase#12035)
1b33af6 
* chore: support upload algorithm json file

* chore: add example for upload json file
@d-bytebase
chore: go 1.22.3 (bytebase#12034)
626b143
@d-bytebase
chore: no binary (bytebase#12036)
90a2d04
@LiuJi-Jim
fix: use endOf the day as the upper limit of date time filter (byteba…
c748e15 
…se#12038)
@boojack
chore: add back i18n of review center (bytebase#12039)
0509829
@h3n4l
feat(mongodb): support mongodb replica set (bytebase#12037)
23eec30 
* feat: support mongodb replica set

Signed-off-by: h3n4l <[email protected]>

* chore: key

Signed-off-by: h3n4l <[email protected]>

* fix: quote connection uri if execute via sh

Signed-off-by: h3n4l <[email protected]>

---------

Signed-off-by: h3n4l <[email protected]>
@LiuJi-Jim
chore: retire oracle sql rollback (bytebase#12040)
53615e6
@boojack
chore: tweak issue options display (bytebase#12041)
84289cb
@Azusain
fix(mysql): scientific notation (bytebase#12042)
b372937
@h3n4l
refactor: remove to_jsonb in jsonb_build_object (bytebase#12043)
1e54de9 
Signed-off-by: h3n4l <[email protected]>
@ecmadao
chore: sort issues (bytebase#12044)
693e1d1 
* chore: sort issues

* chore: update

* fix: eslint
@boojack
Add SSL options support for MongoDB connections (bytebase#12046)
eb36c0c
@h3n4l
feat: add direct connection in datasource proto (bytebase#12047)
6b8638a 
* feat: add direct connection in datasource proto

Signed-off-by: h3n4l <[email protected]>

* chore: update

Signed-off-by: h3n4l <[email protected]>

* chore: update

Signed-off-by: h3n4l <[email protected]>

---------

Signed-off-by: h3n4l <[email protected]>
@h3n4l
feat(mongodb): support direct connection (bytebase#12048)
94b461f 
* feat: add direct connection in datasource proto

Signed-off-by: h3n4l <[email protected]>

* chore: update

Signed-off-by: h3n4l <[email protected]>

* chore: update

Signed-off-by: h3n4l <[email protected]>

* feat: support mongodb direct connection

Signed-off-by: h3n4l <[email protected]>

---------

Signed-off-by: h3n4l <[email protected]>
@rebelice
chore: upgrade tsql parser for performance (bytebase#12049)
797c1c3
@boojack
refactor: move plan related methods from rollout service to plan serv…
81769f7 
…ice (bytebase#12050)

* chore: plan service

* chore: update frontend

* chore: update

* chore: update tests
@d-bytebase
fix: bool algebra (bytebase#12052)
3fd9b2d
@d-bytebase
chore: unused proto (bytebase#12053)
bab1ffc
@d-bytebase
chore: audit log user uid (bytebase#12054)
03277fe 
* chore: audit log user uid

* chore: update
@LiuJi-Jim
chore: retire issue assignee (bytebase#12055)
ca9fe7a
@LiuJi-Jim
chore: press ESC key to hide recent visited databases (bytebase#12056)
e3a3a61
@d-bytebase
chore: deprecate issue comment assignee change (bytebase#12057)
1513813
@LiuJi-Jim
chore(frontend): retire assignee (more) (bytebase#12058)
1638080 
* chore: retire assignee (more)

* chore: remove unused

* chore: remove unused issue assignee-related i18n resources
@ecmadao
chore: add user_group table (bytebase#12059)
3e234be 
* chore: add user_group table

* chore: update

* chore: update

* chore: update error
@ecmadao
Merge branch 'main' of github.com:bytebase/bytebase into chore/conflict
75ddcab 
# Conflicts:
#	backend/api/v1/database_service.go
#	backend/plugin/parser/pg/completion.go
#	backend/runner/taskrun/executor.go
#	frontend/pnpm-lock.yaml
#	frontend/src/types/proto/google/protobuf/descriptor.ts
#	frontend/src/types/proto/store/common.ts
#	frontend/src/types/proto/v1/common.ts
#	frontend/src/types/sql-review-schema.yaml
#	go.sum
#	proto/generated-go/store/activity.pb.go
#	proto/generated-go/store/approval.pb.go
#	proto/generated-go/store/audit_log.pb.go
#	proto/generated-go/store/branch.pb.go
#	proto/generated-go/store/changelist.pb.go
#	proto/generated-go/store/common.pb.go
#	proto/generated-go/store/data_source.pb.go
#	proto/generated-go/store/database.pb.go
#	proto/generated-go/store/export_archive.pb.go
#	proto/generated-go/store/idp.pb.go
#	proto/generated-go/store/instance.pb.go
#	proto/generated-go/store/instance_change_history.pb.go
#	proto/generated-go/store/issue.pb.go
#	proto/generated-go/store/issue_comment.pb.go
#	proto/generated-go/store/plan.pb.go
#	proto/generated-go/store/plan_check_run.pb.go
#	proto/generated-go/store/policy.pb.go
#	proto/generated-go/store/project.pb.go
#	proto/generated-go/store/query_history.pb.go
#	proto/generated-go/store/role.pb.go
#	proto/generated-go/store/setting.pb.go
#	proto/generated-go/store/sheet.pb.go
#	proto/generated-go/store/slow_query.pb.go
#	proto/generated-go/store/task_run.pb.go
#	proto/generated-go/store/user.pb.go
#	proto/generated-go/store/vcs.pb.go
#	proto/generated-go/v1/actuator_service.pb.go
#	proto/generated-go/v1/anomaly_service.pb.go
#	proto/generated-go/v1/audit_log_service.pb.go
#	proto/generated-go/v1/auth_service.pb.go
#	proto/generated-go/v1/branch_service.pb.go
#	proto/generated-go/v1/cel_service.pb.go
#	proto/generated-go/v1/changelist_service.pb.go
#	proto/generated-go/v1/common.pb.go
#	proto/generated-go/v1/database_service.pb.go
#	proto/generated-go/v1/environment_service.pb.go
#	proto/generated-go/v1/iam_policy.pb.go
#	proto/generated-go/v1/idp_service.pb.go
#	proto/generated-go/v1/instance_role_service.pb.go
#	proto/generated-go/v1/instance_service.pb.go
#	proto/generated-go/v1/issue_service.pb.go
#	proto/generated-go/v1/logging_service.pb.go
#	proto/generated-go/v1/org_policy_service.pb.go
#	proto/generated-go/v1/project_service.pb.go
#	proto/generated-go/v1/risk_service.pb.go
#	proto/generated-go/v1/role_service.pb.go
#	proto/generated-go/v1/rollout_service.pb.go
#	proto/generated-go/v1/setting_service.pb.go
#	proto/generated-go/v1/sheet_service.pb.go
#	proto/generated-go/v1/sql_service.pb.go
#	proto/generated-go/v1/subscription_service.pb.go
#	proto/generated-go/v1/vcs_connector_service.pb.go
#	proto/generated-go/v1/vcs_provider_service.pb.go
#	proto/generated-go/v1/worksheet_service.pb.go
@ecmadao
chore: update
09af09e
@ecmadao ecmadao mentioned this pull request May 21, 2024
Closed
@shanzhuer shanzhuer merged commit d5eae73 into shanzhuer:main May 21, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone