Merge branch 'revert-325619-ci_builds-finalize-migration-and-swap-columns' into 'master'

Revert "Merge branch '325619-ci_builds-finalize-migration-and-swap-columns' into 'master'"

See merge request gitlab-org/gitlab!70242

db/schema_migrations/20210907211557

-387dcbda7c3b32050298d8a679361a17916a66d0ab686211f0d1a0dc708c4a74
\ No newline at end of file

db/structure.sql

@@ -11306,7 +11306,7 @@ CREATE TABLE ci_build_trace_metadata (
 );
 
 CREATE TABLE ci_builds (
-    id_convert_to_bigint integer DEFAULT 0 NOT NULL,
+    id integer NOT NULL,
     status character varying,
     finished_at timestamp without time zone,
     trace text,
@@ -11351,7 +11351,7 @@ CREATE TABLE ci_builds (
     waiting_for_resource_at timestamp with time zone,
     processed boolean,
     scheduling_type smallint,
-    id bigint NOT NULL,
+    id_convert_to_bigint bigint DEFAULT 0 NOT NULL,
     stage_id bigint,
     CONSTRAINT check_1e2fbd1b39 CHECK ((lock_version IS NOT NULL))
 );
@@ -27534,6 +27534,9 @@ ALTER TABLE ONLY releases
 ALTER TABLE ONLY geo_event_log
     ADD CONSTRAINT fk_4a99ebfd60 FOREIGN KEY (repositories_changed_event_id) REFERENCES geo_repositories_changed_events(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY dep_ci_build_trace_sections
+    ADD CONSTRAINT fk_4ebe41f502 FOREIGN KEY (build_id) REFERENCES ci_builds(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY alert_management_alerts
     ADD CONSTRAINT fk_51ab4b6089 FOREIGN KEY (prometheus_alert_id) REFERENCES prometheus_alerts(id) ON DELETE CASCADE;
 

spec/db/schema_spec.rb

@@ -35,7 +35,6 @@ RSpec.describe 'Database schema' do
     cluster_providers_gcp: %w[gcp_project_id operation_id],
     compliance_management_frameworks: %w[group_id],
     commit_user_mentions: %w[commit_id],
-    dep_ci_build_trace_sections: %w[build_id],
     deploy_keys_projects: %w[deploy_key_id],
     deployments: %w[deployable_id user_id],
     draft_notes: %w[discussion_id commit_id],