Merge pull request #26 from basz/fix/orm-constraints

adds cascade options on relations, so users can safely be deleted
API-Skeletons · May 18, 2015 · 8deebf1 · 8deebf1
2 parents a84af5e + c036a72
commit 8deebf1
Show file tree

Hide file tree

Showing 9 changed files with 186 additions and 154 deletions.
diff --git a/config/oauth2.doctrine-orm.global.php.dist b/config/oauth2.doctrine-orm.global.php.dist
@@ -24,18 +24,46 @@ return array(
                 'client_entity' => array(
                     'entity' => 'ZF\OAuth2\Doctrine\Entity\Client',
                     'field' => 'client',
+                    'additional_mapping_data' => array(
+                        'joinColumns' => array(
+                            array(
+                                'onDelete' => 'CASCADE'
+                            ),
+                        ),
+                    ),
                 ),
                 'access_token_entity' => array(
                     'entity' => 'ZF\OAuth2\Doctrine\Entity\AccessToken',
                     'field' => 'accessToken',
+                    'additional_mapping_data' => array(
+                        'joinColumns' => array(
+                            array(
+                                'onDelete' => 'CASCADE'
+                            ),
+                        ),
+                    ),
                 ),
                 'authorization_code_entity' => array(
                     'entity' => 'ZF\OAuth2\Doctrine\Entity\AuthorizationCode',
                     'field' => 'authorizationCode',
+                    'additional_mapping_data' => array(
+                        'joinColumns' => array(
+                            array(
+                                'onDelete' => 'CASCADE'
+                            ),
+                        ),
+                    ),
                 ),
                 'refresh_token_entity' => array(
                     'entity' => 'ZF\OAuth2\Doctrine\Entity\RefreshToken',
                     'field' => 'refreshToken',
+                    'additional_mapping_data' => array(
+                        'joinColumns' => array(
+                            array(
+                                'onDelete' => 'CASCADE'
+                            ),
+                        ),
+                    ),
                 ),
             ),
             'mapping' => array(

diff --git a/config/orm/ZF.OAuth2.Doctrine.Entity.AccessToken.dcm.xml b/config/orm/ZF.OAuth2.Doctrine.Entity.AccessToken.dcm.xml
@@ -8,7 +8,7 @@
     <field name="expires" type="datetime" nullable="true"/>
     <many-to-one field="client" target-entity="ZF\OAuth2\Doctrine\Entity\Client" inversed-by="accessToken">
       <join-columns>
-        <join-column name="client_id" referenced-column-name="id" nullable="false"/>
+        <join-column name="client_id" referenced-column-name="id" nullable="false" on-delete="CASCADE"/>
       </join-columns>
     </many-to-one>
     <many-to-many field="scope" target-entity="ZF\OAuth2\Doctrine\Entity\Scope" mapped-by="accessToken"/>

diff --git a/config/orm/ZF.OAuth2.Doctrine.Entity.AuthorizationCode.dcm.xml b/config/orm/ZF.OAuth2.Doctrine.Entity.AuthorizationCode.dcm.xml
@@ -10,7 +10,7 @@
     <field name="idToken" type="text" nullable="true"/>
     <many-to-one field="client" target-entity="ZF\OAuth2\Doctrine\Entity\Client" inversed-by="authorizationCode">
       <join-columns>
-        <join-column name="client_id" referenced-column-name="id" nullable="false"/>
+        <join-column name="client_id" referenced-column-name="id" nullable="false" on-delete="CASCADE"/>
       </join-columns>
     </many-to-one>
     <many-to-many field="scope" target-entity="ZF\OAuth2\Doctrine\Entity\Scope" mapped-by="authorizationCode"/>

diff --git a/config/orm/ZF.OAuth2.Doctrine.Entity.Jti.dcm.xml b/config/orm/ZF.OAuth2.Doctrine.Entity.Jti.dcm.xml
@@ -10,7 +10,7 @@
     <field name="jti" type="text" nullable="true"/>
     <many-to-one field="client" target-entity="ZF\OAuth2\Doctrine\Entity\Client" inversed-by="jti">
       <join-columns>
-        <join-column name="client_id" referenced-column-name="id" nullable="false"/>
+        <join-column name="client_id" referenced-column-name="id" nullable="false" on-delete="CASCADE"/>
       </join-columns>
     </many-to-one>
   </entity>

diff --git a/config/orm/ZF.OAuth2.Doctrine.Entity.Jwt.dcm.xml b/config/orm/ZF.OAuth2.Doctrine.Entity.Jwt.dcm.xml
@@ -8,7 +8,7 @@
     <field name="publicKey" type="text" nullable="true"/>
     <many-to-one field="client" target-entity="ZF\OAuth2\Doctrine\Entity\Client" inversed-by="jwt">
       <join-columns>
-        <join-column name="client_id" referenced-column-name="id" nullable="false"/>
+        <join-column name="client_id" referenced-column-name="id" nullable="false" on-delete="CASCADE"/>
       </join-columns>
     </many-to-one>
   </entity>

diff --git a/config/orm/ZF.OAuth2.Doctrine.Entity.PublicKey.dcm.xml b/config/orm/ZF.OAuth2.Doctrine.Entity.PublicKey.dcm.xml
@@ -9,7 +9,7 @@
     <field name="encryptionAlgorithm" type="string" nullable="true"/>
     <many-to-one field="client" target-entity="ZF\OAuth2\Doctrine\Entity\Client" inversed-by="publicKey">
       <join-columns>
-        <join-column name="client_id" referenced-column-name="id" nullable="false"/>
+        <join-column name="client_id" referenced-column-name="id" nullable="false" on-delete="CASCADE"/>
       </join-columns>
     </many-to-one>
   </entity>

diff --git a/config/orm/ZF.OAuth2.Doctrine.Entity.RefreshToken.dcm.xml b/config/orm/ZF.OAuth2.Doctrine.Entity.RefreshToken.dcm.xml
@@ -8,7 +8,7 @@
     <field name="expires" type="datetime" nullable="true"/>
     <many-to-one field="client" target-entity="ZF\OAuth2\Doctrine\Entity\Client" inversed-by="refreshToken">
       <join-columns>
-        <join-column name="client_id" referenced-column-name="id" nullable="false"/>
+        <join-column name="client_id" referenced-column-name="id" nullable="false" on-delete="CASCADE"/>
       </join-columns>
     </many-to-one>
     <many-to-many field="scope" target-entity="ZF\OAuth2\Doctrine\Entity\Scope" mapped-by="refreshToken"/>