Skip to content

Commit

Permalink
Fix #1941 Change all string lengths to 191 chars
Browse files Browse the repository at this point in the history
When using a multibyte character set such as utf8mb4, the character length goes from 255 to 191. This resolves errors such as “specified key was too long”
  • Loading branch information
AkenRoberts committed Nov 9, 2019
1 parent 984adf6 commit 41b8f14
Show file tree
Hide file tree
Showing 20 changed files with 28 additions and 27 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Expand Up @@ -19,8 +19,9 @@ a release.
---

## [Unreleased]
### Breaking Changes
- Change `/lib/Gedmo` to `/src`
### Notable & Breaking Changes
- Source files moved from `/lib/Gedmo` to `/src`
- All string column type annotations changed to 191 character length (#1941)

## [2.4.38] - 2019-11-08
### Global / Shared
Expand Down
4 changes: 2 additions & 2 deletions src/Loggable/Entity/MappedSuperclass/AbstractLogEntry.php
Expand Up @@ -44,7 +44,7 @@ abstract class AbstractLogEntry
/**
* @var string $objectClass
*
* @ORM\Column(name="object_class", type="string", length=255)
* @ORM\Column(name="object_class", type="string", length=191)
*/
protected $objectClass;

Expand All @@ -65,7 +65,7 @@ abstract class AbstractLogEntry
/**
* @var string $data
*
* @ORM\Column(length=255, nullable=true)
* @ORM\Column(length=191, nullable=true)
*/
protected $username;

Expand Down
Expand Up @@ -30,7 +30,7 @@ abstract class AbstractTranslation
/**
* @var string $objectClass
*
* @ORM\Column(name="object_class", type="string", length=255)
* @ORM\Column(name="object_class", type="string", length=191)
*/
protected $objectClass;

Expand Down
2 changes: 1 addition & 1 deletion tests/Gedmo/Blameable/Fixture/Entity/MappedSupperClass.php
Expand Up @@ -30,7 +30,7 @@ class MappedSupperClass
* @var string $title
*
* @Gedmo\Translatable
* @ORM\Column(name="name", type="string", length=255)
* @ORM\Column(name="name", type="string", length=191)
*/
protected $name;

Expand Down
2 changes: 1 addition & 1 deletion tests/Gedmo/IpTraceable/Fixture/MappedSupperClass.php
Expand Up @@ -30,7 +30,7 @@ class MappedSupperClass
* @var string $title
*
* @Gedmo\Translatable
* @ORM\Column(name="name", type="string", length=255)
* @ORM\Column(name="name", type="string", length=191)
*/
protected $name;

Expand Down
4 changes: 2 additions & 2 deletions tests/Gedmo/Loggable/Fixture/Entity/Address.php
Expand Up @@ -25,14 +25,14 @@ class Address

/**
* @var string $street
* @ORM\Column(type="string", length=255)
* @ORM\Column(type="string", length=191)
* @Gedmo\Versioned()
*/
protected $street;

/**
* @var string $city
* @ORM\Column(type="string", length=255)
* @ORM\Column(type="string", length=191)
* @Gedmo\Versioned()
*/
protected $city;
Expand Down
Expand Up @@ -5,7 +5,7 @@

<embeddable name="Mapping\Fixture\Xml\Embedded">

<field name="subtitle" type="string" length="255" />
<field name="subtitle" type="string" length="191" />
</embeddable>

</doctrine-mapping>
Expand Up @@ -5,7 +5,7 @@

<embeddable name="Mapping\Fixture\Xml\EmbeddedTranslatable">

<field name="subtitle" type="string" length="255">
<field name="subtitle" type="string" length="191">
<gedmo:translatable/>
</field>
</embeddable>
Expand Down
2 changes: 1 addition & 1 deletion tests/Gedmo/Sluggable/Fixture/Page.php
Expand Up @@ -18,7 +18,7 @@ class Page
private $id;

/**
* @ORM\Column(type="string", length=255)
* @ORM\Column(type="string", length=191)
*/
private $content;

Expand Down
4 changes: 2 additions & 2 deletions tests/Gedmo/Sortable/Fixture/AbstractNode.php
Expand Up @@ -18,13 +18,13 @@ class AbstractNode
protected $id;

/**
* @ORM\Column(type="string", length=255)
* @ORM\Column(type="string", length=191)
*/
protected $name;

/**
* @Gedmo\SortableGroup
* @ORM\Column(type="string", length=255)
* @ORM\Column(type="string", length=191)
*/
protected $path;

Expand Down
2 changes: 1 addition & 1 deletion tests/Gedmo/Sortable/Fixture/Category.php
Expand Up @@ -18,7 +18,7 @@ class Category
private $id;

/**
* @ORM\Column(type="string", length=255)
* @ORM\Column(type="string", length=191)
*/
private $name;

Expand Down
2 changes: 1 addition & 1 deletion tests/Gedmo/Sortable/Fixture/Event.php
Expand Up @@ -30,7 +30,7 @@ class Event
/**
* @var string
*
* @ORM\Column(type="string", length=255)
* @ORM\Column(type="string", length=191)
*/
private $name;

Expand Down
2 changes: 1 addition & 1 deletion tests/Gedmo/Sortable/Fixture/Item.php
Expand Up @@ -18,7 +18,7 @@ class Item
private $id;

/**
* @ORM\Column(type="string", length=255)
* @ORM\Column(type="string", length=191)
*/
private $name;

Expand Down
2 changes: 1 addition & 1 deletion tests/Gedmo/Sortable/Fixture/SimpleListItem.php
Expand Up @@ -18,7 +18,7 @@ class SimpleListItem
private $id;

/**
* @ORM\Column(type="string", length=255)
* @ORM\Column(type="string", length=191)
*/
private $name;

Expand Down
4 changes: 2 additions & 2 deletions tests/Gedmo/Sortable/Fixture/Transport/Reservation.php
Expand Up @@ -26,7 +26,7 @@ class Reservation
* Bus destination
*
* @Gedmo\SortableGroup
* @ORM\Column(length=255)
* @ORM\Column(length=191)
*/
private $destination;

Expand All @@ -43,7 +43,7 @@ class Reservation
private $seat;

/**
* @ORM\Column(length=255)
* @ORM\Column(length=191)
*/
private $name;

Expand Down
2 changes: 1 addition & 1 deletion tests/Gedmo/Timestampable/Fixture/MappedSupperClass.php
Expand Up @@ -30,7 +30,7 @@ class MappedSupperClass
* @var string $title
*
* @Gedmo\Translatable
* @ORM\Column(name="name", type="string", length=255)
* @ORM\Column(name="name", type="string", length=191)
*/
protected $name;

Expand Down
6 changes: 3 additions & 3 deletions tests/Gedmo/Translatable/Fixture/CompanyEmbedLink.php
Expand Up @@ -13,15 +13,15 @@ class CompanyEmbedLink
/**
* @var string
*
* @ORM\Column(name="website", type="string", length=255, nullable=true)
* @ORM\Column(name="website", type="string", length=191, nullable=true)
* @Gedmo\Translatable
*/
protected $website;

/**
* @var string
*
* @ORM\Column(name="facebook", type="string", length=255, nullable=true)
* @ORM\Column(name="facebook", type="string", length=191, nullable=true)
* @Gedmo\Translatable
*/
protected $facebook;
Expand Down Expand Up @@ -64,4 +64,4 @@ public function setFacebook($facebook)
return $this;
}

}
}
2 changes: 1 addition & 1 deletion tests/Gedmo/Tree/Fixture/Genealogy/Person.php
Expand Up @@ -55,7 +55,7 @@ abstract class Person
private $lvl;

/**
* @ORM\Column(name="name", type="string", length=255, nullable=false)
* @ORM\Column(name="name", type="string", length=191, nullable=false)
* @var string
*/
private $name;
Expand Down
2 changes: 1 addition & 1 deletion tests/Gedmo/Tree/Fixture/Role.php
Expand Up @@ -55,7 +55,7 @@ abstract class Role
private $lvl;

/**
* @ORM\Column(name="role", type="string", length=255, nullable=false)
* @ORM\Column(name="role", type="string", length=191, nullable=false)
* @var string
*/
private $role;
Expand Down
2 changes: 1 addition & 1 deletion tests/Gedmo/Tree/Fixture/UserGroup.php
Expand Up @@ -12,7 +12,7 @@
class UserGroup extends Role
{
/**
* @ORM\Column(name="name", type="string", length=255)
* @ORM\Column(name="name", type="string", length=191)
* @var string
*/
private $name;
Expand Down

0 comments on commit 41b8f14

Please sign in to comment.