From 9a2875f46bd91edd07e6c168c0a48258fe1fafda Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 27 Feb 2014 16:57:31 +0100 Subject: [PATCH] Fix registration table name --- lib/Alchemy/Phrasea/Model/Entities/Registration.php | 2 +- .../Phrasea/Model/Repositories/RegistrationRepository.php | 2 +- .../Setup/DoctrineMigrations/RegistrationMigration.php | 4 ++-- lib/classes/base.php | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/Alchemy/Phrasea/Model/Entities/Registration.php b/lib/Alchemy/Phrasea/Model/Entities/Registration.php index 4223753642..af2c0517ca 100644 --- a/lib/Alchemy/Phrasea/Model/Entities/Registration.php +++ b/lib/Alchemy/Phrasea/Model/Entities/Registration.php @@ -16,7 +16,7 @@ use Doctrine\ORM\Mapping as ORM; use Gedmo\Mapping\Annotation as Gedmo; /** - * @ORM\Table(name="Registration",uniqueConstraints={ + * @ORM\Table(name="Registrations",uniqueConstraints={ * @ORM\UniqueConstraint(name="unique_registration", columns={"user_id","base_id","pending"}) * }) * @ORM\Entity(repositoryClass="Alchemy\Phrasea\Model\Repositories\RegistrationRepository") diff --git a/lib/Alchemy/Phrasea/Model/Repositories/RegistrationRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/RegistrationRepository.php index 4573c623ab..1ca55cbc84 100644 --- a/lib/Alchemy/Phrasea/Model/Repositories/RegistrationRepository.php +++ b/lib/Alchemy/Phrasea/Model/Repositories/RegistrationRepository.php @@ -75,7 +75,7 @@ class RegistrationRepository extends EntityRepository bas.base_id AS bas_id , " . $rsm->generateSelectClause(['d' => 'd',]) . " FROM (usr, bas, sbas) LEFT JOIN basusr ON ( usr.usr_id = basusr.usr_id AND bas.base_id = basusr.base_id ) - LEFT JOIN Registration d ON ( d.user_id = usr.usr_id AND bas.base_id = d.base_id ) + LEFT JOIN Registrations d ON ( d.user_id = usr.usr_id AND bas.base_id = d.base_id ) WHERE bas.active = 1 AND bas.sbas_id = sbas.sbas_id AND usr.usr_id = ? AND model_of = 0"; diff --git a/lib/Alchemy/Phrasea/Setup/DoctrineMigrations/RegistrationMigration.php b/lib/Alchemy/Phrasea/Setup/DoctrineMigrations/RegistrationMigration.php index b1564c84e6..358276b3cb 100644 --- a/lib/Alchemy/Phrasea/Setup/DoctrineMigrations/RegistrationMigration.php +++ b/lib/Alchemy/Phrasea/Setup/DoctrineMigrations/RegistrationMigration.php @@ -17,11 +17,11 @@ class RegistrationMigration extends AbstractMigration { public function doUpSql(Schema $schema) { - $this->addSql("CREATE TABLE Registration (id INT AUTO_INCREMENT NOT NULL, user_id INT NOT NULL, base_id INT NOT NULL, pending TINYINT(1) NOT NULL, rejected TINYINT(1) NOT NULL, created DATETIME NOT NULL, updated DATETIME NOT NULL, INDEX IDX_7A997C5FA76ED395 (user_id), UNIQUE INDEX unique_registration (user_id, base_id, pending), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB"); + $this->addSql("CREATE TABLE Registrations (id INT AUTO_INCREMENT NOT NULL, user_id INT NOT NULL, base_id INT NOT NULL, pending TINYINT(1) NOT NULL, rejected TINYINT(1) NOT NULL, created DATETIME NOT NULL, updated DATETIME NOT NULL, INDEX IDX_7A997C5FA76ED395 (user_id), UNIQUE INDEX unique_registration (user_id, base_id, pending), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB"); } public function doDownSql(Schema $schema) { - $this->addSql("DROP TABLE Registration"); + $this->addSql("DROP TABLE Registrations"); } } diff --git a/lib/classes/base.php b/lib/classes/base.php index 32c1efcbe9..4042dac1c3 100644 --- a/lib/classes/base.php +++ b/lib/classes/base.php @@ -266,6 +266,7 @@ abstract class base implements cache_cacheableInterface 'FtpExports', 'OrderElements', 'Orders', + 'Registrations', 'StoryWZ', 'UsrListOwners', 'UsrLists',