fix: broken older down migrations

zepatrik · ory-bot · commit 8ed407dd6d73 · 2025-12-01T11:08:12.000Z
GitOrigin-RevId: 8a34063ff61747fd873bcfc4dda1462d778d757d
diff --git a/internal/testhelpers/sql_schemas/cockroach_dump.sql b/internal/testhelpers/sql_schemas/cockroach_dump.sql
@@ -1,4 +1,4 @@
--- migrations hash: dafe7028cc42e8a804b6ca0417a404daace09184350797a13e1d2806ea4fca6f396db0df017f7485191dbb9c9e922cc4e11a9c10c7b79bc5b150776e0e9a0f30
+-- migrations hash: f5af1bbf8624fd09cf094c1a5745a255e6ea8d56bc7177e0db9eb73d72f1b3dae0fdf3312458a84550c1f2374b0a1ea6fdd026e22267fbf1808b8e8611fb39c0
 
 CREATE TABLE public.schema_migration (
 	version VARCHAR(48) NOT NULL,
diff --git a/internal/testhelpers/sql_schemas/mysql_dump.sql b/internal/testhelpers/sql_schemas/mysql_dump.sql
@@ -1,4 +1,4 @@
--- migrations hash: dafe7028cc42e8a804b6ca0417a404daace09184350797a13e1d2806ea4fca6f396db0df017f7485191dbb9c9e922cc4e11a9c10c7b79bc5b150776e0e9a0f30
+-- migrations hash: f5af1bbf8624fd09cf094c1a5745a255e6ea8d56bc7177e0db9eb73d72f1b3dae0fdf3312458a84550c1f2374b0a1ea6fdd026e22267fbf1808b8e8611fb39c0
 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
diff --git a/internal/testhelpers/sql_schemas/postgres_dump.sql b/internal/testhelpers/sql_schemas/postgres_dump.sql
@@ -1,4 +1,4 @@
--- migrations hash: dafe7028cc42e8a804b6ca0417a404daace09184350797a13e1d2806ea4fca6f396db0df017f7485191dbb9c9e922cc4e11a9c10c7b79bc5b150776e0e9a0f30
+-- migrations hash: f5af1bbf8624fd09cf094c1a5745a255e6ea8d56bc7177e0db9eb73d72f1b3dae0fdf3312458a84550c1f2374b0a1ea6fdd026e22267fbf1808b8e8611fb39c0
 
 
 
diff --git a/internal/testhelpers/sql_schemas/sqlite3_dump.sql b/internal/testhelpers/sql_schemas/sqlite3_dump.sql
@@ -1,4 +1,4 @@
--- migrations hash: dafe7028cc42e8a804b6ca0417a404daace09184350797a13e1d2806ea4fca6f396db0df017f7485191dbb9c9e922cc4e11a9c10c7b79bc5b150776e0e9a0f30
+-- migrations hash: f5af1bbf8624fd09cf094c1a5745a255e6ea8d56bc7177e0db9eb73d72f1b3dae0fdf3312458a84550c1f2374b0a1ea6fdd026e22267fbf1808b8e8611fb39c0
 
 CREATE TABLE "hydra_client"
 (
diff --git a/persistence/sql/migratest/migration_test.go b/persistence/sql/migratest/migration_test.go
@@ -264,6 +264,22 @@ func TestMigrations(t *testing.T) {
 					}
 				})
 			})
+
+			t.Run("down", func(t *testing.T) {
+				status, err := tm.Status(t.Context())
+				require.NoError(t, err)
+
+				// there are no proper down migrations from v2 to v1
+				var stepsDown int
+				for i := range status {
+					if status[len(status)-1-i].Version == "20220210000001000000" {
+						stepsDown = i
+						break
+					}
+				}
+
+				assert.NoError(t, tm.Down(t.Context(), stepsDown))
+			})
 		})
 	}
 }
diff --git a/persistence/sql/migratest/testdata/20220210000001_testdata.sqlite3.sql b/persistence/sql/migratest/testdata/20220210000001_testdata.sqlite3.sql
@@ -19,8 +19,8 @@ INSERT INTO hydra_jwk (sid, kid, nid, version, keydata, created_at, pk_deprecate
 INSERT INTO hydra_jwk (sid, kid, nid, version, keydata, created_at, pk_deprecated, pk) VALUES ('sid-0002', 'kid-0002', '24704dcb-0ab9-4bfa-a84c-405932ae53fe', 2, 'key-0002', '2022-02-15 22:20:21', 2, '609b0140-8d03-4d1b-aef1-91b86da5e6be');
 INSERT INTO hydra_jwk (sid, kid, nid, version, keydata, created_at, pk_deprecated, pk) VALUES ('sid-0003', 'kid-0003', '24704dcb-0ab9-4bfa-a84c-405932ae53fe', 3, 'key-0003', '2022-02-15 22:20:21', 3, 'edd5c644-c3fe-43ce-9e80-9acd1f310ecc');
 INSERT INTO hydra_jwk (sid, kid, nid, version, keydata, created_at, pk_deprecated, pk) VALUES ('sid-0004', 'kid-0004', '24704dcb-0ab9-4bfa-a84c-405932ae53fe', 4, 'key-0004', '2022-02-15 22:20:21', 4, 'a6e7382c-6e30-4553-a67f-4d9bf32118b4');
-INSERT INTO hydra_jwk (sid, kid, nid, version, keydata, created_at, pk_deprecated, pk) VALUES ('sid-0005', 'kid-0005', '24704dcb-0ab9-4bfa-a84c-405932ae53fe', 4, 'key-0005', '2022-02-15 22:20:23', 4, '94075738-c3e7-41bc-a7a5-89aece609c39');
-INSERT INTO hydra_jwk (sid, kid, nid, version, keydata, created_at, pk_deprecated, pk) VALUES ('sid-0008', 'kid-0008', '24704dcb-0ab9-4bfa-a84c-405932ae53fe', 2, 'key-0002', '2022-02-15 22:20:23', 5, 'e18d8447-3ec2-42d9-a3ad-e7cca8aa81f0');
+INSERT INTO hydra_jwk (sid, kid, nid, version, keydata, created_at, pk_deprecated, pk) VALUES ('sid-0005', 'kid-0005', '24704dcb-0ab9-4bfa-a84c-405932ae53fe', 4, 'key-0005', '2022-02-15 22:20:23', 5, '94075738-c3e7-41bc-a7a5-89aece609c39');
+INSERT INTO hydra_jwk (sid, kid, nid, version, keydata, created_at, pk_deprecated, pk) VALUES ('sid-0008', 'kid-0008', '24704dcb-0ab9-4bfa-a84c-405932ae53fe', 2, 'key-0002', '2022-02-15 22:20:23', 6, 'e18d8447-3ec2-42d9-a3ad-e7cca8aa81f0');
 
 INSERT INTO hydra_oauth2_authentication_session (id, authenticated_at, subject, nid, remember) VALUES ('auth_session-0001', '2022-02-15 22:20:21', 'subject-0001', '24704dcb-0ab9-4bfa-a84c-405932ae53fe', true);
 INSERT INTO hydra_oauth2_authentication_session (id, authenticated_at, subject, nid, remember) VALUES ('auth_session-0002', '2022-02-15 22:20:21', 'subject-0002', '24704dcb-0ab9-4bfa-a84c-405932ae53fe', true);
diff --git a/persistence/sql/migrations/20220916000010000000_hydra_oauth2_flow.mysql.down.sql b/persistence/sql/migrations/20220916000010000000_hydra_oauth2_flow.mysql.down.sql
@@ -0,0 +1 @@
+DROP INDEX hydra_oauth2_flow_multi_query_idx ON hydra_oauth2_flow;
diff --git a/persistence/sql/migrations/20221109000010000000_fix_foreign_key.mysql.down.sql b/persistence/sql/migrations/20221109000010000000_fix_foreign_key.mysql.down.sql
@@ -1 +1 @@
-ALTER TABLE ONLY hydra_oauth2_flow ALTER COLUMN login_session_id SET DEFAULT '';
+ALTER TABLE hydra_oauth2_flow ALTER COLUMN login_session_id SET DEFAULT '';
diff --git a/persistence/sql/migrations/20230512112801000001_refresh_requested_at_index.mysql.down.sql b/persistence/sql/migrations/20230512112801000001_refresh_requested_at_index.mysql.down.sql
@@ -0,0 +1,2 @@
+-- cannot drop because it is used by a foreign key constraint
+--DROP INDEX hydra_oauth2_refresh_requested_at_idx ON hydra_oauth2_refresh;
diff --git a/persistence/sql/migrations/20230908104443000000_change_client_pk.sqlite.down.sql b/persistence/sql/migrations/20230908104443000000_change_client_pk.sqlite.down.sql
@@ -50,8 +50,7 @@ CREATE TABLE "_hydra_client_tmp"
   refresh_token_grant_access_token_lifespan       BIGINT NULL DEFAULT NULL,
   refresh_token_grant_refresh_token_lifespan      BIGINT NULL DEFAULT NULL,
   skip_consent                                    BOOLEAN          NOT NULL DEFAULT false,
-  nid                                             CHAR(36)         NOT NULL,
-  PRIMARY KEY (id, nid)
+  nid                                             CHAR(36)         NOT NULL
 );
 INSERT INTO "_hydra_client_tmp" (id,
                                  client_name,
@@ -127,7 +126,6 @@ SELECT id,
        userinfo_signed_response_alg,
        subject_type,
        allowed_cors_origins,
-       id,
        pk,
        pk_deprecated,
        audience,
diff --git a/persistence/sql/migrations/20240104181300000001_jwk_index.mysql.down.sql b/persistence/sql/migrations/20240104181300000001_jwk_index.mysql.down.sql
@@ -0,0 +1,3 @@
+DROP INDEX hydra_jwk_nid_sid_created_at_idx ON hydra_jwk;
+-- can't drop this because of a foreign key constraint
+-- DROP INDEX hydra_jwk_nid_sid_kid_created_at_idx ON hydra_jwk;
diff --git a/persistence/sql/migrations/20240403121110000001_add_expire_columns.sqlite.down.sql b/persistence/sql/migrations/20240403121110000001_add_expire_columns.sqlite.down.sql
@@ -0,0 +1,11 @@
+DROP INDEX hydra_oauth2_oidc_expires_at_idx;
+DROP INDEX hydra_oauth2_access_expires_at_idx;
+DROP INDEX hydra_oauth2_refresh_expires_at_idx;
+DROP INDEX hydra_oauth2_code_expires_at_idx;
+DROP INDEX hydra_oauth2_pkce_expires_at_idx;
+
+ALTER TABLE hydra_oauth2_oidc DROP COLUMN expires_at;
+ALTER TABLE hydra_oauth2_access DROP COLUMN expires_at;
+ALTER TABLE hydra_oauth2_refresh DROP COLUMN expires_at;
+ALTER TABLE hydra_oauth2_code DROP COLUMN expires_at;
+ALTER TABLE hydra_oauth2_pkce DROP COLUMN expires_at;
diff --git a/persistence/sql/migrations/20240612222110000001_add_oauth2_expires_at_indices.mysql.down.sql b/persistence/sql/migrations/20240612222110000001_add_oauth2_expires_at_indices.mysql.down.sql
@@ -1,7 +1,7 @@
-CREATE INDEX IF NOT EXISTS hydra_oauth2_access_expires_at_idx ON hydra_oauth2_oidc (expires_at);
-CREATE INDEX IF NOT EXISTS hydra_oauth2_refresh_expires_at_idx ON hydra_oauth2_oidc (expires_at);
-CREATE INDEX IF NOT EXISTS hydra_oauth2_code_expires_at_idx ON hydra_oauth2_oidc (expires_at);
-CREATE INDEX IF NOT EXISTS hydra_oauth2_pkce_expires_at_idx ON hydra_oauth2_oidc (expires_at);
+CREATE INDEX hydra_oauth2_access_expires_at_idx ON hydra_oauth2_oidc (expires_at);
+CREATE INDEX hydra_oauth2_refresh_expires_at_idx ON hydra_oauth2_oidc (expires_at);
+CREATE INDEX hydra_oauth2_code_expires_at_idx ON hydra_oauth2_oidc (expires_at);
+CREATE INDEX hydra_oauth2_pkce_expires_at_idx ON hydra_oauth2_oidc (expires_at);
 
 DROP INDEX hydra_oauth2_access_expires_at_v2_idx ON hydra_oauth2_access;
 DROP INDEX hydra_oauth2_refresh_expires_at_v2_idx ON hydra_oauth2_refresh;
diff --git a/persistence/sql/migrations/20241012144910000001_unused_indices.mysql.down.sql b/persistence/sql/migrations/20241012144910000001_unused_indices.mysql.down.sql
@@ -0,0 +1,14 @@
+-- CREATE INDEX IF NOT EXISTS hydra_oauth2_access_client_id_subject_idx ON hydra_oauth2_access (client_id ASC, subject ASC, nid ASC);
+CREATE INDEX hydra_oauth2_access_expires_at_v2_idx ON hydra_oauth2_access (expires_at ASC);
+
+CREATE INDEX hydra_oauth2_refresh_client_id_subject_idx ON hydra_oauth2_refresh (client_id ASC, subject ASC);
+CREATE INDEX hydra_oauth2_refresh_expires_at_v2_idx ON hydra_oauth2_refresh (expires_at ASC);
+
+CREATE INDEX hydra_oauth2_pkce_request_id_idx ON hydra_oauth2_pkce (request_id ASC, nid ASC);
+CREATE INDEX hydra_oauth2_pkce_expires_at_v2_idx ON hydra_oauth2_pkce (expires_at ASC);
+
+CREATE INDEX hydra_oauth2_oidc_request_id_idx ON hydra_oauth2_oidc (request_id ASC, nid ASC);
+CREATE INDEX hydra_oauth2_oidc_expires_at_idx ON hydra_oauth2_oidc (expires_at ASC);
+
+CREATE INDEX hydra_oauth2_code_request_id_idx ON hydra_oauth2_code (request_id ASC, nid ASC);
+CREATE INDEX hydra_oauth2_code_expires_at_v2_idx ON hydra_oauth2_code (expires_at ASC);
diff --git a/persistence/sql/migrations/20241609000001000000_device_flow.cockroach.down.sql b/persistence/sql/migrations/20241609000001000000_device_flow.cockroach.down.sql
diff --git a/persistence/sql/migrations/20241609000001000000_device_flow.down.sql b/persistence/sql/migrations/20241609000001000000_device_flow.down.sql
@@ -0,0 +1,15 @@
+DROP TABLE hydra_oauth2_device_auth_codes;
+
+ALTER TABLE hydra_oauth2_flow
+  DROP COLUMN device_challenge_id,
+  DROP COLUMN device_code_request_id,
+  DROP COLUMN device_verifier,
+  DROP COLUMN device_csrf,
+  DROP COLUMN device_was_used,
+  DROP COLUMN device_handled_at,
+  DROP COLUMN device_error;
+
+ALTER TABLE hydra_client
+  DROP COLUMN device_authorization_grant_id_token_lifespan,
+  DROP COLUMN device_authorization_grant_access_token_lifespan,
+  DROP COLUMN device_authorization_grant_refresh_token_lifespan;
diff --git a/persistence/sql/migrations/20241609000001000000_device_flow.sqlite.down.sql b/persistence/sql/migrations/20241609000001000000_device_flow.sqlite.down.sql
@@ -0,0 +1,15 @@
+DROP TABLE hydra_oauth2_device_auth_codes;
+
+DROP INDEX hydra_oauth2_flow_device_challenge_idx;
+
+ALTER TABLE hydra_oauth2_flow DROP COLUMN device_challenge_id;
+ALTER TABLE hydra_oauth2_flow DROP COLUMN device_code_request_id;
+ALTER TABLE hydra_oauth2_flow DROP COLUMN device_verifier;
+ALTER TABLE hydra_oauth2_flow DROP COLUMN device_csrf;
+ALTER TABLE hydra_oauth2_flow DROP COLUMN device_was_used;
+ALTER TABLE hydra_oauth2_flow DROP COLUMN device_handled_at;
+ALTER TABLE hydra_oauth2_flow DROP COLUMN device_error;
+
+ALTER TABLE hydra_client DROP COLUMN device_authorization_grant_id_token_lifespan;
+ALTER TABLE hydra_client DROP COLUMN device_authorization_grant_access_token_lifespan;
+ALTER TABLE hydra_client DROP COLUMN device_authorization_grant_refresh_token_lifespan;
diff --git a/persistence/sql/migrations/20250520000001000000_add_oauth2_trusted_jwt_bearer_issuer_index.mysql.down.sql b/persistence/sql/migrations/20250520000001000000_add_oauth2_trusted_jwt_bearer_issuer_index.mysql.down.sql
@@ -1,2 +1,2 @@
-DROP INDEX hydra_oauth2_trusted_jwt_bearer_issuer_nid_uq_idx;
-
+-- can't drop this because it replaces the auto-generated index for the foreign key constraint (yes, mysql is weird like that)
+-- DROP INDEX hydra_oauth2_trusted_jwt_bearer_issuer_nid_uq_idx ON hydra_oauth2_trusted_jwt_bearer_issuer;
diff --git a/persistence/sql/migrations/20250520000001000000_add_oauth2_trusted_jwt_bearer_issuer_index.mysql.up.sql b/persistence/sql/migrations/20250520000001000000_add_oauth2_trusted_jwt_bearer_issuer_index.mysql.up.sql
@@ -2,4 +2,3 @@
 -- Apart from this consideration, the order of the fields in the index is not really important when the query uses them all.
 -- To avoid performance pitfalls/surprises, we place Ory-controlled fields before user-controlled fields.
 CREATE UNIQUE INDEX hydra_oauth2_trusted_jwt_bearer_issuer_nid_uq_idx ON hydra_oauth2_trusted_jwt_bearer_issuer (nid ASC, key_id ASC, issuer ASC, subject ASC);
-

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`--- migrations hash: dafe7028cc42e8a804b6ca0417a404daace09184350797a13e1d2806ea4fca6f396db0df017f7485191dbb9c9e922cc4e11a9c10c7b79bc5b150776e0e9a0f30`
	`1`	`+-- migrations hash: f5af1bbf8624fd09cf094c1a5745a255e6ea8d56bc7177e0db9eb73d72f1b3dae0fdf3312458a84550c1f2374b0a1ea6fdd026e22267fbf1808b8e8611fb39c0`
`2`	`2`
`3`	`3`	`CREATE TABLE public.schema_migration (`
`4`	`4`	`version VARCHAR(48) NOT NULL,`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+DROP INDEX hydra_oauth2_flow_multi_query_idx ON hydra_oauth2_flow;`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ALTER TABLE ONLY hydra_oauth2_flow ALTER COLUMN login_session_id SET DEFAULT '';`
	`1`	`+ALTER TABLE hydra_oauth2_flow ALTER COLUMN login_session_id SET DEFAULT '';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- cannot drop because it is used by a foreign key constraint`
	`2`	`+--DROP INDEX hydra_oauth2_refresh_requested_at_idx ON hydra_oauth2_refresh;`