Merge branch 'master' of https://github.com/erda-project/erda

erda-project · Oct 29, 2021 · 41b9878 · 41b9878
2 parents 2aa4c89 + da0feca
commit 41b9878
Show file tree

Hide file tree

Showing 40 changed files with 2,158 additions and 334 deletions.
diff --git a/.erda/migrations/cmdb/20211028-delete-quota-without-project.sql b/.erda/migrations/cmdb/20211028-delete-quota-without-project.sql
@@ -0,0 +1 @@
+DELETE FROM ps_group_projects_quota WHERE project_id NOT IN (SELECT id FROM ps_group_projects);
diff --git a/.erda/migrations/config.yml b/.erda/migrations/config.yml
@@ -65,7 +65,7 @@ allowed_dml:
     union_stmt: true
     load_data_stmt: false
     insert_stmt: true
-    delete_stmt: false
+    delete_stmt: true
     update_stmt: true
     show_stmt: true
     split_region_stmt: false

diff --git a/api/proto-go/all.go b/api/proto-go/all.go
diff --git a/api/proto-go/core/monitor/event/client/client.go b/api/proto-go/core/monitor/event/client/client.go
diff --git a/api/proto-go/core/monitor/event/client/provider.go b/api/proto-go/core/monitor/event/client/provider.go
diff --git a/api/proto-go/core/monitor/event/pb/event_query.form.pb.go b/api/proto-go/core/monitor/event/pb/event_query.form.pb.go
diff --git a/api/proto-go/core/monitor/event/pb/event_query.http.pb.go b/api/proto-go/core/monitor/event/pb/event_query.http.pb.go
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		DELETE FROM ps_group_projects_quota WHERE project_id NOT IN (SELECT id FROM ps_group_projects);