From 1c31603e177f47c6f8ed6226d9dc7fde7ad03d9d Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sat, 31 Dec 2011 04:33:46 +0100 Subject: [PATCH 1/2] type varchar replaced with type string --- en/cookbook/mysql-enums.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/cookbook/mysql-enums.rst b/en/cookbook/mysql-enums.rst index b8cef7b21..69f0a351b 100644 --- a/en/cookbook/mysql-enums.rst +++ b/en/cookbook/mysql-enums.rst @@ -49,7 +49,7 @@ entities: const STATUS_VISIBLE = 'visible'; const STATUS_INVISIBLE = 'invisible'; - /** @Column(type="varchar") */ + /** @Column(type="string") */ private $status; public function setStatus($status) @@ -70,7 +70,7 @@ the **columnDefinition** attribute. /** @Entity */ class Article { - /** @Column(type="varchar", columnDefinition="ENUM('visible', 'invisible')") */ + /** @Column(type="string", columnDefinition="ENUM('visible', 'invisible')") */ private $status; } From 65c64f52c886c3a24f3524ac55e0bd0fef08ff85 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sat, 31 Dec 2011 04:37:25 +0100 Subject: [PATCH 2/2] typo in reference/tools --- en/reference/tools.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/reference/tools.rst b/en/reference/tools.rst index ad40a7899..4f7fdb1b3 100644 --- a/en/reference/tools.rst +++ b/en/reference/tools.rst @@ -348,7 +348,7 @@ This is an **execute one-time** command. It should not be necessary for you to call this method multiple times, escpecially when using the ``--from-database`` flag. -Converting an existing databsae schema into mapping files only solves about 70-80% +Converting an existing database schema into mapping files only solves about 70-80% of the necessary mapping information. Additionally the detection from an existing database cannot detect inverse associations, inheritance types, entities with foreign keys as primary keys and many of the