From c5b153e6ed38fdc517e5d595d676fd273d9ca3b8 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 26 Sep 2023 13:04:18 +0200 Subject: [PATCH] fix missing queries in job/scope history migration: remove mainscope_id and userjob_id from user table --- .../migrations/Version20230913114115.php | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/Bundle/ChillMainBundle/migrations/Version20230913114115.php b/src/Bundle/ChillMainBundle/migrations/Version20230913114115.php index 2ef12dd7d..3e79412bb 100644 --- a/src/Bundle/ChillMainBundle/migrations/Version20230913114115.php +++ b/src/Bundle/ChillMainBundle/migrations/Version20230913114115.php @@ -26,6 +26,10 @@ final class Version20230913114115 extends AbstractMigration $this->addSql('ALTER TABLE chill_main_user_job_history DROP CONSTRAINT FK_4E3BF4DDA76ED395'); $this->addSql('DROP TABLE chill_main_user_job_history'); + $this->addSql('ALTER TABLE users ADD userjob_id INT DEFAULT NULL'); + $this->addSql('ALTER TABLE users ADD CONSTRAINT fk_1483a5e964b65c5b FOREIGN KEY (userjob_id) REFERENCES chill_main_user_job (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('CREATE INDEX idx_1483a5e964b65c5b ON users (userjob_id)'); + // drop scope_history $this->addSql('ALTER TABLE chill_main_user_scope_history DROP CONSTRAINT user_scope_history_endate_null_or_after_startdate'); $this->addSql('ALTER TABLE chill_main_user_scope_history DROP CONSTRAINT user_scope_history_not_overlaps'); @@ -33,6 +37,11 @@ final class Version20230913114115 extends AbstractMigration $this->addSql('ALTER TABLE chill_main_user_scope_history DROP CONSTRAINT FK_48B969D7682B5931'); $this->addSql('ALTER TABLE chill_main_user_scope_history DROP CONSTRAINT FK_48B969D7A76ED395'); $this->addSql('DROP TABLE chill_main_user_scope_history'); + + $this->addSql('ALTER TABLE users ADD mainscope_id INT DEFAULT NULL'); + $this->addSql('ALTER TABLE users ADD CONSTRAINT fk_1483a5e9115e73f3 FOREIGN KEY (mainscope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('CREATE INDEX idx_1483a5e9115e73f3 ON users (mainscope_id)'); + } public function getDescription(): string @@ -51,18 +60,24 @@ final class Version20230913114115 extends AbstractMigration . 'endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,' . 'startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,' . 'PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_48B969D7682B5931 ON chill_main_user_scope_history (scope_id)'); $this->addSql('CREATE INDEX IDX_48B969D7A76ED395 ON chill_main_user_scope_history (user_id)'); + $this->addSql('COMMENT ON COLUMN chill_main_user_scope_history.endDate IS \'(DC2Type:datetime_immutable)\''); $this->addSql('COMMENT ON COLUMN chill_main_user_scope_history.startDate IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('ALTER TABLE chill_main_user_scope_history ADD CONSTRAINT FK_48B969D7682B5931 ' . 'FOREIGN KEY (scope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_user_scope_history ADD CONSTRAINT FK_48B969D7A76ED395 ' . 'FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_user_scope_history ' . 'ADD CONSTRAINT user_scope_history_not_overlaps ' . 'EXCLUDE USING GIST (user_id with =, tsrange(startDate, endDate) with &&) ' . 'DEFERRABLE INITIALLY DEFERRED'); + $this->addSql('ALTER TABLE chill_main_user_scope_history ' . 'ADD CONSTRAINT user_scope_history_endate_null_or_after_startdate ' . 'CHECK (startDate <= endDate OR endDate IS NULL)'); @@ -72,6 +87,11 @@ final class Version20230913114115 extends AbstractMigration . 'SELECT nextval(\'chill_main_user_scope_history_id_seq\'), \'1970-01-01\'::date, NULL, users.id, mainscope_id ' . 'FROM users'); + // remove mainscope + $this->addSql('ALTER TABLE users DROP CONSTRAINT fk_1483a5e9115e73f3'); + $this->addSql('ALTER TABLE users DROP mainscope_id'); + + // create job_history $this->addSql('CREATE SEQUENCE chill_main_user_job_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); $this->addSql('CREATE TABLE chill_main_user_job_history (' @@ -81,18 +101,24 @@ final class Version20230913114115 extends AbstractMigration . 'endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,' . 'startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,' . 'PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_4E3BF4DDBE04EA9 ON chill_main_user_job_history (job_id)'); $this->addSql('CREATE INDEX IDX_4E3BF4DDA76ED395 ON chill_main_user_job_history (user_id)'); + $this->addSql('COMMENT ON COLUMN chill_main_user_job_history.endDate IS \'(DC2Type:datetime_immutable)\''); $this->addSql('COMMENT ON COLUMN chill_main_user_job_history.startDate IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('ALTER TABLE chill_main_user_job_history ADD CONSTRAINT FK_4E3BF4DDBE04EA9 ' . 'FOREIGN KEY (job_id) REFERENCES chill_main_user_job (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_user_job_history ADD CONSTRAINT FK_4E3BF4DDA76ED395 ' . 'FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_main_user_job_history ' . 'ADD CONSTRAINT user_job_history_not_overlaps ' . 'EXCLUDE USING GIST (user_id with =, tsrange(startDate, endDate) with &&) ' . 'DEFERRABLE INITIALLY DEFERRED'); + $this->addSql('ALTER TABLE chill_main_user_job_history ' . 'ADD CONSTRAINT user_job_history_endate_null_or_after_startdate ' . 'CHECK (startDate <= endDate OR endDate IS NULL)'); @@ -101,5 +127,10 @@ final class Version20230913114115 extends AbstractMigration $this->addSql('INSERT INTO chill_main_user_job_history (id, startDate, endDate, user_id, job_id) ' . 'SELECT nextval(\'chill_main_user_job_history_id_seq\'), \'1970-01-01\'::date, NULL, users.id, userjob_id ' . 'FROM users'); + + // remove userjob + $this->addSql('ALTER TABLE users DROP CONSTRAINT fk_1483a5e964b65c5b'); + $this->addSql('ALTER TABLE users DROP userjob_id'); + } }