Merge pull request #24 from bakura10/id

Use simple id for entities
Bacon · Aug 3, 2013 · 82f48cf · 82f48cf
2 parents 4895b2f + 86f36ff
commit 82f48cf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/config/doctrine/BaconUser.Entity.PasswordResetRequest.dcm.xml b/config/doctrine/BaconUser.Entity.PasswordResetRequest.dcm.xml
@@ -6,15 +6,15 @@
     http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
     <entity name="BaconUser\Entity\PasswordResetRequest" table="password_reset_request">
-        <id name="id" type="integer" column="password_reset_request_id">
+        <id name="id" type="integer">
             <generator strategy="AUTO"/>
         </id>
 
         <field name="token" type="string" length="24"/>
         <field name="expirationDate" type="datetime" column="expiration_date"/>
 
         <one-to-one field="user" target-entity="BaconUser\Entity\User" fetch="EAGER">
-            <join-column name="user_id" nullable="false" on-delete="CASCADE"/>
+            <join-column nullable="false" on-delete="CASCADE"/>
         </one-to-one>
     </entity>
 </doctrine-mapping>
diff --git a/config/doctrine/BaconUser.Entity.User.dcm.xml b/config/doctrine/BaconUser.Entity.User.dcm.xml
@@ -6,7 +6,7 @@
     http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
     <entity name="BaconUser\Entity\User" table="user">
-        <id name="id" type="integer" column="user_id">
+        <id name="id" type="integer">
             <generator strategy="AUTO"/>
         </id>
 

diff --git a/liquibase/changelog.xml b/liquibase/changelog.xml
@@ -9,7 +9,7 @@
 
     <changeSet id="1" author="dasprid">
         <createTable tableName="user">
-            <column name="user_id" type="int" autoIncrement="true">
+            <column name="id" type="int" autoIncrement="true">
                 <constraints primaryKey="true" nullable="false"/>
             </column>
             <column name="email" type="varchar(255)">
@@ -26,7 +26,7 @@
         </createTable>
 
         <createTable tableName="password_reset_request">
-            <column name="password_reset_request_id" type="int" autoIncrement="true">
+            <column name="id" type="int" autoIncrement="true">
                 <constraints primaryKey="true" nullable="false"/>
             </column>
             <column name="user_id" type="int">