Merge pull request #10355 from vegaprotocol/fix/move-db-migrations

fix: renumbered SQL migration scripts 0055-0067
vegaprotocol · Jan 10, 2024 · 21f372e · 21f372e
2 parents c546152 + 65ca3cd
commit 21f372e
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -113,6 +113,7 @@
 - [10324](https://github.com/vegaprotocol/vega/issues/10324) - Fix `GetMarketHistoryByID` to only return the most recent market data information when no dates are provided.
 - [10318](https://github.com/vegaprotocol/vega/issues/10318) - Prevent stop orders being placed during opening auction.
 - [476](https://github.com/vegaprotocol/core-test-coverage/issues/476) -  Add tests for markets expiring in opening auction, fix a bug for future markets.
+- [10354](https://github.com/vegaprotocol/vega/issues/10354) - Renumbered SQL migration scripts 0055-0067 due to 0068 being released as part of a patch without renumbering.
 
 ## 0.73.0
 

diff --git a/datanode/networkhistory/service_test.go b/datanode/networkhistory/service_test.go
@@ -379,12 +379,12 @@ func TestMain(t *testing.M) {
 		log.Infof("%s", goldenSourceHistorySegment[4000].HistorySegmentID)
 		log.Infof("%s", goldenSourceHistorySegment[5000].HistorySegmentID)
 
-		panicIfHistorySegmentIdsNotEqual(goldenSourceHistorySegment[1000].HistorySegmentID, "QmTwduUMq6MBaH7encKNvsCj5tjj74KA834uVxbFB21Pmz", snapshots)
-		panicIfHistorySegmentIdsNotEqual(goldenSourceHistorySegment[2000].HistorySegmentID, "QmPmCaKdUcDJAnokJ8mE8wgWoc6v1vsYySJEBQa1ULRhtP", snapshots)
-		panicIfHistorySegmentIdsNotEqual(goldenSourceHistorySegment[2500].HistorySegmentID, "QmYX27Vqt1C4WLYWeXPHiY4jBUg3ftAxcJEombX4PVMN3L", snapshots)
-		panicIfHistorySegmentIdsNotEqual(goldenSourceHistorySegment[3000].HistorySegmentID, "QmPxbdr6HWG3WX3LnngQpV2uUq96cCfHKKMLnmE8zmbdBJ", snapshots)
-		panicIfHistorySegmentIdsNotEqual(goldenSourceHistorySegment[4000].HistorySegmentID, "QmaY9PfcTJkifg2vuMm5VZJyMqNJgc9eHiQe3bFA98TTuC", snapshots)
-		panicIfHistorySegmentIdsNotEqual(goldenSourceHistorySegment[5000].HistorySegmentID, "QmSvATR4ZK4KzwWBWkd9zeZh8Num6jcYWDGXQEBwZEsgMh", snapshots)
+		panicIfHistorySegmentIdsNotEqual(goldenSourceHistorySegment[1000].HistorySegmentID, "QmQR9PFgUvndcpD7qCTe1w9mBty4NEHXozHqG95Q1Q46oo", snapshots)
+		panicIfHistorySegmentIdsNotEqual(goldenSourceHistorySegment[2000].HistorySegmentID, "QmccyZL8hLMtSD9TeffNabLkCfHZF8AoU4wzyyjTMJ3t6T", snapshots)
+		panicIfHistorySegmentIdsNotEqual(goldenSourceHistorySegment[2500].HistorySegmentID, "QmRqJQKMnYj5n17dodijubHZfNFgMzJu2tZCBA5EaC3ZrU", snapshots)
+		panicIfHistorySegmentIdsNotEqual(goldenSourceHistorySegment[3000].HistorySegmentID, "QmQoU4uBTvac51woarfbgKS84Lgnhe4j3uG6kdrvo3QXty", snapshots)
+		panicIfHistorySegmentIdsNotEqual(goldenSourceHistorySegment[4000].HistorySegmentID, "QmYNZ9HtzJ4yFnGwBX6S53ES2j9VPDs1qQdUN9VZdh8bR2", snapshots)
+		panicIfHistorySegmentIdsNotEqual(goldenSourceHistorySegment[5000].HistorySegmentID, "QmVEdCwD9aWuDUNjJRVmCNM2CbQedaXrgcfrqVH8GctqBa", snapshots)
 	}, postgresRuntimePath, sqlFs)
 
 	if exitCode != 0 {

diff --git a/datanode/sqlstore/migrations/0055-0067_moved_to_0069-0080.txt b/datanode/sqlstore/migrations/0055-0067_moved_to_0069-0080.txt
@@ -0,0 +1,2 @@
+The scripts numbered 0055-0067 were moved to 0069-0080 respectively
+as 0068 was released in a patch without renumbering.
diff --git a/.../0055_add_transfer_id_to_ledger_entry.sql → .../0069_add_transfer_id_to_ledger_entry.sql b/.../0055_add_transfer_id_to_ledger_entry.sql → .../0069_add_transfer_id_to_ledger_entry.sql
diff --git a/...rations/0056_add_liquidation_strategy.sql → ...rations/0070_add_liquidation_strategy.sql b/...rations/0056_add_liquidation_strategy.sql → ...rations/0070_add_liquidation_strategy.sql
@@ -73,4 +73,3 @@ RETURN NULL;
 END;
 $$;
 -- +goose StatementEnd
-
diff --git a/...qlstore/migrations/0057_fix_for_10052.sql → ...qlstore/migrations/0071_fix_for_10052.sql b/...qlstore/migrations/0057_fix_for_10052.sql → ...qlstore/migrations/0071_fix_for_10052.sql
diff --git a/...grations/0058_transfers_fees_discount.sql → ...grations/0072_transfers_fees_discount.sql b/...grations/0058_transfers_fees_discount.sql → ...grations/0072_transfers_fees_discount.sql
@@ -20,4 +20,4 @@ CREATE INDEX transfer_fees_discount_asset_id_idx ON transfer_fees_discount(asset
 ALTER TABLE transfer_fees DROP COLUMN discount_applied;
 DROP INDEX transfer_fees_discount_party_id_idx;
 DROP INDEX transfer_fees_discount_asset_id_idx;
-DROP TABLE IF EXISTS transfer_fees_discount;
+DROP TABLE IF EXISTS transfer_fees_discount;
diff --git a/...ns/0059_add_quantum_amount_in_rewards.sql → ...ns/0073_add_quantum_amount_in_rewards.sql b/...ns/0059_add_quantum_amount_in_rewards.sql → ...ns/0073_add_quantum_amount_in_rewards.sql
diff --git a/...tore/migrations/0060_game_details_api.sql → ...tore/migrations/0074_game_details_api.sql b/...tore/migrations/0060_game_details_api.sql → ...tore/migrations/0074_game_details_api.sql
diff --git a/...ions/0061_additional_candle_intervals.sql → ...ions/0075_additional_candle_intervals.sql b/...ions/0061_additional_candle_intervals.sql → ...ions/0075_additional_candle_intervals.sql
diff --git a/.../sqlstore/migrations/0062_teams_stats.sql → .../sqlstore/migrations/0076_teams_stats.sql b/.../sqlstore/migrations/0062_teams_stats.sql → .../sqlstore/migrations/0076_teams_stats.sql
diff --git a/...store/migrations/0063_isolated_margin.sql → ...store/migrations/0077_isolated_margin.sql b/...store/migrations/0063_isolated_margin.sql → ...store/migrations/0077_isolated_margin.sql
@@ -1,6 +1,16 @@
 -- +goose Up
-DROP TYPE IF EXISTS margin_mode_type;
-create type margin_mode_type as enum('MARGIN_MODE_UNSPECIFIED', 'MARGIN_MODE_CROSS_MARGIN', 'MARGIN_MODE_ISOLATED_MARGIN');
+
+-- +goose StatementBegin
+DO
+$$
+BEGIN
+    IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'margin_mode_type') THEN
+        CREATE TYPE margin_mode_type as enum('MARGIN_MODE_UNSPECIFIED', 'MARGIN_MODE_CROSS_MARGIN', 'MARGIN_MODE_ISOLATED_MARGIN');
+    END IF;
+END;
+$$
+LANGUAGE plpgsql;
+-- +goose StatementEnd
 
 alter table margin_levels
     add column if not exists margin_mode margin_mode_type not null default ('MARGIN_MODE_CROSS_MARGIN'),

diff --git a/...064_market_data_next_network_closeout.sql → ...078_market_data_next_network_closeout.sql b/...064_market_data_next_network_closeout.sql → ...078_market_data_next_network_closeout.sql
diff --git a/...op_orders_linked_to_order_or_position.sql → ...op_orders_linked_to_order_or_position.sql b/...op_orders_linked_to_order_or_position.sql → ...op_orders_linked_to_order_or_position.sql
diff --git a/...store/migrations/0066_batch_proposals.sql → ...store/migrations/0080_batch_proposals.sql b/...store/migrations/0066_batch_proposals.sql → ...store/migrations/0080_batch_proposals.sql
diff --git a/...sqlstore/migrations/0067_margin_modes.sql → ...sqlstore/migrations/0081_margin_modes.sql b/...sqlstore/migrations/0067_margin_modes.sql → ...sqlstore/migrations/0081_margin_modes.sql
diff --git a/...tore/migrations/0069_teams_allow_list.sql → ...tore/migrations/0082_teams_allow_list.sql b/...tore/migrations/0069_teams_allow_list.sql → ...tore/migrations/0082_teams_allow_list.sql
diff --git a/...e/sqlstore/migrations/0070_mark_price.sql → ...e/sqlstore/migrations/0083_mark_price.sql b/...e/sqlstore/migrations/0070_mark_price.sql → ...e/sqlstore/migrations/0083_mark_price.sql
@@ -7,18 +7,18 @@ update market_data set mark_price_type = 'COMPOSITE_PRICE_TYPE_LAST_TRADE';
 update current_market_data set mark_price_type = 'COMPOSITE_PRICE_TYPE_LAST_TRADE';
 
 -- +goose StatementBegin
-UPDATE proposals 
+UPDATE proposals
 SET terms = jsonb_set(
-  terms, 
-  '{terms, updateMarket, changes}', 
+  terms,
+  '{terms, updateMarket, changes}',
   terms #> '{terms, updateMarket, changes}' || '{"markPriceConfiguration": {"decayWeight": "0", "decayPower": 0, "cashAmount":"0","compositePriceType":"COMPOSITE_PRICE_TYPE_LAST_TRADE"}}'
 )
 WHERE terms @> '{"terms": {"updateMarket": {}}}';
 
-UPDATE proposals 
+UPDATE proposals
 SET terms = jsonb_set(
-  terms, 
-  '{terms, newMarket, changes}', 
+  terms,
+  '{terms, newMarket, changes}',
   terms #> '{terms, newMarket, changes}' || '{"markPriceConfiguration": {"decayWeight": "0", "decayPower": 0, "cashAmount":"0","compositePriceType":"COMPOSITE_PRICE_TYPE_LAST_TRADE"}}'
 )
 WHERE terms @> '{"terms": {"newMarket": {}}}';
@@ -106,5 +106,3 @@ RETURN NULL;
 END;
 $$;
 -- +goose StatementEnd
-
-
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		The scripts numbered 0055-0067 were moved to 0069-0080 respectively
		as 0068 was released in a patch without renumbering.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -73,4 +73,3 @@ RETURN NULL;
		END;
		$$;
		-- +goose StatementEnd