Normalized entity field names. Closes #31

bait-sk · Aug 9, 2012 · 6c25955 · 6c25955
1 parent 904003f
commit 6c25955
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Entity/Field.php b/Entity/Field.php
@@ -44,9 +44,9 @@ abstract class Field extends FieldModel
     protected $createdAt;
 
     /**
-     * @ORM\Column(name="deletedAt", type="datetime", nullable=true)
+     * @ORM\Column(name="deleted_at", type="datetime", nullable=true)
      */
-    private $deletedAt;
+    protected $deletedAt;
 
     /**
      * @ORM\Column(name="is_active", type="boolean")

diff --git a/Entity/Poll.php b/Entity/Poll.php
@@ -34,9 +34,9 @@ abstract class Poll extends PollModel
     protected $createdAt;
 
     /**
-     * @ORM\Column(name="deletedAt", type="datetime", nullable=true)
+     * @ORM\Column(name="deleted_at", type="datetime", nullable=true)
      */
-    private $deletedAt;
+    protected $deletedAt;
 
     /**
      * @ORM\Column(name="start_at", type="datetime")

diff --git a/Resources/doc/index.md b/Resources/doc/index.md
@@ -148,7 +148,7 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
- * @ORM\Table(name="poll_answer_group")
+ * @ORM\Table(name="answer_group")
  */
 class AnswerGroup extends BaseAnswerGroup
 {
@@ -199,6 +199,7 @@ class Answer extends BaseAnswer
     /**
      * AnswerGroup.
      *
+     * @ORM\Column(name="answer_group")
      * @ORM\ManyToOne(targetEntity="Acme\DemoBundle\Entity\AnswerGroup")
      */
     protected $answerGroup;