Migration with foreign key for sqlite, #1419

ory · Sep 22, 2021 · 45ec59b · 45ec59b
1 parent 3492ca5
commit 45ec59b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/persistence/sql/migrations/sql/20210913095309000000_identity_recovery_tokens.sqlite3.up.sql b/persistence/sql/migrations/sql/20210913095309000000_identity_recovery_tokens.sqlite3.up.sql
@@ -1 +1 @@
-ALTER TABLE "identity_recovery_tokens" ADD COLUMN "identity_id" char(36) NOT NULL;
+ALTER TABLE identity_recovery_tokens ADD COLUMN identity_id CHAR(36) NULL REFERENCES identities(id) ON DELETE CASCADE ON UPDATE RESTRICT;
diff --git a/persistence/sql/migrations/sql/20210913095309000004_identity_recovery_tokens.sqlite3.up.sql b/persistence/sql/migrations/sql/20210913095309000004_identity_recovery_tokens.sqlite3.up.sql
@@ -10,7 +10,6 @@ CREATE TABLE "_identity_recovery_tokens_tmp" (
 "expires_at" DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
 "issued_at" DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
 "nid" char(36),
-"identity_id" char(36) NOT NULL,
 FOREIGN KEY (selfservice_recovery_flow_id) REFERENCES selfservice_recovery_flows (id) ON UPDATE NO ACTION ON DELETE CASCADE,
 FOREIGN KEY (identity_recovery_address_id) REFERENCES identity_recovery_addresses (id) ON UPDATE NO ACTION ON DELETE CASCADE
 );
diff --git a/persistence/sql/migrations/sql/20210913095309000008_identity_recovery_tokens.sqlite3.up.sql b/persistence/sql/migrations/sql/20210913095309000008_identity_recovery_tokens.sqlite3.up.sql
@@ -1 +1 @@
-INSERT INTO "_identity_recovery_tokens_tmp" (id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid, identity_id) SELECT id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid, identity_id FROM "identity_recovery_tokens";
+INSERT INTO "_identity_recovery_tokens_tmp" (id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid) SELECT id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid FROM "identity_recovery_tokens";
diff --git a/...istence/sql/migrations/sql/20210913095309000012_identity_recovery_tokens.sqlite3.down.sql b/...istence/sql/migrations/sql/20210913095309000012_identity_recovery_tokens.sqlite3.down.sql
@@ -1 +1 @@
-INSERT INTO "_identity_recovery_tokens_tmp" (id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid, identity_id) SELECT id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid, identity_id FROM "identity_recovery_tokens";
+INSERT INTO "_identity_recovery_tokens_tmp" (id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid) SELECT id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid FROM "identity_recovery_tokens";
diff --git a/...istence/sql/migrations/sql/20210913095309000016_identity_recovery_tokens.sqlite3.down.sql b/...istence/sql/migrations/sql/20210913095309000016_identity_recovery_tokens.sqlite3.down.sql
@@ -10,7 +10,6 @@ CREATE TABLE "_identity_recovery_tokens_tmp" (
 "expires_at" DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
 "issued_at" DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
 "nid" char(36),
-"identity_id" char(36) NOT NULL,
 FOREIGN KEY (identity_recovery_address_id) REFERENCES identity_recovery_addresses (id) ON UPDATE NO ACTION ON DELETE CASCADE,
 FOREIGN KEY (selfservice_recovery_flow_id) REFERENCES selfservice_recovery_flows (id) ON UPDATE NO ACTION ON DELETE CASCADE
 );
diff --git a/persistence/sql/migrations/templates/20210913095309_identity_recovery_tokens.up.fizz b/persistence/sql/migrations/templates/20210913095309_identity_recovery_tokens.up.fizz
@@ -1,5 +1,7 @@
-add_column("identity_recovery_tokens", "identity_id", "uuid", {"size": 36})
-{{ if not .IsSQLite }}
+{{ if .IsSQLite }}
+  sql("ALTER TABLE identity_recovery_tokens ADD COLUMN identity_id CHAR(36) NULL REFERENCES identities(id) ON DELETE CASCADE ON UPDATE RESTRICT")
+{{ else }}
+  add_column("identity_recovery_tokens", "identity_id", "uuid", {"size": 36})
   add_foreign_key("identity_recovery_tokens", "identity_id", {"identities": ["id"]}, {
       "name": "identity_recovery_tokens_identity_id_fk_idx",
       "on_delete": "CASCADE",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ALTER TABLE "identity_recovery_tokens" ADD COLUMN "identity_id" char(36) NOT NULL;
		ALTER TABLE identity_recovery_tokens ADD COLUMN identity_id CHAR(36) NULL REFERENCES identities(id) ON DELETE CASCADE ON UPDATE RESTRICT;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		INSERT INTO "_identity_recovery_tokens_tmp" (id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid, identity_id) SELECT id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid, identity_id FROM "identity_recovery_tokens";
		INSERT INTO "_identity_recovery_tokens_tmp" (id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid) SELECT id, token, used, used_at, identity_recovery_address_id, selfservice_recovery_flow_id, created_at, updated_at, expires_at, issued_at, nid FROM "identity_recovery_tokens";