Merge branch 'fix-sructure-sql-after-100630' into 'master'

Fix function/trigger order in structure.sql

See merge request !103565



Merged-by: Adam Hegyi <ahegyi@gitlab.com>
Approved-by: Adam Hegyi <ahegyi@gitlab.com>
Co-authored-by: Krasimir Angelov <kangelov@gitlab.com>

db/structure.sql

@@ -225,16 +225,16 @@ RETURN NULL;
 END
 $$;
-CREATE FUNCTION trigger_1a857e8db6cd() RETURNS trigger
+CREATE FUNCTION sync_namespaces_amount_used_columns() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
 BEGIN
-  NEW."uuid_convert_string_to_uuid" := NEW."uuid";
+  NEW."new_amount_used" := NEW."amount_used";
   RETURN NEW;
 END;
 $$;
-CREATE FUNCTION sync_namespaces_amount_used_columns() RETURNS trigger
+CREATE FUNCTION sync_projects_amount_used_columns() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -243,11 +243,11 @@ BEGIN
 END;
 $$;
-CREATE FUNCTION sync_projects_amount_used_columns() RETURNS trigger
+CREATE FUNCTION trigger_1a857e8db6cd() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
 BEGIN
-  NEW."new_amount_used" := NEW."amount_used";
+  NEW."uuid_convert_string_to_uuid" := NEW."uuid";
   RETURN NEW;
 END;
 $$;
@@ -32566,12 +32566,12 @@ CREATE TRIGGER nullify_merge_request_metrics_build_data_on_update BEFORE UPDATE
 CREATE TRIGGER projects_loose_fk_trigger AFTER DELETE ON projects REFERENCING OLD TABLE AS old_table FOR EACH STATEMENT EXECUTE FUNCTION insert_into_loose_foreign_keys_deleted_records();
-CREATE TRIGGER trigger_1a857e8db6cd BEFORE INSERT OR UPDATE ON vulnerability_occurrences FOR EACH ROW EXECUTE FUNCTION trigger_1a857e8db6cd();
-
 CREATE TRIGGER sync_namespaces_amount_used_columns BEFORE INSERT OR UPDATE ON ci_namespace_monthly_usages FOR EACH ROW EXECUTE FUNCTION sync_namespaces_amount_used_columns();
 CREATE TRIGGER sync_projects_amount_used_columns BEFORE INSERT OR UPDATE ON ci_project_monthly_usages FOR EACH ROW EXECUTE FUNCTION sync_projects_amount_used_columns();
+CREATE TRIGGER trigger_1a857e8db6cd BEFORE INSERT OR UPDATE ON vulnerability_occurrences FOR EACH ROW EXECUTE FUNCTION trigger_1a857e8db6cd();
+
 CREATE TRIGGER trigger_delete_project_namespace_on_project_delete AFTER DELETE ON projects FOR EACH ROW WHEN ((old.project_namespace_id IS NOT NULL)) EXECUTE FUNCTION delete_associated_project_namespace();
 CREATE TRIGGER trigger_has_external_issue_tracker_on_delete AFTER DELETE ON integrations FOR EACH ROW WHEN ((((old.category)::text = 'issue_tracker'::text) AND (old.active = true) AND (old.project_id IS NOT NULL))) EXECUTE FUNCTION set_has_external_issue_tracker();