Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/module/eCampCore/src/Entity/Camp.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class Camp extends BaseEntity implements BelongsToCampInterface {
private bool $isPrototype = false;

/**
* @ORM\Column(type="text", nullable=false)
* @ORM\Column(type="string", length=32, nullable=false)
*/
private ?string $name = null;

Expand Down
6 changes: 3 additions & 3 deletions backend/module/eCampCore/src/Entity/Group.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* @ORM\Entity(repositoryClass="eCamp\Core\Repository\GroupRepository")
* @ORM\Table(
* indexes={@ORM\Index(name="group_name_idx", columns={"name"}, options={"lengths": {128}})},
* indexes={@ORM\Index(name="group_name_idx", columns={"name"})},
* uniqueConstraints={@ORM\UniqueConstraint(
* name="group_parent_name_unique", columns={"parentId", "name"}
* )}
Expand All @@ -23,12 +23,12 @@ class Group extends AbstractCampOwner {
protected Collection $memberships;

/**
* @ORM\Column(type="text", nullable=false)
* @ORM\Column(type="string", length=32, nullable=false)
*/
private ?string $name = null;

/**
* @ORM\Column(type="text", nullable=false)
* @ORM\Column(type="string", length=64, nullable=false)
*/
private ?string $description = null;

Expand Down
2 changes: 1 addition & 1 deletion backend/module/eCampCore/src/Entity/Login.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Login extends BaseEntity {
private ?string $salt;

/**
* @ORM\Column(type="text", nullable=true, unique=true)
* @ORM\Column(type="string", length=64, nullable=true, unique=true)
*/
private ?string $pwResetKey;

Expand Down
4 changes: 2 additions & 2 deletions backend/module/eCampCore/src/Entity/MailAddress.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ class MailAddress extends BaseEntity {
private string $state;

/**
* @ORM\Column(type="text", nullable=false, unique=true)
* @ORM\Column(type="string", length=64, nullable=false, unique=true)
*/
private ?string $mail = null;

/**
* @ORM\Column(type="text", nullable=true)
* @ORM\Column(type="string", length=64, nullable=true)
*/
private ?string $verificationCode = null;

Expand Down
2 changes: 1 addition & 1 deletion backend/module/eCampCore/src/Entity/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class User extends AbstractCampOwner implements RoleInterface {
/**
* Unique username, lower alphanumeric symbols and underscores only.
*
* @ORM\Column(type="text", nullable=true, unique=true)
* @ORM\Column(type="string", length=32, nullable=true, unique=true)
*/
private ?string $username = null;

Expand Down
4 changes: 2 additions & 2 deletions backend/module/eCampCore/src/Entity/UserIdentity.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ class UserIdentity extends BaseEntity {
/**
* This is the identity provider (Facebook, Google, etc.).
*
* @ORM\Column(type="text", nullable=false)
* @ORM\Column(type="string", length=255, nullable=false)
*/
private ?string $provider = null;

/**
* This is the ID given by the identity provider.
*
* @ORM\Column(type="text", nullable=false)
* @ORM\Column(type="string", length=255, nullable=false)
*/
private ?string $providerId = null;

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ services:
- ./.cache/composer:/tmp/cache

db:
image: mariadb:10.5@sha256:9c681cefe72e257c6d58f839bb504f50bf259a0221c883fcc220f0755563fa46
image: mysql:8.0.23@sha256:2878ca7ca986b54c948966b7103aeceb747f50b9ecf34ecf934036cca58274db
container_name: 'ecamp3-db'
environment:
- MYSQL_DATABASE=ecamp3dev
Expand Down