From f1c77277f35cbd7db2e49220aaaa115f89f71755 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 25 May 2021 23:45:08 +0200 Subject: [PATCH 1/3] Handle parent deletion in associated tables (MainBundle) --- src/Bundle/ChillMainBundle/Entity/Address.php | 2 +- .../migrations/Version20210525144016.php | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20210525144016.php diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php index 36eda09c2..2003a7910 100644 --- a/src/Bundle/ChillMainBundle/Entity/Address.php +++ b/src/Bundle/ChillMainBundle/Entity/Address.php @@ -137,7 +137,7 @@ class Address * @var ThirdParty|null * * @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty") - * @ORM\JoinColumn(nullable=true) + * @ORM\JoinColumn(nullable=true, onDelete="SET NULL") */ private $linkedToThirdParty; diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210525144016.php b/src/Bundle/ChillMainBundle/migrations/Version20210525144016.php new file mode 100644 index 000000000..3be8d9ea1 --- /dev/null +++ b/src/Bundle/ChillMainBundle/migrations/Version20210525144016.php @@ -0,0 +1,31 @@ +addSql('ALTER TABLE chill_main_address DROP CONSTRAINT FK_165051F6114B8DD9'); + $this->addSql('ALTER TABLE chill_main_address ADD CONSTRAINT FK_165051F6114B8DD9 FOREIGN KEY (linkedToThirdParty_id) REFERENCES chill_3party.third_party (id) ON DELETE SET NULL NOT DEFERRABLE INITIALLY IMMEDIATE'); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE chill_main_address DROP CONSTRAINT fk_165051f6114b8dd9'); + $this->addSql('ALTER TABLE chill_main_address ADD CONSTRAINT fk_165051f6114b8dd9 FOREIGN KEY (linkedtothirdparty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + } +} From 1d4edd5b7bf57615211443a11a016f14bf2c3d99 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 25 May 2021 23:46:05 +0200 Subject: [PATCH 2/3] Handle parent deletion in associated tables (PersonBundle) --- .../Entity/AccompanyingPeriod/Comment.php | 2 +- .../migrations/Version20210525211214.php | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20210525211214.php diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php index 0d64da0fc..18b5bd38d 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php @@ -51,7 +51,7 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface * @ORM\ManyToOne( * targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod", * inversedBy="comments") - * @ORM\JoinColumn(nullable=false) + * @ORM\JoinColumn(nullable=false, onDelete="CASCADE") */ private $accompanyingPeriod; diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210525211214.php b/src/Bundle/ChillPersonBundle/migrations/Version20210525211214.php new file mode 100644 index 000000000..15df9386e --- /dev/null +++ b/src/Bundle/ChillPersonBundle/migrations/Version20210525211214.php @@ -0,0 +1,31 @@ +addSql('ALTER TABLE chill_person_accompanying_period_comment DROP CONSTRAINT FK_CD960EF3D7FA8EF0'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ADD CONSTRAINT FK_CD960EF3D7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE chill_person_accompanying_period_comment DROP CONSTRAINT fk_cd960ef3d7fa8ef0'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ADD CONSTRAINT fk_cd960ef3d7fa8ef0 FOREIGN KEY (accompanyingperiod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + } +} From 679665d9db30400d098295107eaf8f7ed3368065 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 25 May 2021 23:47:15 +0200 Subject: [PATCH 3/3] Handle parent deletion in associated tables (ThirdPartyBundle) --- .../Entity/ThirdParty.php | 41 ++++++++++--------- .../migrations/Version20210525211216.php | 31 ++++++++++++++ 2 files changed, 52 insertions(+), 20 deletions(-) create mode 100644 src/Bundle/ChillThirdPartyBundle/migrations/Version20210525211216.php diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php index aa43be265..6b766c5c8 100644 --- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php +++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php @@ -32,9 +32,9 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap; /** * ThirdParty is a party recorded in the database. - * - * A party may be attached to multiple centers. Being attach to a center allow - * all users with the right 'CHILL_3PARTY_3PARTY_SEE', 'CHILL_3PARTY_3 to see, select and edit parties for this + * + * A party may be attached to multiple centers. Being attach to a center allow + * all users with the right 'CHILL_3PARTY_3PARTY_SEE', 'CHILL_3PARTY_3 to see, select and edit parties for this * center. * * @ORM\Table(name="chill_3party.third_party") @@ -66,7 +66,7 @@ class ThirdParty * @var string|null * * @ORM\Column(name="telephone", type="string", length=64, nullable=true) - * @Assert\Regex("/^([\+{1}])([0-9\s*]{4,20})$/", + * @Assert\Regex("/^([\+{1}])([0-9\s*]{4,20})$/", * message="Invalid phone number: it should begin with the international prefix starting with ""+"", hold only digits and be smaller than 20 characters. Ex: +33123456789" * ) */ @@ -94,13 +94,13 @@ class ThirdParty * @Assert\Count(min=1) */ private $type; - + /** * @var boolean * @ORM\Column(name="active", type="boolean", options={"defaut": true}) */ private $active = true; - + /** * @var Collection instances of Center * @ORM\ManyToMany(targetEntity="\Chill\MainBundle\Entity\Center") @@ -108,14 +108,15 @@ class ThirdParty * @Assert\Count(min=1) */ private $centers; - + /** * @var Address|null * @ORM\ManyToOne(targetEntity="\Chill\MainBundle\Entity\Address", * cascade={"persist", "remove"}) + * @ORM\JoinColumn(nullable=true, onDelete="SET NULL") */ private $address; - + /** * ThirdParty constructor. */ @@ -249,7 +250,7 @@ class ThirdParty { return $this->type; } - + /** * @return bool */ @@ -257,7 +258,7 @@ class ThirdParty { return $this->active; } - + /** * @return Collection */ @@ -265,7 +266,7 @@ class ThirdParty { return $this->centers; } - + /** * @param bool $active * @return $this @@ -275,7 +276,7 @@ class ThirdParty $this->active = $active; return $this; } - + /** * @param Center $center */ @@ -285,7 +286,7 @@ class ThirdParty $this->centers->add($center); } } - + /** * @param Center $center */ @@ -295,7 +296,7 @@ class ThirdParty $this->centers->removeElement($center); } } - + /** * @param Collection $centers * @return $this @@ -305,16 +306,16 @@ class ThirdParty foreach ($centers as $center) { $this->addCenter($center); } - + foreach ($this->centers as $center) { if (FALSE === $centers->contains($center)) { $this->removeCenter($center); } } - + return $this; } - + /** * @return Address|null */ @@ -322,7 +323,7 @@ class ThirdParty { return $this->address; } - + /** * @param Address $address * @return $this @@ -330,10 +331,10 @@ class ThirdParty public function setAddress(Address $address) { $this->address = $address; - + return $this; } - + /** * @return string */ diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20210525211216.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20210525211216.php new file mode 100644 index 000000000..ae270a1d1 --- /dev/null +++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20210525211216.php @@ -0,0 +1,31 @@ +addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467BF5B7AF75'); + $this->addSql('ALTER TABLE chill_3party.third_party ADD CONSTRAINT FK_D952467BF5B7AF75 FOREIGN KEY (address_id) REFERENCES chill_main_address (id) ON DELETE SET NULL NOT DEFERRABLE INITIALLY IMMEDIATE'); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT fk_d952467bf5b7af75'); + $this->addSql('ALTER TABLE chill_3party.third_party ADD CONSTRAINT fk_d952467bf5b7af75 FOREIGN KEY (address_id) REFERENCES chill_main_address (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + } +}