Rename collection_field to collection field and remove MER

williamespindola · Sep 18, 2015 · 695f146 · 695f146
1 parent 8f02e88
commit 695f146
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 51 deletions.
diff --git a/config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml b/config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
@@ -4,7 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
 
-    <entity name="WilliamEspindola\Field\Entity\CollectionField" table="collection_field">
+    <entity name="WilliamEspindola\Field\Entity\CollectionField" table="collectionfield">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>

diff --git a/data/mysql-schema.sql b/data/mysql-schema.sql
diff --git a/data/schema-0.3.mwb b/data/schema-0.3.mwb
diff --git a/data/schema-0.3.mwb.bak b/data/schema-0.3.mwb.bak
diff --git a/data/schema-0.3.sql b/data/schema-0.3.sql
@@ -53,9 +53,9 @@ ENGINE = InnoDB;
 
 
 -- -----------------------------------------------------
--- Table `mydb`.`collection_field`
+-- Table `mydb`.`collectionfield`
 -- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `mydb`.`collection_field` (
+CREATE TABLE IF NOT EXISTS `mydb`.`collectionfield` (
   `collection_id` INT NOT NULL,
   `field_id` INT NOT NULL,
   `id` INT NOT NULL AUTO_INCREMENT,

diff --git a/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml b/tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml
@@ -4,7 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
 
-    <entity name="WilliamEspindola\Field\Entity\CollectionField" table="collection_field">
+    <entity name="WilliamEspindola\Field\Entity\CollectionField" table="collectionfield">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>