Renumber DB migration to avoid conflict.

Author: branlwyd

aggregator_core/src/datastore.rs

@@ -99,7 +99,7 @@ macro_rules! supported_schema_versions {
 // version is seen, [`Datastore::new`] fails.
 //
 // Note that the latest supported version must be first in the list.
-supported_schema_versions!(2, 1);
+supported_schema_versions!(3, 2, 1);
 
 /// Datastore represents a datastore for Janus, with support for transactional reads and writes.
 /// In practice, Datastore instances are currently backed by a PostgreSQL database.

db/00000000000002_report_data_in_report_agg.down.sql db/00000000000003_report_data_in_report_agg.down.sql

@@ -2,4 +2,3 @@ ALTER TABLE report_aggregations DROP COLUMN helper_encrypted_input_share;
 ALTER TABLE report_aggregations DROP COLUMN leader_input_share;
 ALTER TABLE report_aggregations DROP COLUMN leader_extensions;
 ALTER TABLE report_aggregations DROP COLUMN public_share;
-

db/00000000000002_report_data_in_report_agg.up.sql db/00000000000003_report_data_in_report_agg.up.sql

@@ -2,4 +2,3 @@ ALTER TABLE report_aggregations ADD COLUMN public_share BYTEA;  -- the public sh
 ALTER TABLE report_aggregations ADD COLUMN leader_extensions BYTEA;  -- encoded sequence of Extension messages from Leader input share (opaque DAP messages)
 ALTER TABLE report_aggregations ADD COLUMN leader_input_share BYTEA;  -- encoded leader input share (opaque VDAF message)
 ALTER TABLE report_aggregations ADD COLUMN helper_encrypted_input_share BYTEA;  -- encoded HPKE ciphertext of helper input share (opaque DAP message)
-