Skip to content

Commit 695f146

Browse files
Rename collection_field to collection field and remove MER
1 parent 8f02e88 commit 695f146

File tree

6 files changed

+4
-51
lines changed

6 files changed

+4
-51
lines changed

config/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
66

7-
<entity name="WilliamEspindola\Field\Entity\CollectionField" table="collection_field">
7+
<entity name="WilliamEspindola\Field\Entity\CollectionField" table="collectionfield">
88
<id name="id" type="integer">
99
<generator strategy="AUTO" />
1010
</id>

data/mysql-schema.sql

Lines changed: 0 additions & 47 deletions
This file was deleted.

data/schema-0.3.mwb

-9.52 KB
Binary file not shown.

data/schema-0.3.mwb.bak

-9.42 KB
Binary file not shown.

data/schema-0.3.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ ENGINE = InnoDB;
5353

5454

5555
-- -----------------------------------------------------
56-
-- Table `mydb`.`collection_field`
56+
-- Table `mydb`.`collectionfield`
5757
-- -----------------------------------------------------
58-
CREATE TABLE IF NOT EXISTS `mydb`.`collection_field` (
58+
CREATE TABLE IF NOT EXISTS `mydb`.`collectionfield` (
5959
`collection_id` INT NOT NULL,
6060
`field_id` INT NOT NULL,
6161
`id` INT NOT NULL AUTO_INCREMENT,

tests/functional/phpt/xml/WilliamEspindola.Field.Entity.CollectionField.dcm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
66

7-
<entity name="WilliamEspindola\Field\Entity\CollectionField" table="collection_field">
7+
<entity name="WilliamEspindola\Field\Entity\CollectionField" table="collectionfield">
88
<id name="id" type="integer">
99
<generator strategy="AUTO" />
1010
</id>

0 commit comments

Comments
 (0)