new model

core/lib/Thelia/Action/Profile.php

@@ -0,0 +1,104 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Action;
+
+use Propel\Runtime\ActiveQuery\Criteria;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Thelia\Core\Event\Profile\ProfileEvent;
+use Thelia\Core\Event\TheliaEvents;
+use Thelia\Model\Group as GroupModel;
+use Thelia\Model\GroupQuery;
+
+class Profile extends BaseAction implements EventSubscriberInterface
+{
+    /**
+     * @param ProfileEvent $event
+     */
+    public function create(ProfileEvent $event)
+    {
+        /*$group = new GroupModel();
+
+        $group
+            ->setDispatcher($this->getDispatcher())
+            ->setRequirements($event->getRequirements())
+            ->setType($event->getType())
+            ->setLocale($event->getLocale())
+            ->setTitle($event->getTitle())
+            ->setDescription($event->getDescription())
+        ;
+
+        $group->save();
+
+        $event->setGroup($group);*/
+    }
+
+    /**
+     * @param ProfileEvent $event
+     */
+    public function update(ProfileEvent $event)
+    {
+        if (null !== $group = GroupQuery::create()->findPk($event->getId())) {
+
+            /*$group
+                ->setDispatcher($this->getDispatcher())
+                ->setRequirements($event->getRequirements())
+                ->setType($event->getType())
+                ->setLocale($event->getLocale())
+                ->setTitle($event->getTitle())
+                ->setDescription($event->getDescription())
+            ;
+
+            $group->save();
+
+            $event->setGroup($group);*/
+        }
+    }
+
+    /**
+     * @param ProfileEvent $event
+     */
+    public function delete(ProfileEvent $event)
+    {
+        if (null !== $group = GroupQuery::create()->findPk($event->getId())) {
+
+            /*$group
+                ->delete()
+            ;
+
+            $event->setGroup($group);*/
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public static function getSubscribedEvents()
+    {
+        return array(
+            TheliaEvents::PROFILE_CREATE            => array("create", 128),
+            TheliaEvents::PROFILE_UPDATE            => array("update", 128),
+            TheliaEvents::PROFILE_DELETE            => array("delete", 128),
+        );
+    }
+}

core/lib/Thelia/Config/Resources/action.xml

@@ -141,6 +141,11 @@
             <tag name="kernel.event_subscriber"/>
         </service>
 
+        <service id="thelia.action.profile" class="Thelia\Action\Profile">
+            <argument type="service" id="service_container"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
     </services>
 
 </config>

core/lib/Thelia/Config/Resources/config.xml

@@ -122,14 +122,15 @@
         <form name="thelia.admin.tax.taxlistupdate" class="Thelia\Form\TaxTaxListUpdateForm"/>
         <form name="thelia.admin.tax.add" class="Thelia\Form\TaxCreationForm"/>
 
+        <form name="thelia.admin.profile.add" class="Thelia\Form\ProfileCreationForm"/>
+        <form name="thelia.admin.profile.modification" class="Thelia\Form\ProfileModificationForm"/>
+
         <form name="thelia.admin.template.creation" class="Thelia\Form\TemplateCreationForm"/>
         <form name="thelia.admin.template.modification" class="Thelia\Form\TemplateModificationForm"/>
 
         <form name="thelia.admin.country.creation" class="Thelia\Form\CountryCreationForm"/>
         <form name="thelia.admin.country.modification" class="Thelia\Form\CountryModificationForm"/>
 
-        <form name="thelia.admin.profile.modification" class="Thelia\Form\ProfileModificationForm"/>
-
         <form name="thelia.admin.area.create" class="Thelia\Form\Area\AreaCreateForm"/>
         <form name="thelia.admin.area.modification" class="Thelia\Form\Area\AreaModificationForm"/>
         <form name="thelia.admin.area.country" class="Thelia\Form\Area\AreaCountryForm"/>

core/lib/Thelia/Config/Resources/routing/admin.xml

@@ -757,6 +757,15 @@
 
     <!-- end countries routes management -->
 
+    <!-- profiles management -->
+
+    <route id="admin.configuration.profiles.list" path="/admin/configuration/profiles">
+        <default key="_controller">Thelia\Controller\Admin\ProfileController::defaultAction</default>
+        <requirement key="address_id">\d+</requirement>
+    </route>
+
+    <!-- end profiles management -->
+
     <!-- feature and features value management -->
 
     <route id="admin.configuration.features.default" path="/admin/configuration/features">

core/lib/Thelia/Controller/Admin/ProfileController.php

@@ -0,0 +1,227 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Controller\Admin;
+
+use Thelia\Core\Event\Profile\ProfileEvent;
+use Thelia\Core\Event\TheliaEvents;
+use Thelia\Form\ProfileCreationForm;
+use Thelia\Form\ProfileModificationForm;
+use Thelia\Form\ProfileProfileListUpdateForm;
+use Thelia\Model\ProfileQuery;
+
+class ProfileController extends AbstractCrudController
+{
+    public function __construct()
+    {
+        parent::__construct(
+            'profile',
+            'manual',
+            'order',
+
+            'admin.configuration.profile.view',
+            'admin.configuration.profile.create',
+            'admin.configuration.profile.update',
+            'admin.configuration.profile.delete',
+
+            TheliaEvents::TAX_CREATE,
+            TheliaEvents::TAX_UPDATE,
+            TheliaEvents::TAX_DELETE
+        );
+    }
+
+    protected function getCreationForm()
+    {
+        return new ProfileCreationForm($this->getRequest());
+    }
+
+    protected function getUpdateForm()
+    {
+        return new ProfileModificationForm($this->getRequest());
+    }
+
+    protected function getCreationEvent($formData)
+    {
+        $event = new ProfileEvent();
+
+        $event->setLocale($formData['locale']);
+        $event->setTitle($formData['title']);
+        $event->setDescription($formData['description']);
+        $event->setType($formData['type']);
+        $event->setRequirements($this->getRequirements($formData['type'], $formData));
+
+        return $event;
+    }
+
+    protected function getUpdateEvent($formData)
+    {
+        $event = new ProfileEvent();
+
+        $event->setLocale($formData['locale']);
+        $event->setId($formData['id']);
+        $event->setTitle($formData['title']);
+        $event->setDescription($formData['description']);
+        $event->setType($formData['type']);
+        $event->setRequirements($this->getRequirements($formData['type'], $formData));
+
+        return $event;
+    }
+
+    protected function getDeleteEvent()
+    {
+        $event = new ProfileEvent();
+
+        $event->setId(
+            $this->getRequest()->get('profile_id', 0)
+        );
+
+        return $event;
+    }
+
+    protected function eventContainsObject($event)
+    {
+        return $event->hasProfile();
+    }
+
+    protected function hydrateObjectForm($object)
+    {
+        $data = array(
+            'id'           => $object->getId(),
+            'locale'       => $object->getLocale(),
+            'title'        => $object->getTitle(),
+            'description'  => $object->getDescription(),
+            'type'         => $object->getType(),
+        );
+
+        // Setup the object form
+        return new ProfileModificationForm($this->getRequest(), "form", $data);
+    }
+
+    protected function getObjectFromEvent($event)
+    {
+        return $event->hasProfile() ? $event->getProfile() : null;
+    }
+
+    protected function getExistingObject()
+    {
+        return ProfileQuery::create()
+            ->joinWithI18n($this->getCurrentEditionLocale())
+            ->findOneById($this->getRequest()->get('profile_id'));
+    }
+
+    protected function getObjectLabel($object)
+    {
+        return $object->getTitle();
+    }
+
+    protected function getObjectId($object)
+    {
+        return $object->getId();
+    }
+
+    protected function getViewArguments()
+    {
+        return array();
+    }
+
+    protected function getRouteArguments($profile_id = null)
+    {
+        return array(
+            'profile_id' => $profile_id === null ? $this->getRequest()->get('profile_id') : $profile_id,
+        );
+    }
+
+    protected function renderListTemplate($currentOrder)
+    {
+        // We always return to the feature edition form
+        return $this->render(
+            'profiles',
+            array()
+        );
+    }
+
+    protected function renderEditionTemplate()
+    {
+        // We always return to the feature edition form
+        return $this->render('profile-edit', array_merge($this->getViewArguments(), $this->getRouteArguments()));
+    }
+
+    protected function redirectToEditionTemplate($request = null, $country = null)
+    {
+        // We always return to the feature edition form
+        $this->redirectToRoute(
+            "admin.configuration.profilees.update",
+            $this->getViewArguments($country),
+            $this->getRouteArguments()
+        );
+    }
+
+    /**
+     * Put in this method post object creation processing if required.
+     *
+     * @param  ProfileEvent  $createEvent the create event
+     * @return Response a response, or null to continue normal processing
+     */
+    protected function performAdditionalCreateAction($createEvent)
+    {
+        $this->redirectToRoute(
+            "admin.configuration.profiles.update",
+            $this->getViewArguments(),
+            $this->getRouteArguments($createEvent->getProfile()->getId())
+        );
+    }
+
+    protected function redirectToListTemplate()
+    {
+        $this->redirectToRoute(
+            "admin.configuration.profiles.list"
+        );
+    }
+
+    protected function checkRequirements($formData)
+    {
+        $type = $formData['type'];
+
+
+    }
+
+    protected function getRequirements($type, $formData)
+    {
+        $requirements = array();
+        foreach($formData as $data => $value) {
+            if(!strstr($data, ':')) {
+                continue;
+            }
+
+            $couple = explode(':', $data);
+
+            if(count($couple) != 2 || $couple[0] != $type) {
+                continue;
+            }
+
+            $requirements[$couple[1]] = $value;
+        }
+
+        return $requirements;
+    }
+}

core/lib/Thelia/Core/Event/Profile/ProfileEvent.php

@@ -0,0 +1,54 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia                                                                       */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*      along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Core\Event\Profile;
+
+use Thelia\Core\Event\ActionEvent;
+use Thelia\Model\Group;
+
+class ProfileEvent extends ActionEvent
+{
+    protected $group = null;
+
+    public function __construct(Group $group = null)
+    {
+        $this->group = $group;
+    }
+
+    public function hasGroup()
+    {
+        return ! is_null($this->group);
+    }
+
+    public function getGroup()
+    {
+        return $this->group;
+    }
+
+    public function setGroup(Group $group)
+    {
+        $this->group = $group;
+
+        return $this;
+    }
+}

core/lib/Thelia/Core/Event/TheliaEvents.php

@@ -549,6 +549,13 @@ final class TheliaEvents
     const TAX_UPDATE          = "action.updateTax";
     const TAX_DELETE          = "action.deleteTax";
 
+
+    // -- Profile management ---------------------------------------------
+
+    const PROFILE_CREATE          = "action.createProfile";
+    const PROFILE_UPDATE          = "action.updateProfile";
+    const PROFILE_DELETE          = "action.deleteProfile";
+
     // -- Tax Rules management ---------------------------------------------
 
     const TAX_RULE_CREATE          = "action.createTaxRule";

core/lib/Thelia/Form/ProfileCreationForm.php

@@ -0,0 +1,72 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+namespace Thelia\Form;
+
+use Symfony\Component\Validator\Constraints;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Thelia\Core\Translation\Translator;
+
+/**
+ * Class ProfileCreationForm
+ * @package Thelia\Form
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ */
+class ProfileCreationForm extends BaseForm
+{
+    use StandardDescriptionFieldsTrait;
+
+    protected function buildForm($change_mode = false)
+    {
+        $types = ProfileEngine::getInstance()->getProfileTypeList();
+        $typeList = array();
+        $requirementList = array();
+        foreach($types as $type) {
+            $classPath = "\\Thelia\\ProfileEngine\\ProfileType\\$type";
+            $instance = new $classPath();
+            $typeList[$type] = $instance->getTitle();
+            $requirementList[$type] = $instance->getRequirementsList();
+        }
+
+        $this->formBuilder
+            ->add("locale", "text", array(
+                "constraints" => array(new NotBlank())
+            ))
+            ->add("type", "choice", array(
+                "choices" => $typeList,
+                "required" => true,
+                "constraints" => array(
+                    new Constraints\NotBlank(),
+                ),
+                "label" => Translator::getInstance()->trans("Type"),
+                "label_attr" => array("for" => "type_field"),
+            ))
+        ;
+
+        $this->addStandardDescFields(array('postscriptum', 'chapo', 'locale'));
+    }
+
+    public function getName()
+    {
+        return "thelia_profile_creation";
+    }
+}

core/lib/Thelia/Form/ProfileModificationForm.php

@@ -1,7 +1,7 @@
 <?php
 /*************************************************************************************/
 /*                                                                                   */
-/*      Thelia                                                                       */
+/*      Thelia	                                                                     */
 /*                                                                                   */
 /*      Copyright (c) OpenStudio                                                     */
 /*      email : info@thelia.net                                                      */
@@ -17,95 +17,38 @@
 /*      GNU General Public License for more details.                                 */
 /*                                                                                   */
 /*      You should have received a copy of the GNU General Public License            */
-/*      along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
 /*                                                                                   */
 /*************************************************************************************/
-
 namespace Thelia\Form;
 
 use Symfony\Component\Validator\Constraints;
-use Thelia\Core\Translation\Translator;
-use Thelia\Model\ConfigQuery;
+use Symfony\Component\Validator\ExecutionContextInterface;
+use Thelia\Model\ProfileQuery;
 
 /**
- * Class ProfileModification
+ * Class ProfileModificationForm
  * @package Thelia\Form
- * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
  */
-class ProfileModificationForm extends BaseForm
+class ProfileModificationForm extends ProfileCreationForm
 {
-
     protected function buildForm()
     {
+        parent::buildForm(true);
 
         $this->formBuilder
-            ->add("firstname", "text", array(
-                "constraints" => array(
-                    new Constraints\NotBlank()
-                ),
-                "label" => Translator::getInstance()->trans("First Name"),
-                "label_attr" => array(
-                    "for" => "firstname"
-                )
-            ))
-            ->add("lastname", "text", array(
-                "constraints" => array(
-                    new Constraints\NotBlank()
-                ),
-                "label" => Translator::getInstance()->trans("Last Name"),
-                "label_attr" => array(
-                    "for" => "lastname"
-                )
-            ))
-            ->add("default_language", "text", array(
-                "constraints" => array(
-                    new Constraints\NotBlank()
-                ),
-                "label" => Translator::getInstance()->trans("Default language"),
-                "label_attr" => array(
-                    "for" => "default_language"
-                )
-            ))
-            ->add("editing_language_default", "text", array(
-                "constraints" => array(
-                    new Constraints\NotBlank()
-                ),
-                "label" => Translator::getInstance()->trans("Editing language default"),
-                "label_attr" => array(
-                    "for" => "editing_language_default"
-                )
-            ))
-            ->add("old_password", "password", array(
+            ->add("id", "hidden", array(
+                "required" => true,
                 "constraints" => array(
                     new Constraints\NotBlank(),
-                    new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4)))
-                ),
-                "label" => Translator::getInstance()->trans("Old password"),
-                "label_attr" => array(
-                    "for" => "old_password"
-                )
-            ))
-            ->add("password", "password", array(
-                "constraints" => array(
-                    new Constraints\NotBlank(),
-                    new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4)))
-                ),
-                "label" => Translator::getInstance()->trans("Password"),
-                "label_attr" => array(
-                    "for" => "password"
-                )
-            ))
-            ->add("password_confirm", "password", array(
-                "constraints" => array(
-                    new Constraints\NotBlank(),
-                    new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4))),
-                    new Constraints\Callback(array("methods" => array(
-                        array($this, "verifyPasswordField")
-                    )))
-                ),
-                "label" => "Password confirmation",
-                "label_attr" => array(
-                    "for" => "password_confirmation"
+                    new Constraints\Callback(
+                        array(
+                            "methods" => array(
+                                array($this, "verifyProfileId"),
+                            ),
+                        )
+                    ),
                 )
             ))
         ;
@@ -115,4 +58,14 @@ class ProfileModificationForm extends BaseForm
     {
         return "thelia_profile_modification";
     }
+
+    public function verifyProfileId($value, ExecutionContextInterface $context)
+    {
+        $profile = ProfileQuery::create()
+            ->findPk($value);
+
+        if (null === $profile) {
+            $context->addViolation("Profile ID not found");
+        }
+    }
 }

core/lib/Thelia/Form/TaxCreationForm.php

@@ -24,12 +24,16 @@ namespace Thelia\Form;
 
 use Symfony\Component\Validator\Constraints;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Symfony\Component\Validator\ExecutionContextInterface;
 use Thelia\Core\Form\Type\TheliaType;
 use Thelia\Core\Translation\Translator;
 use Thelia\TaxEngine\TaxEngine;
 use Thelia\TaxEngine\TaxType;
 
+/**
+ * Class TaxCreationForm
+ * @package Thelia\Form
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ */
 class TaxCreationForm extends BaseForm
 {
     use StandardDescriptionFieldsTrait;

core/lib/Thelia/Form/TaxModificationForm.php

@@ -26,6 +26,11 @@ use Symfony\Component\Validator\Constraints;
 use Symfony\Component\Validator\ExecutionContextInterface;
 use Thelia\Model\TaxQuery;
 
+/**
+ * Class TaxModificationForm
+ * @package Thelia\Form
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ */
 class TaxModificationForm extends TaxCreationForm
 {
     protected function buildForm()

core/lib/Thelia/Model/AdminGroup.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\AdminGroup as BaseAdminGroup;
-
-class AdminGroup extends BaseAdminGroup {
-
-}

core/lib/Thelia/Model/AdminGroupQuery.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\AdminGroupQuery as BaseAdminGroupQuery;
-
-
-/**
- * Skeleton subclass for performing query and update operations on the 'admin_group' table.
- *
- *
- *
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- */
-class AdminGroupQuery extends BaseAdminGroupQuery {
-
-} // AdminGroupQuery

core/lib/Thelia/Model/Base/Admin.php

@@ -18,11 +18,11 @@ use Propel\Runtime\Map\TableMap;
 use Propel\Runtime\Parser\AbstractParser;
 use Propel\Runtime\Util\PropelDateTime;
 use Thelia\Model\Admin as ChildAdmin;
-use Thelia\Model\AdminGroup as ChildAdminGroup;
-use Thelia\Model\AdminGroupQuery as ChildAdminGroupQuery;
+use Thelia\Model\AdminProfile as ChildAdminProfile;
+use Thelia\Model\AdminProfileQuery as ChildAdminProfileQuery;
 use Thelia\Model\AdminQuery as ChildAdminQuery;
-use Thelia\Model\Group as ChildGroup;
-use Thelia\Model\GroupQuery as ChildGroupQuery;
+use Thelia\Model\Profile as ChildProfile;
+use Thelia\Model\ProfileQuery as ChildProfileQuery;
 use Thelia\Model\Map\AdminTableMap;
 
 abstract class Admin implements ActiveRecordInterface
@@ -126,15 +126,15 @@ abstract class Admin implements ActiveRecordInterface
     protected $updated_at;
 
     /**
-     * @var        ObjectCollection|ChildAdminGroup[] Collection to store aggregation of ChildAdminGroup objects.
+     * @var        ObjectCollection|ChildAdminProfile[] Collection to store aggregation of ChildAdminProfile objects.
      */
-    protected $collAdminGroups;
-    protected $collAdminGroupsPartial;
+    protected $collAdminProfiles;
+    protected $collAdminProfilesPartial;
 
     /**
-     * @var        ChildGroup[] Collection to store aggregation of ChildGroup objects.
+     * @var        ChildProfile[] Collection to store aggregation of ChildProfile objects.
      */
-    protected $collGroups;
+    protected $collProfiles;
 
     /**
      * Flag to prevent endless save loop, if this object is referenced
@@ -148,13 +148,13 @@ abstract class Admin implements ActiveRecordInterface
      * An array of objects scheduled for deletion.
      * @var ObjectCollection
      */
-    protected $groupsScheduledForDeletion = null;
+    protected $profilesScheduledForDeletion = null;
 
     /**
      * An array of objects scheduled for deletion.
      * @var ObjectCollection
      */
-    protected $adminGroupsScheduledForDeletion = null;
+    protected $adminProfilesScheduledForDeletion = null;
 
     /**
      * Initializes internal state of Thelia\Model\Base\Admin object.
@@ -928,9 +928,9 @@ abstract class Admin implements ActiveRecordInterface
 
         if ($deep) {  // also de-associate any related objects?
 
-            $this->collAdminGroups = null;
+            $this->collAdminProfiles = null;
 
-            $this->collGroups = null;
+            $this->collProfiles = null;
         } // if (deep)
     }
 
@@ -1064,44 +1064,44 @@ abstract class Admin implements ActiveRecordInterface
                 $this->resetModified();
             }
 
-            if ($this->groupsScheduledForDeletion !== null) {
-                if (!$this->groupsScheduledForDeletion->isEmpty()) {
+            if ($this->profilesScheduledForDeletion !== null) {
+                if (!$this->profilesScheduledForDeletion->isEmpty()) {
                     $pks = array();
                     $pk  = $this->getPrimaryKey();
-                    foreach ($this->groupsScheduledForDeletion->getPrimaryKeys(false) as $remotePk) {
+                    foreach ($this->profilesScheduledForDeletion->getPrimaryKeys(false) as $remotePk) {
                         $pks[] = array($remotePk, $pk);
                     }
 
-                    AdminGroupQuery::create()
+                    AdminProfileQuery::create()
                         ->filterByPrimaryKeys($pks)
                         ->delete($con);
-                    $this->groupsScheduledForDeletion = null;
+                    $this->profilesScheduledForDeletion = null;
                 }
 
-                foreach ($this->getGroups() as $group) {
-                    if ($group->isModified()) {
-                        $group->save($con);
+                foreach ($this->getProfiles() as $profile) {
+                    if ($profile->isModified()) {
+                        $profile->save($con);
                     }
                 }
-            } elseif ($this->collGroups) {
-                foreach ($this->collGroups as $group) {
-                    if ($group->isModified()) {
-                        $group->save($con);
+            } elseif ($this->collProfiles) {
+                foreach ($this->collProfiles as $profile) {
+                    if ($profile->isModified()) {
+                        $profile->save($con);
                     }
                 }
             }
 
-            if ($this->adminGroupsScheduledForDeletion !== null) {
-                if (!$this->adminGroupsScheduledForDeletion->isEmpty()) {
-                    \Thelia\Model\AdminGroupQuery::create()
-                        ->filterByPrimaryKeys($this->adminGroupsScheduledForDeletion->getPrimaryKeys(false))
+            if ($this->adminProfilesScheduledForDeletion !== null) {
+                if (!$this->adminProfilesScheduledForDeletion->isEmpty()) {
+                    \Thelia\Model\AdminProfileQuery::create()
+                        ->filterByPrimaryKeys($this->adminProfilesScheduledForDeletion->getPrimaryKeys(false))
                         ->delete($con);
-                    $this->adminGroupsScheduledForDeletion = null;
+                    $this->adminProfilesScheduledForDeletion = null;
                 }
             }
 
-                if ($this->collAdminGroups !== null) {
-            foreach ($this->collAdminGroups as $referrerFK) {
+                if ($this->collAdminProfiles !== null) {
+            foreach ($this->collAdminProfiles as $referrerFK) {
                     if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
                         $affectedRows += $referrerFK->save($con);
                     }
@@ -1353,8 +1353,8 @@ abstract class Admin implements ActiveRecordInterface
         }
 
         if ($includeForeignObjects) {
-            if (null !== $this->collAdminGroups) {
-                $result['AdminGroups'] = $this->collAdminGroups->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+            if (null !== $this->collAdminProfiles) {
+                $result['AdminProfiles'] = $this->collAdminProfiles->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
             }
         }
 
@@ -1559,9 +1559,9 @@ abstract class Admin implements ActiveRecordInterface
             // the getter/setter methods for fkey referrer objects.
             $copyObj->setNew(false);
 
-            foreach ($this->getAdminGroups() as $relObj) {
+            foreach ($this->getAdminProfiles() as $relObj) {
                 if ($relObj !== $this) {  // ensure that we don't try to copy a reference to ourselves
-                    $copyObj->addAdminGroup($relObj->copy($deepCopy));
+                    $copyObj->addAdminProfile($relObj->copy($deepCopy));
                 }
             }
 
@@ -1606,37 +1606,37 @@ abstract class Admin implements ActiveRecordInterface
      */
     public function initRelation($relationName)
     {
-        if ('AdminGroup' == $relationName) {
-            return $this->initAdminGroups();
+        if ('AdminProfile' == $relationName) {
+            return $this->initAdminProfiles();
         }
     }
 
     /**
-     * Clears out the collAdminGroups collection
+     * Clears out the collAdminProfiles collection
      *
      * This does not modify the database; however, it will remove any associated objects, causing
      * them to be refetched by subsequent calls to accessor method.
      *
      * @return void
-     * @see        addAdminGroups()
+     * @see        addAdminProfiles()
      */
-    public function clearAdminGroups()
+    public function clearAdminProfiles()
     {
-        $this->collAdminGroups = null; // important to set this to NULL since that means it is uninitialized
+        $this->collAdminProfiles = null; // important to set this to NULL since that means it is uninitialized
     }
 
     /**
-     * Reset is the collAdminGroups collection loaded partially.
+     * Reset is the collAdminProfiles collection loaded partially.
      */
-    public function resetPartialAdminGroups($v = true)
+    public function resetPartialAdminProfiles($v = true)
     {
-        $this->collAdminGroupsPartial = $v;
+        $this->collAdminProfilesPartial = $v;
     }
 
     /**
-     * Initializes the collAdminGroups collection.
+     * Initializes the collAdminProfiles collection.
      *
-     * By default this just sets the collAdminGroups collection to an empty array (like clearcollAdminGroups());
+     * By default this just sets the collAdminProfiles collection to an empty array (like clearcollAdminProfiles());
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
@@ -1645,17 +1645,17 @@ abstract class Admin implements ActiveRecordInterface
      *
      * @return void
      */
-    public function initAdminGroups($overrideExisting = true)
+    public function initAdminProfiles($overrideExisting = true)
     {
-        if (null !== $this->collAdminGroups && !$overrideExisting) {
+        if (null !== $this->collAdminProfiles && !$overrideExisting) {
             return;
         }
-        $this->collAdminGroups = new ObjectCollection();
-        $this->collAdminGroups->setModel('\Thelia\Model\AdminGroup');
+        $this->collAdminProfiles = new ObjectCollection();
+        $this->collAdminProfiles->setModel('\Thelia\Model\AdminProfile');
     }
 
     /**
-     * Gets an array of ChildAdminGroup objects which contain a foreign key that references this object.
+     * Gets an array of ChildAdminProfile objects which contain a foreign key that references this object.
      *
      * If the $criteria is not null, it is used to always fetch the results from the database.
      * Otherwise the results are fetched from the database the first time, then cached.
@@ -1665,112 +1665,112 @@ abstract class Admin implements ActiveRecordInterface
      *
      * @param      Criteria $criteria optional Criteria object to narrow the query
      * @param      ConnectionInterface $con optional connection object
-     * @return Collection|ChildAdminGroup[] List of ChildAdminGroup objects
+     * @return Collection|ChildAdminProfile[] List of ChildAdminProfile objects
      * @throws PropelException
      */
-    public function getAdminGroups($criteria = null, ConnectionInterface $con = null)
+    public function getAdminProfiles($criteria = null, ConnectionInterface $con = null)
     {
-        $partial = $this->collAdminGroupsPartial && !$this->isNew();
-        if (null === $this->collAdminGroups || null !== $criteria  || $partial) {
-            if ($this->isNew() && null === $this->collAdminGroups) {
+        $partial = $this->collAdminProfilesPartial && !$this->isNew();
+        if (null === $this->collAdminProfiles || null !== $criteria  || $partial) {
+            if ($this->isNew() && null === $this->collAdminProfiles) {
                 // return empty collection
-                $this->initAdminGroups();
+                $this->initAdminProfiles();
             } else {
-                $collAdminGroups = ChildAdminGroupQuery::create(null, $criteria)
+                $collAdminProfiles = ChildAdminProfileQuery::create(null, $criteria)
                     ->filterByAdmin($this)
                     ->find($con);
 
                 if (null !== $criteria) {
-                    if (false !== $this->collAdminGroupsPartial && count($collAdminGroups)) {
-                        $this->initAdminGroups(false);
+                    if (false !== $this->collAdminProfilesPartial && count($collAdminProfiles)) {
+                        $this->initAdminProfiles(false);
 
-                        foreach ($collAdminGroups as $obj) {
-                            if (false == $this->collAdminGroups->contains($obj)) {
-                                $this->collAdminGroups->append($obj);
+                        foreach ($collAdminProfiles as $obj) {
+                            if (false == $this->collAdminProfiles->contains($obj)) {
+                                $this->collAdminProfiles->append($obj);
                             }
                         }
 
-                        $this->collAdminGroupsPartial = true;
+                        $this->collAdminProfilesPartial = true;
                     }
 
-                    $collAdminGroups->getInternalIterator()->rewind();
+                    $collAdminProfiles->getInternalIterator()->rewind();
 
-                    return $collAdminGroups;
+                    return $collAdminProfiles;
                 }
 
-                if ($partial && $this->collAdminGroups) {
-                    foreach ($this->collAdminGroups as $obj) {
+                if ($partial && $this->collAdminProfiles) {
+                    foreach ($this->collAdminProfiles as $obj) {
                         if ($obj->isNew()) {
-                            $collAdminGroups[] = $obj;
+                            $collAdminProfiles[] = $obj;
                         }
                     }
                 }
 
-                $this->collAdminGroups = $collAdminGroups;
-                $this->collAdminGroupsPartial = false;
+                $this->collAdminProfiles = $collAdminProfiles;
+                $this->collAdminProfilesPartial = false;
             }
         }
 
-        return $this->collAdminGroups;
+        return $this->collAdminProfiles;
     }
 
     /**
-     * Sets a collection of AdminGroup objects related by a one-to-many relationship
+     * Sets a collection of AdminProfile objects related by a one-to-many relationship
      * to the current object.
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param      Collection $adminGroups A Propel collection.
+     * @param      Collection $adminProfiles A Propel collection.
      * @param      ConnectionInterface $con Optional connection object
      * @return   ChildAdmin The current object (for fluent API support)
      */
-    public function setAdminGroups(Collection $adminGroups, ConnectionInterface $con = null)
+    public function setAdminProfiles(Collection $adminProfiles, ConnectionInterface $con = null)
     {
-        $adminGroupsToDelete = $this->getAdminGroups(new Criteria(), $con)->diff($adminGroups);
+        $adminProfilesToDelete = $this->getAdminProfiles(new Criteria(), $con)->diff($adminProfiles);
 
 
         //since at least one column in the foreign key is at the same time a PK
         //we can not just set a PK to NULL in the lines below. We have to store
         //a backup of all values, so we are able to manipulate these items based on the onDelete value later.
-        $this->adminGroupsScheduledForDeletion = clone $adminGroupsToDelete;
+        $this->adminProfilesScheduledForDeletion = clone $adminProfilesToDelete;
 
-        foreach ($adminGroupsToDelete as $adminGroupRemoved) {
-            $adminGroupRemoved->setAdmin(null);
+        foreach ($adminProfilesToDelete as $adminProfileRemoved) {
+            $adminProfileRemoved->setAdmin(null);
         }
 
-        $this->collAdminGroups = null;
-        foreach ($adminGroups as $adminGroup) {
-            $this->addAdminGroup($adminGroup);
+        $this->collAdminProfiles = null;
+        foreach ($adminProfiles as $adminProfile) {
+            $this->addAdminProfile($adminProfile);
         }
 
-        $this->collAdminGroups = $adminGroups;
-        $this->collAdminGroupsPartial = false;
+        $this->collAdminProfiles = $adminProfiles;
+        $this->collAdminProfilesPartial = false;
 
         return $this;
     }
 
     /**
-     * Returns the number of related AdminGroup objects.
+     * Returns the number of related AdminProfile objects.
      *
      * @param      Criteria $criteria
      * @param      boolean $distinct
      * @param      ConnectionInterface $con
-     * @return int             Count of related AdminGroup objects.
+     * @return int             Count of related AdminProfile objects.
      * @throws PropelException
      */
-    public function countAdminGroups(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+    public function countAdminProfiles(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
     {
-        $partial = $this->collAdminGroupsPartial && !$this->isNew();
-        if (null === $this->collAdminGroups || null !== $criteria || $partial) {
-            if ($this->isNew() && null === $this->collAdminGroups) {
+        $partial = $this->collAdminProfilesPartial && !$this->isNew();
+        if (null === $this->collAdminProfiles || null !== $criteria || $partial) {
+            if ($this->isNew() && null === $this->collAdminProfiles) {
                 return 0;
             }
 
             if ($partial && !$criteria) {
-                return count($this->getAdminGroups());
+                return count($this->getAdminProfiles());
             }
 
-            $query = ChildAdminGroupQuery::create(null, $criteria);
+            $query = ChildAdminProfileQuery::create(null, $criteria);
             if ($distinct) {
                 $query->distinct();
             }
@@ -1780,53 +1780,53 @@ abstract class Admin implements ActiveRecordInterface
                 ->count($con);
         }
 
-        return count($this->collAdminGroups);
+        return count($this->collAdminProfiles);
     }
 
     /**
-     * Method called to associate a ChildAdminGroup object to this object
-     * through the ChildAdminGroup foreign key attribute.
+     * Method called to associate a ChildAdminProfile object to this object
+     * through the ChildAdminProfile foreign key attribute.
      *
-     * @param    ChildAdminGroup $l ChildAdminGroup
+     * @param    ChildAdminProfile $l ChildAdminProfile
      * @return   \Thelia\Model\Admin The current object (for fluent API support)
      */
-    public function addAdminGroup(ChildAdminGroup $l)
+    public function addAdminProfile(ChildAdminProfile $l)
     {
-        if ($this->collAdminGroups === null) {
-            $this->initAdminGroups();
-            $this->collAdminGroupsPartial = true;
+        if ($this->collAdminProfiles === null) {
+            $this->initAdminProfiles();
+            $this->collAdminProfilesPartial = true;
         }
 
-        if (!in_array($l, $this->collAdminGroups->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
-            $this->doAddAdminGroup($l);
+        if (!in_array($l, $this->collAdminProfiles->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+            $this->doAddAdminProfile($l);
         }
 
         return $this;
     }
 
     /**
-     * @param AdminGroup $adminGroup The adminGroup object to add.
+     * @param AdminProfile $adminProfile The adminProfile object to add.
      */
-    protected function doAddAdminGroup($adminGroup)
+    protected function doAddAdminProfile($adminProfile)
     {
-        $this->collAdminGroups[]= $adminGroup;
-        $adminGroup->setAdmin($this);
+        $this->collAdminProfiles[]= $adminProfile;
+        $adminProfile->setAdmin($this);
     }
 
     /**
-     * @param  AdminGroup $adminGroup The adminGroup object to remove.
+     * @param  AdminProfile $adminProfile The adminProfile object to remove.
      * @return ChildAdmin The current object (for fluent API support)
      */
-    public function removeAdminGroup($adminGroup)
+    public function removeAdminProfile($adminProfile)
     {
-        if ($this->getAdminGroups()->contains($adminGroup)) {
-            $this->collAdminGroups->remove($this->collAdminGroups->search($adminGroup));
-            if (null === $this->adminGroupsScheduledForDeletion) {
-                $this->adminGroupsScheduledForDeletion = clone $this->collAdminGroups;
-                $this->adminGroupsScheduledForDeletion->clear();
+        if ($this->getAdminProfiles()->contains($adminProfile)) {
+            $this->collAdminProfiles->remove($this->collAdminProfiles->search($adminProfile));
+            if (null === $this->adminProfilesScheduledForDeletion) {
+                $this->adminProfilesScheduledForDeletion = clone $this->collAdminProfiles;
+                $this->adminProfilesScheduledForDeletion->clear();
             }
-            $this->adminGroupsScheduledForDeletion[]= clone $adminGroup;
-            $adminGroup->setAdmin(null);
+            $this->adminProfilesScheduledForDeletion[]= clone $adminProfile;
+            $adminProfile->setAdmin(null);
         }
 
         return $this;
@@ -1838,7 +1838,7 @@ abstract class Admin implements ActiveRecordInterface
      * an identical criteria, it returns the collection.
      * Otherwise if this Admin is new, it will return
      * an empty collection; or if this Admin has previously
-     * been saved, it will retrieve related AdminGroups from storage.
+     * been saved, it will retrieve related AdminProfiles from storage.
      *
      * This method is protected by default in order to keep the public
      * api reasonable.  You can provide public methods for those you
@@ -1847,49 +1847,49 @@ abstract class Admin implements ActiveRecordInterface
      * @param      Criteria $criteria optional Criteria object to narrow the query
      * @param      ConnectionInterface $con optional connection object
      * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
-     * @return Collection|ChildAdminGroup[] List of ChildAdminGroup objects
+     * @return Collection|ChildAdminProfile[] List of ChildAdminProfile objects
      */
-    public function getAdminGroupsJoinGroup($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+    public function getAdminProfilesJoinProfile($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
     {
-        $query = ChildAdminGroupQuery::create(null, $criteria);
-        $query->joinWith('Group', $joinBehavior);
+        $query = ChildAdminProfileQuery::create(null, $criteria);
+        $query->joinWith('Profile', $joinBehavior);
 
-        return $this->getAdminGroups($query, $con);
+        return $this->getAdminProfiles($query, $con);
     }
 
     /**
-     * Clears out the collGroups collection
+     * Clears out the collProfiles collection
      *
      * This does not modify the database; however, it will remove any associated objects, causing
      * them to be refetched by subsequent calls to accessor method.
      *
      * @return void
-     * @see        addGroups()
+     * @see        addProfiles()
      */
-    public function clearGroups()
+    public function clearProfiles()
     {
-        $this->collGroups = null; // important to set this to NULL since that means it is uninitialized
-        $this->collGroupsPartial = null;
+        $this->collProfiles = null; // important to set this to NULL since that means it is uninitialized
+        $this->collProfilesPartial = null;
     }
 
     /**
-     * Initializes the collGroups collection.
+     * Initializes the collProfiles collection.
      *
-     * By default this just sets the collGroups collection to an empty collection (like clearGroups());
+     * By default this just sets the collProfiles collection to an empty collection (like clearProfiles());
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
      * @return void
      */
-    public function initGroups()
+    public function initProfiles()
     {
-        $this->collGroups = new ObjectCollection();
-        $this->collGroups->setModel('\Thelia\Model\Group');
+        $this->collProfiles = new ObjectCollection();
+        $this->collProfiles->setModel('\Thelia\Model\Profile');
     }
 
     /**
-     * Gets a collection of ChildGroup objects related by a many-to-many relationship
-     * to the current object by way of the admin_group cross-reference table.
+     * Gets a collection of ChildProfile objects related by a many-to-many relationship
+     * to the current object by way of the admin_profile cross-reference table.
      *
      * If the $criteria is not null, it is used to always fetch the results from the database.
      * Otherwise the results are fetched from the database the first time, then cached.
@@ -1900,73 +1900,73 @@ abstract class Admin implements ActiveRecordInterface
      * @param      Criteria $criteria Optional query object to filter the query
      * @param      ConnectionInterface $con Optional connection object
      *
-     * @return ObjectCollection|ChildGroup[] List of ChildGroup objects
+     * @return ObjectCollection|ChildProfile[] List of ChildProfile objects
      */
-    public function getGroups($criteria = null, ConnectionInterface $con = null)
+    public function getProfiles($criteria = null, ConnectionInterface $con = null)
     {
-        if (null === $this->collGroups || null !== $criteria) {
-            if ($this->isNew() && null === $this->collGroups) {
+        if (null === $this->collProfiles || null !== $criteria) {
+            if ($this->isNew() && null === $this->collProfiles) {
                 // return empty collection
-                $this->initGroups();
+                $this->initProfiles();
             } else {
-                $collGroups = ChildGroupQuery::create(null, $criteria)
+                $collProfiles = ChildProfileQuery::create(null, $criteria)
                     ->filterByAdmin($this)
                     ->find($con);
                 if (null !== $criteria) {
-                    return $collGroups;
+                    return $collProfiles;
                 }
-                $this->collGroups = $collGroups;
+                $this->collProfiles = $collProfiles;
             }
         }
 
-        return $this->collGroups;
+        return $this->collProfiles;
     }
 
     /**
-     * Sets a collection of Group objects related by a many-to-many relationship
-     * to the current object by way of the admin_group cross-reference table.
+     * Sets a collection of Profile objects related by a many-to-many relationship
+     * to the current object by way of the admin_profile cross-reference table.
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param  Collection $groups A Propel collection.
+     * @param  Collection $profiles A Propel collection.
      * @param  ConnectionInterface $con Optional connection object
      * @return ChildAdmin The current object (for fluent API support)
      */
-    public function setGroups(Collection $groups, ConnectionInterface $con = null)
+    public function setProfiles(Collection $profiles, ConnectionInterface $con = null)
     {
-        $this->clearGroups();
-        $currentGroups = $this->getGroups();
+        $this->clearProfiles();
+        $currentProfiles = $this->getProfiles();
 
-        $this->groupsScheduledForDeletion = $currentGroups->diff($groups);
+        $this->profilesScheduledForDeletion = $currentProfiles->diff($profiles);
 
-        foreach ($groups as $group) {
-            if (!$currentGroups->contains($group)) {
-                $this->doAddGroup($group);
+        foreach ($profiles as $profile) {
+            if (!$currentProfiles->contains($profile)) {
+                $this->doAddProfile($profile);
             }
         }
 
-        $this->collGroups = $groups;
+        $this->collProfiles = $profiles;
 
         return $this;
     }
 
     /**
-     * Gets the number of ChildGroup objects related by a many-to-many relationship
-     * to the current object by way of the admin_group cross-reference table.
+     * Gets the number of ChildProfile objects related by a many-to-many relationship
+     * to the current object by way of the admin_profile cross-reference table.
      *
      * @param      Criteria $criteria Optional query object to filter the query
      * @param      boolean $distinct Set to true to force count distinct
      * @param      ConnectionInterface $con Optional connection object
      *
-     * @return int the number of related ChildGroup objects
+     * @return int the number of related ChildProfile objects
      */
-    public function countGroups($criteria = null, $distinct = false, ConnectionInterface $con = null)
+    public function countProfiles($criteria = null, $distinct = false, ConnectionInterface $con = null)
     {
-        if (null === $this->collGroups || null !== $criteria) {
-            if ($this->isNew() && null === $this->collGroups) {
+        if (null === $this->collProfiles || null !== $criteria) {
+            if ($this->isNew() && null === $this->collProfiles) {
                 return 0;
             } else {
-                $query = ChildGroupQuery::create(null, $criteria);
+                $query = ChildProfileQuery::create(null, $criteria);
                 if ($distinct) {
                     $query->distinct();
                 }
@@ -1976,65 +1976,65 @@ abstract class Admin implements ActiveRecordInterface
                     ->count($con);
             }
         } else {
-            return count($this->collGroups);
+            return count($this->collProfiles);
         }
     }
 
     /**
-     * Associate a ChildGroup object to this object
-     * through the admin_group cross reference table.
+     * Associate a ChildProfile object to this object
+     * through the admin_profile cross reference table.
      *
-     * @param  ChildGroup $group The ChildAdminGroup object to relate
+     * @param  ChildProfile $profile The ChildAdminProfile object to relate
      * @return ChildAdmin The current object (for fluent API support)
      */
-    public function addGroup(ChildGroup $group)
+    public function addProfile(ChildProfile $profile)
     {
-        if ($this->collGroups === null) {
-            $this->initGroups();
+        if ($this->collProfiles === null) {
+            $this->initProfiles();
         }
 
-        if (!$this->collGroups->contains($group)) { // only add it if the **same** object is not already associated
-            $this->doAddGroup($group);
-            $this->collGroups[] = $group;
+        if (!$this->collProfiles->contains($profile)) { // only add it if the **same** object is not already associated
+            $this->doAddProfile($profile);
+            $this->collProfiles[] = $profile;
         }
 
         return $this;
     }
 
     /**
-     * @param    Group $group The group object to add.
+     * @param    Profile $profile The profile object to add.
      */
-    protected function doAddGroup($group)
+    protected function doAddProfile($profile)
     {
-        $adminGroup = new ChildAdminGroup();
-        $adminGroup->setGroup($group);
-        $this->addAdminGroup($adminGroup);
+        $adminProfile = new ChildAdminProfile();
+        $adminProfile->setProfile($profile);
+        $this->addAdminProfile($adminProfile);
         // set the back reference to this object directly as using provided method either results
         // in endless loop or in multiple relations
-        if (!$group->getAdmins()->contains($this)) {
-            $foreignCollection   = $group->getAdmins();
+        if (!$profile->getAdmins()->contains($this)) {
+            $foreignCollection   = $profile->getAdmins();
             $foreignCollection[] = $this;
         }
     }
 
     /**
-     * Remove a ChildGroup object to this object
-     * through the admin_group cross reference table.
+     * Remove a ChildProfile object to this object
+     * through the admin_profile cross reference table.
      *
-     * @param ChildGroup $group The ChildAdminGroup object to relate
+     * @param ChildProfile $profile The ChildAdminProfile object to relate
      * @return ChildAdmin The current object (for fluent API support)
      */
-    public function removeGroup(ChildGroup $group)
+    public function removeProfile(ChildProfile $profile)
     {
-        if ($this->getGroups()->contains($group)) {
-            $this->collGroups->remove($this->collGroups->search($group));
+        if ($this->getProfiles()->contains($profile)) {
+            $this->collProfiles->remove($this->collProfiles->search($profile));
 
-            if (null === $this->groupsScheduledForDeletion) {
-                $this->groupsScheduledForDeletion = clone $this->collGroups;
-                $this->groupsScheduledForDeletion->clear();
+            if (null === $this->profilesScheduledForDeletion) {
+                $this->profilesScheduledForDeletion = clone $this->collProfiles;
+                $this->profilesScheduledForDeletion->clear();
             }
 
-            $this->groupsScheduledForDeletion[] = $group;
+            $this->profilesScheduledForDeletion[] = $profile;
         }
 
         return $this;
@@ -2075,26 +2075,26 @@ abstract class Admin implements ActiveRecordInterface
     public function clearAllReferences($deep = false)
     {
         if ($deep) {
-            if ($this->collAdminGroups) {
-                foreach ($this->collAdminGroups as $o) {
+            if ($this->collAdminProfiles) {
+                foreach ($this->collAdminProfiles as $o) {
                     $o->clearAllReferences($deep);
                 }
             }
-            if ($this->collGroups) {
-                foreach ($this->collGroups as $o) {
+            if ($this->collProfiles) {
+                foreach ($this->collProfiles as $o) {
                     $o->clearAllReferences($deep);
                 }
             }
         } // if ($deep)
 
-        if ($this->collAdminGroups instanceof Collection) {
-            $this->collAdminGroups->clearIterator();
+        if ($this->collAdminProfiles instanceof Collection) {
+            $this->collAdminProfiles->clearIterator();
         }
-        $this->collAdminGroups = null;
-        if ($this->collGroups instanceof Collection) {
-            $this->collGroups->clearIterator();
+        $this->collAdminProfiles = null;
+        if ($this->collProfiles instanceof Collection) {
+            $this->collProfiles->clearIterator();
         }
-        $this->collGroups = null;
+        $this->collProfiles = null;
     }
 
     /**

core/lib/Thelia/Model/Base/AdminGroupQuery.php

@@ -1,778 +0,0 @@
-<?php
-
-namespace Thelia\Model\Base;
-
-use \Exception;
-use \PDO;
-use Propel\Runtime\Propel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\ModelCriteria;
-use Propel\Runtime\ActiveQuery\ModelJoin;
-use Propel\Runtime\Collection\Collection;
-use Propel\Runtime\Collection\ObjectCollection;
-use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Exception\PropelException;
-use Thelia\Model\AdminGroup as ChildAdminGroup;
-use Thelia\Model\AdminGroupQuery as ChildAdminGroupQuery;
-use Thelia\Model\Map\AdminGroupTableMap;
-
-/**
- * Base class that represents a query for the 'admin_group' table.
- *
- *
- *
- * @method     ChildAdminGroupQuery orderById($order = Criteria::ASC) Order by the id column
- * @method     ChildAdminGroupQuery orderByGroupId($order = Criteria::ASC) Order by the group_id column
- * @method     ChildAdminGroupQuery orderByAdminId($order = Criteria::ASC) Order by the admin_id column
- * @method     ChildAdminGroupQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
- * @method     ChildAdminGroupQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
- *
- * @method     ChildAdminGroupQuery groupById() Group by the id column
- * @method     ChildAdminGroupQuery groupByGroupId() Group by the group_id column
- * @method     ChildAdminGroupQuery groupByAdminId() Group by the admin_id column
- * @method     ChildAdminGroupQuery groupByCreatedAt() Group by the created_at column
- * @method     ChildAdminGroupQuery groupByUpdatedAt() Group by the updated_at column
- *
- * @method     ChildAdminGroupQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
- * @method     ChildAdminGroupQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
- * @method     ChildAdminGroupQuery innerJoin($relation) Adds a INNER JOIN clause to the query
- *
- * @method     ChildAdminGroupQuery leftJoinGroup($relationAlias = null) Adds a LEFT JOIN clause to the query using the Group relation
- * @method     ChildAdminGroupQuery rightJoinGroup($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Group relation
- * @method     ChildAdminGroupQuery innerJoinGroup($relationAlias = null) Adds a INNER JOIN clause to the query using the Group relation
- *
- * @method     ChildAdminGroupQuery leftJoinAdmin($relationAlias = null) Adds a LEFT JOIN clause to the query using the Admin relation
- * @method     ChildAdminGroupQuery rightJoinAdmin($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Admin relation
- * @method     ChildAdminGroupQuery innerJoinAdmin($relationAlias = null) Adds a INNER JOIN clause to the query using the Admin relation
- *
- * @method     ChildAdminGroup findOne(ConnectionInterface $con = null) Return the first ChildAdminGroup matching the query
- * @method     ChildAdminGroup findOneOrCreate(ConnectionInterface $con = null) Return the first ChildAdminGroup matching the query, or a new ChildAdminGroup object populated from the query conditions when no match is found
- *
- * @method     ChildAdminGroup findOneById(int $id) Return the first ChildAdminGroup filtered by the id column
- * @method     ChildAdminGroup findOneByGroupId(int $group_id) Return the first ChildAdminGroup filtered by the group_id column
- * @method     ChildAdminGroup findOneByAdminId(int $admin_id) Return the first ChildAdminGroup filtered by the admin_id column
- * @method     ChildAdminGroup findOneByCreatedAt(string $created_at) Return the first ChildAdminGroup filtered by the created_at column
- * @method     ChildAdminGroup findOneByUpdatedAt(string $updated_at) Return the first ChildAdminGroup filtered by the updated_at column
- *
- * @method     array findById(int $id) Return ChildAdminGroup objects filtered by the id column
- * @method     array findByGroupId(int $group_id) Return ChildAdminGroup objects filtered by the group_id column
- * @method     array findByAdminId(int $admin_id) Return ChildAdminGroup objects filtered by the admin_id column
- * @method     array findByCreatedAt(string $created_at) Return ChildAdminGroup objects filtered by the created_at column
- * @method     array findByUpdatedAt(string $updated_at) Return ChildAdminGroup objects filtered by the updated_at column
- *
- */
-abstract class AdminGroupQuery extends ModelCriteria
-{
-
-    /**
-     * Initializes internal state of \Thelia\Model\Base\AdminGroupQuery object.
-     *
-     * @param     string $dbName The database name
-     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
-     */
-    public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AdminGroup', $modelAlias = null)
-    {
-        parent::__construct($dbName, $modelName, $modelAlias);
-    }
-
-    /**
-     * Returns a new ChildAdminGroupQuery object.
-     *
-     * @param     string $modelAlias The alias of a model in the query
-     * @param     Criteria $criteria Optional Criteria to build the query from
-     *
-     * @return ChildAdminGroupQuery
-     */
-    public static function create($modelAlias = null, $criteria = null)
-    {
-        if ($criteria instanceof \Thelia\Model\AdminGroupQuery) {
-            return $criteria;
-        }
-        $query = new \Thelia\Model\AdminGroupQuery();
-        if (null !== $modelAlias) {
-            $query->setModelAlias($modelAlias);
-        }
-        if ($criteria instanceof Criteria) {
-            $query->mergeWith($criteria);
-        }
-
-        return $query;
-    }
-
-    /**
-     * Find object by primary key.
-     * Propel uses the instance pool to skip the database if the object exists.
-     * Go fast if the query is untouched.
-     *
-     * <code>
-     * $obj = $c->findPk(array(12, 34, 56), $con);
-     * </code>
-     *
-     * @param array[$id, $group_id, $admin_id] $key Primary key to use for the query
-     * @param ConnectionInterface $con an optional connection object
-     *
-     * @return ChildAdminGroup|array|mixed the result, formatted by the current formatter
-     */
-    public function findPk($key, $con = null)
-    {
-        if ($key === null) {
-            return null;
-        }
-        if ((null !== ($obj = AdminGroupTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1], (string) $key[2]))))) && !$this->formatter) {
-            // the object is already in the instance pool
-            return $obj;
-        }
-        if ($con === null) {
-            $con = Propel::getServiceContainer()->getReadConnection(AdminGroupTableMap::DATABASE_NAME);
-        }
-        $this->basePreSelect($con);
-        if ($this->formatter || $this->modelAlias || $this->with || $this->select
-         || $this->selectColumns || $this->asColumns || $this->selectModifiers
-         || $this->map || $this->having || $this->joins) {
-            return $this->findPkComplex($key, $con);
-        } else {
-            return $this->findPkSimple($key, $con);
-        }
-    }
-
-    /**
-     * Find object by primary key using raw SQL to go fast.
-     * Bypass doSelect() and the object formatter by using generated code.
-     *
-     * @param     mixed $key Primary key to use for the query
-     * @param     ConnectionInterface $con A connection object
-     *
-     * @return   ChildAdminGroup A model object, or null if the key is not found
-     */
-    protected function findPkSimple($key, $con)
-    {
-        $sql = 'SELECT ID, GROUP_ID, ADMIN_ID, CREATED_AT, UPDATED_AT FROM admin_group WHERE ID = :p0 AND GROUP_ID = :p1 AND ADMIN_ID = :p2';
-        try {
-            $stmt = $con->prepare($sql);
-            $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
-            $stmt->bindValue(':p1', $key[1], PDO::PARAM_INT);
-            $stmt->bindValue(':p2', $key[2], PDO::PARAM_INT);
-            $stmt->execute();
-        } catch (Exception $e) {
-            Propel::log($e->getMessage(), Propel::LOG_ERR);
-            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
-        }
-        $obj = null;
-        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
-            $obj = new ChildAdminGroup();
-            $obj->hydrate($row);
-            AdminGroupTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1], (string) $key[2])));
-        }
-        $stmt->closeCursor();
-
-        return $obj;
-    }
-
-    /**
-     * Find object by primary key.
-     *
-     * @param     mixed $key Primary key to use for the query
-     * @param     ConnectionInterface $con A connection object
-     *
-     * @return ChildAdminGroup|array|mixed the result, formatted by the current formatter
-     */
-    protected function findPkComplex($key, $con)
-    {
-        // As the query uses a PK condition, no limit(1) is necessary.
-        $criteria = $this->isKeepQuery() ? clone $this : $this;
-        $dataFetcher = $criteria
-            ->filterByPrimaryKey($key)
-            ->doSelect($con);
-
-        return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
-    }
-
-    /**
-     * Find objects by primary key
-     * <code>
-     * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con);
-     * </code>
-     * @param     array $keys Primary keys to use for the query
-     * @param     ConnectionInterface $con an optional connection object
-     *
-     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
-     */
-    public function findPks($keys, $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
-        }
-        $this->basePreSelect($con);
-        $criteria = $this->isKeepQuery() ? clone $this : $this;
-        $dataFetcher = $criteria
-            ->filterByPrimaryKeys($keys)
-            ->doSelect($con);
-
-        return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
-    }
-
-    /**
-     * Filter the query by primary key
-     *
-     * @param     mixed $key Primary key to use for the query
-     *
-     * @return ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function filterByPrimaryKey($key)
-    {
-        $this->addUsingAlias(AdminGroupTableMap::ID, $key[0], Criteria::EQUAL);
-        $this->addUsingAlias(AdminGroupTableMap::GROUP_ID, $key[1], Criteria::EQUAL);
-        $this->addUsingAlias(AdminGroupTableMap::ADMIN_ID, $key[2], Criteria::EQUAL);
-
-        return $this;
-    }
-
-    /**
-     * Filter the query by a list of primary keys
-     *
-     * @param     array $keys The list of primary key to use for the query
-     *
-     * @return ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function filterByPrimaryKeys($keys)
-    {
-        if (empty($keys)) {
-            return $this->add(null, '1<>1', Criteria::CUSTOM);
-        }
-        foreach ($keys as $key) {
-            $cton0 = $this->getNewCriterion(AdminGroupTableMap::ID, $key[0], Criteria::EQUAL);
-            $cton1 = $this->getNewCriterion(AdminGroupTableMap::GROUP_ID, $key[1], Criteria::EQUAL);
-            $cton0->addAnd($cton1);
-            $cton2 = $this->getNewCriterion(AdminGroupTableMap::ADMIN_ID, $key[2], Criteria::EQUAL);
-            $cton0->addAnd($cton2);
-            $this->addOr($cton0);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Filter the query on the id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterById(1234); // WHERE id = 1234
-     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
-     * $query->filterById(array('min' => 12)); // WHERE id > 12
-     * </code>
-     *
-     * @param     mixed $id The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function filterById($id = null, $comparison = null)
-    {
-        if (is_array($id)) {
-            $useMinMax = false;
-            if (isset($id['min'])) {
-                $this->addUsingAlias(AdminGroupTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($id['max'])) {
-                $this->addUsingAlias(AdminGroupTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(AdminGroupTableMap::ID, $id, $comparison);
-    }
-
-    /**
-     * Filter the query on the group_id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByGroupId(1234); // WHERE group_id = 1234
-     * $query->filterByGroupId(array(12, 34)); // WHERE group_id IN (12, 34)
-     * $query->filterByGroupId(array('min' => 12)); // WHERE group_id > 12
-     * </code>
-     *
-     * @see       filterByGroup()
-     *
-     * @param     mixed $groupId The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function filterByGroupId($groupId = null, $comparison = null)
-    {
-        if (is_array($groupId)) {
-            $useMinMax = false;
-            if (isset($groupId['min'])) {
-                $this->addUsingAlias(AdminGroupTableMap::GROUP_ID, $groupId['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($groupId['max'])) {
-                $this->addUsingAlias(AdminGroupTableMap::GROUP_ID, $groupId['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(AdminGroupTableMap::GROUP_ID, $groupId, $comparison);
-    }
-
-    /**
-     * Filter the query on the admin_id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByAdminId(1234); // WHERE admin_id = 1234
-     * $query->filterByAdminId(array(12, 34)); // WHERE admin_id IN (12, 34)
-     * $query->filterByAdminId(array('min' => 12)); // WHERE admin_id > 12
-     * </code>
-     *
-     * @see       filterByAdmin()
-     *
-     * @param     mixed $adminId The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function filterByAdminId($adminId = null, $comparison = null)
-    {
-        if (is_array($adminId)) {
-            $useMinMax = false;
-            if (isset($adminId['min'])) {
-                $this->addUsingAlias(AdminGroupTableMap::ADMIN_ID, $adminId['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($adminId['max'])) {
-                $this->addUsingAlias(AdminGroupTableMap::ADMIN_ID, $adminId['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(AdminGroupTableMap::ADMIN_ID, $adminId, $comparison);
-    }
-
-    /**
-     * Filter the query on the created_at column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
-     * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
-     * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
-     * </code>
-     *
-     * @param     mixed $createdAt The value to use as filter.
-     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *              Empty strings are treated as NULL.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function filterByCreatedAt($createdAt = null, $comparison = null)
-    {
-        if (is_array($createdAt)) {
-            $useMinMax = false;
-            if (isset($createdAt['min'])) {
-                $this->addUsingAlias(AdminGroupTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($createdAt['max'])) {
-                $this->addUsingAlias(AdminGroupTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(AdminGroupTableMap::CREATED_AT, $createdAt, $comparison);
-    }
-
-    /**
-     * Filter the query on the updated_at column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
-     * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
-     * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
-     * </code>
-     *
-     * @param     mixed $updatedAt The value to use as filter.
-     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *              Empty strings are treated as NULL.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function filterByUpdatedAt($updatedAt = null, $comparison = null)
-    {
-        if (is_array($updatedAt)) {
-            $useMinMax = false;
-            if (isset($updatedAt['min'])) {
-                $this->addUsingAlias(AdminGroupTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($updatedAt['max'])) {
-                $this->addUsingAlias(AdminGroupTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(AdminGroupTableMap::UPDATED_AT, $updatedAt, $comparison);
-    }
-
-    /**
-     * Filter the query by a related \Thelia\Model\Group object
-     *
-     * @param \Thelia\Model\Group|ObjectCollection $group The related object(s) to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function filterByGroup($group, $comparison = null)
-    {
-        if ($group instanceof \Thelia\Model\Group) {
-            return $this
-                ->addUsingAlias(AdminGroupTableMap::GROUP_ID, $group->getId(), $comparison);
-        } elseif ($group instanceof ObjectCollection) {
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-
-            return $this
-                ->addUsingAlias(AdminGroupTableMap::GROUP_ID, $group->toKeyValue('PrimaryKey', 'Id'), $comparison);
-        } else {
-            throw new PropelException('filterByGroup() only accepts arguments of type \Thelia\Model\Group or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the Group relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function joinGroup($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('Group');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'Group');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the Group relation Group object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\GroupQuery A secondary query class using the current class as primary query
-     */
-    public function useGroupQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        return $this
-            ->joinGroup($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'Group', '\Thelia\Model\GroupQuery');
-    }
-
-    /**
-     * Filter the query by a related \Thelia\Model\Admin object
-     *
-     * @param \Thelia\Model\Admin|ObjectCollection $admin The related object(s) to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function filterByAdmin($admin, $comparison = null)
-    {
-        if ($admin instanceof \Thelia\Model\Admin) {
-            return $this
-                ->addUsingAlias(AdminGroupTableMap::ADMIN_ID, $admin->getId(), $comparison);
-        } elseif ($admin instanceof ObjectCollection) {
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-
-            return $this
-                ->addUsingAlias(AdminGroupTableMap::ADMIN_ID, $admin->toKeyValue('PrimaryKey', 'Id'), $comparison);
-        } else {
-            throw new PropelException('filterByAdmin() only accepts arguments of type \Thelia\Model\Admin or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the Admin relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function joinAdmin($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('Admin');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'Admin');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the Admin relation Admin object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\AdminQuery A secondary query class using the current class as primary query
-     */
-    public function useAdminQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        return $this
-            ->joinAdmin($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'Admin', '\Thelia\Model\AdminQuery');
-    }
-
-    /**
-     * Exclude object from result
-     *
-     * @param   ChildAdminGroup $adminGroup Object to remove from the list of results
-     *
-     * @return ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function prune($adminGroup = null)
-    {
-        if ($adminGroup) {
-            $this->addCond('pruneCond0', $this->getAliasedColName(AdminGroupTableMap::ID), $adminGroup->getId(), Criteria::NOT_EQUAL);
-            $this->addCond('pruneCond1', $this->getAliasedColName(AdminGroupTableMap::GROUP_ID), $adminGroup->getGroupId(), Criteria::NOT_EQUAL);
-            $this->addCond('pruneCond2', $this->getAliasedColName(AdminGroupTableMap::ADMIN_ID), $adminGroup->getAdminId(), Criteria::NOT_EQUAL);
-            $this->combine(array('pruneCond0', 'pruneCond1', 'pruneCond2'), Criteria::LOGICAL_OR);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Deletes all rows from the admin_group table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public function doDeleteAll(ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(AdminGroupTableMap::DATABASE_NAME);
-        }
-        $affectedRows = 0; // initialize var to track total num of affected rows
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table or we could emulating ON DELETE CASCADE, etc.
-            $con->beginTransaction();
-            $affectedRows += parent::doDeleteAll($con);
-            // Because this db requires some delete cascade/set null emulation, we have to
-            // clear the cached instance *after* the emulation has happened (since
-            // instances get re-added by the select statement contained therein).
-            AdminGroupTableMap::clearInstancePool();
-            AdminGroupTableMap::clearRelatedInstancePool();
-
-            $con->commit();
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-
-        return $affectedRows;
-    }
-
-    /**
-     * Performs a DELETE on the database, given a ChildAdminGroup or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or ChildAdminGroup object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-     public function delete(ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(AdminGroupTableMap::DATABASE_NAME);
-        }
-
-        $criteria = $this;
-
-        // Set the correct dbName
-        $criteria->setDbName(AdminGroupTableMap::DATABASE_NAME);
-
-        $affectedRows = 0; // initialize var to track total num of affected rows
-
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table or we could emulating ON DELETE CASCADE, etc.
-            $con->beginTransaction();
-
-
-        AdminGroupTableMap::removeInstanceFromPool($criteria);
-
-            $affectedRows += ModelCriteria::delete($con);
-            AdminGroupTableMap::clearRelatedInstancePool();
-            $con->commit();
-
-            return $affectedRows;
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-    }
-
-    // timestampable behavior
-
-    /**
-     * Filter by the latest updated
-     *
-     * @param      int $nbDays Maximum age of the latest update in days
-     *
-     * @return     ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function recentlyUpdated($nbDays = 7)
-    {
-        return $this->addUsingAlias(AdminGroupTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
-    }
-
-    /**
-     * Filter by the latest created
-     *
-     * @param      int $nbDays Maximum age of in days
-     *
-     * @return     ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function recentlyCreated($nbDays = 7)
-    {
-        return $this->addUsingAlias(AdminGroupTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
-    }
-
-    /**
-     * Order by update date desc
-     *
-     * @return     ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function lastUpdatedFirst()
-    {
-        return $this->addDescendingOrderByColumn(AdminGroupTableMap::UPDATED_AT);
-    }
-
-    /**
-     * Order by update date asc
-     *
-     * @return     ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function firstUpdatedFirst()
-    {
-        return $this->addAscendingOrderByColumn(AdminGroupTableMap::UPDATED_AT);
-    }
-
-    /**
-     * Order by create date desc
-     *
-     * @return     ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function lastCreatedFirst()
-    {
-        return $this->addDescendingOrderByColumn(AdminGroupTableMap::CREATED_AT);
-    }
-
-    /**
-     * Order by create date asc
-     *
-     * @return     ChildAdminGroupQuery The current query, for fluid interface
-     */
-    public function firstCreatedFirst()
-    {
-        return $this->addAscendingOrderByColumn(AdminGroupTableMap::CREATED_AT);
-    }
-
-} // AdminGroupQuery

core/lib/Thelia/Model/Base/AdminQuery.php

@@ -49,9 +49,9 @@ use Thelia\Model\Map\AdminTableMap;
  * @method     ChildAdminQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
  * @method     ChildAdminQuery innerJoin($relation) Adds a INNER JOIN clause to the query
  *
- * @method     ChildAdminQuery leftJoinAdminGroup($relationAlias = null) Adds a LEFT JOIN clause to the query using the AdminGroup relation
- * @method     ChildAdminQuery rightJoinAdminGroup($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AdminGroup relation
- * @method     ChildAdminQuery innerJoinAdminGroup($relationAlias = null) Adds a INNER JOIN clause to the query using the AdminGroup relation
+ * @method     ChildAdminQuery leftJoinAdminProfile($relationAlias = null) Adds a LEFT JOIN clause to the query using the AdminProfile relation
+ * @method     ChildAdminQuery rightJoinAdminProfile($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AdminProfile relation
+ * @method     ChildAdminQuery innerJoinAdminProfile($relationAlias = null) Adds a INNER JOIN clause to the query using the AdminProfile relation
  *
  * @method     ChildAdmin findOne(ConnectionInterface $con = null) Return the first ChildAdmin matching the query
  * @method     ChildAdmin findOneOrCreate(ConnectionInterface $con = null) Return the first ChildAdmin matching the query, or a new ChildAdmin object populated from the query conditions when no match is found
@@ -616,40 +616,40 @@ abstract class AdminQuery extends ModelCriteria
     }
 
     /**
-     * Filter the query by a related \Thelia\Model\AdminGroup object
+     * Filter the query by a related \Thelia\Model\AdminProfile object
      *
-     * @param \Thelia\Model\AdminGroup|ObjectCollection $adminGroup  the related object to use as filter
+     * @param \Thelia\Model\AdminProfile|ObjectCollection $adminProfile  the related object to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
-    public function filterByAdminGroup($adminGroup, $comparison = null)
+    public function filterByAdminProfile($adminProfile, $comparison = null)
     {
-        if ($adminGroup instanceof \Thelia\Model\AdminGroup) {
+        if ($adminProfile instanceof \Thelia\Model\AdminProfile) {
             return $this
-                ->addUsingAlias(AdminTableMap::ID, $adminGroup->getAdminId(), $comparison);
-        } elseif ($adminGroup instanceof ObjectCollection) {
+                ->addUsingAlias(AdminTableMap::ID, $adminProfile->getAdminId(), $comparison);
+        } elseif ($adminProfile instanceof ObjectCollection) {
             return $this
-                ->useAdminGroupQuery()
-                ->filterByPrimaryKeys($adminGroup->getPrimaryKeys())
+                ->useAdminProfileQuery()
+                ->filterByPrimaryKeys($adminProfile->getPrimaryKeys())
                 ->endUse();
         } else {
-            throw new PropelException('filterByAdminGroup() only accepts arguments of type \Thelia\Model\AdminGroup or Collection');
+            throw new PropelException('filterByAdminProfile() only accepts arguments of type \Thelia\Model\AdminProfile or Collection');
         }
     }
 
     /**
-     * Adds a JOIN clause to the query using the AdminGroup relation
+     * Adds a JOIN clause to the query using the AdminProfile relation
      *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
-    public function joinAdminGroup($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function joinAdminProfile($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('AdminGroup');
+        $relationMap = $tableMap->getRelation('AdminProfile');
 
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -664,14 +664,14 @@ abstract class AdminQuery extends ModelCriteria
             $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
             $this->addJoinObject($join, $relationAlias);
         } else {
-            $this->addJoinObject($join, 'AdminGroup');
+            $this->addJoinObject($join, 'AdminProfile');
         }
 
         return $this;
     }
 
     /**
-     * Use the AdminGroup relation AdminGroup object
+     * Use the AdminProfile relation AdminProfile object
      *
      * @see useQuery()
      *
@@ -679,29 +679,29 @@ abstract class AdminQuery extends ModelCriteria
      *                                   to be used as main alias in the secondary query
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return   \Thelia\Model\AdminGroupQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AdminProfileQuery A secondary query class using the current class as primary query
      */
-    public function useAdminGroupQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function useAdminProfileQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         return $this
-            ->joinAdminGroup($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'AdminGroup', '\Thelia\Model\AdminGroupQuery');
+            ->joinAdminProfile($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'AdminProfile', '\Thelia\Model\AdminProfileQuery');
     }
 
     /**
-     * Filter the query by a related Group object
-     * using the admin_group table as cross reference
+     * Filter the query by a related Profile object
+     * using the admin_profile table as cross reference
      *
-     * @param Group $group the related object to use as filter
+     * @param Profile $profile the related object to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
-    public function filterByGroup($group, $comparison = Criteria::EQUAL)
+    public function filterByProfile($profile, $comparison = Criteria::EQUAL)
     {
         return $this
-            ->useAdminGroupQuery()
-            ->filterByGroup($group, $comparison)
+            ->useAdminProfileQuery()
+            ->filterByProfile($profile, $comparison)
             ->endUse();
     }
 

core/lib/Thelia/Model/Base/GroupI18nQuery.php

@@ -1,607 +0,0 @@
-<?php
-
-namespace Thelia\Model\Base;
-
-use \Exception;
-use \PDO;
-use Propel\Runtime\Propel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\ModelCriteria;
-use Propel\Runtime\ActiveQuery\ModelJoin;
-use Propel\Runtime\Collection\Collection;
-use Propel\Runtime\Collection\ObjectCollection;
-use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Exception\PropelException;
-use Thelia\Model\GroupI18n as ChildGroupI18n;
-use Thelia\Model\GroupI18nQuery as ChildGroupI18nQuery;
-use Thelia\Model\Map\GroupI18nTableMap;
-
-/**
- * Base class that represents a query for the 'group_i18n' table.
- *
- *
- *
- * @method     ChildGroupI18nQuery orderById($order = Criteria::ASC) Order by the id column
- * @method     ChildGroupI18nQuery orderByLocale($order = Criteria::ASC) Order by the locale column
- * @method     ChildGroupI18nQuery orderByTitle($order = Criteria::ASC) Order by the title column
- * @method     ChildGroupI18nQuery orderByDescription($order = Criteria::ASC) Order by the description column
- * @method     ChildGroupI18nQuery orderByChapo($order = Criteria::ASC) Order by the chapo column
- * @method     ChildGroupI18nQuery orderByPostscriptum($order = Criteria::ASC) Order by the postscriptum column
- *
- * @method     ChildGroupI18nQuery groupById() Group by the id column
- * @method     ChildGroupI18nQuery groupByLocale() Group by the locale column
- * @method     ChildGroupI18nQuery groupByTitle() Group by the title column
- * @method     ChildGroupI18nQuery groupByDescription() Group by the description column
- * @method     ChildGroupI18nQuery groupByChapo() Group by the chapo column
- * @method     ChildGroupI18nQuery groupByPostscriptum() Group by the postscriptum column
- *
- * @method     ChildGroupI18nQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
- * @method     ChildGroupI18nQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
- * @method     ChildGroupI18nQuery innerJoin($relation) Adds a INNER JOIN clause to the query
- *
- * @method     ChildGroupI18nQuery leftJoinGroup($relationAlias = null) Adds a LEFT JOIN clause to the query using the Group relation
- * @method     ChildGroupI18nQuery rightJoinGroup($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Group relation
- * @method     ChildGroupI18nQuery innerJoinGroup($relationAlias = null) Adds a INNER JOIN clause to the query using the Group relation
- *
- * @method     ChildGroupI18n findOne(ConnectionInterface $con = null) Return the first ChildGroupI18n matching the query
- * @method     ChildGroupI18n findOneOrCreate(ConnectionInterface $con = null) Return the first ChildGroupI18n matching the query, or a new ChildGroupI18n object populated from the query conditions when no match is found
- *
- * @method     ChildGroupI18n findOneById(int $id) Return the first ChildGroupI18n filtered by the id column
- * @method     ChildGroupI18n findOneByLocale(string $locale) Return the first ChildGroupI18n filtered by the locale column
- * @method     ChildGroupI18n findOneByTitle(string $title) Return the first ChildGroupI18n filtered by the title column
- * @method     ChildGroupI18n findOneByDescription(string $description) Return the first ChildGroupI18n filtered by the description column
- * @method     ChildGroupI18n findOneByChapo(string $chapo) Return the first ChildGroupI18n filtered by the chapo column
- * @method     ChildGroupI18n findOneByPostscriptum(string $postscriptum) Return the first ChildGroupI18n filtered by the postscriptum column
- *
- * @method     array findById(int $id) Return ChildGroupI18n objects filtered by the id column
- * @method     array findByLocale(string $locale) Return ChildGroupI18n objects filtered by the locale column
- * @method     array findByTitle(string $title) Return ChildGroupI18n objects filtered by the title column
- * @method     array findByDescription(string $description) Return ChildGroupI18n objects filtered by the description column
- * @method     array findByChapo(string $chapo) Return ChildGroupI18n objects filtered by the chapo column
- * @method     array findByPostscriptum(string $postscriptum) Return ChildGroupI18n objects filtered by the postscriptum column
- *
- */
-abstract class GroupI18nQuery extends ModelCriteria
-{
-
-    /**
-     * Initializes internal state of \Thelia\Model\Base\GroupI18nQuery object.
-     *
-     * @param     string $dbName The database name
-     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
-     */
-    public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\GroupI18n', $modelAlias = null)
-    {
-        parent::__construct($dbName, $modelName, $modelAlias);
-    }
-
-    /**
-     * Returns a new ChildGroupI18nQuery object.
-     *
-     * @param     string $modelAlias The alias of a model in the query
-     * @param     Criteria $criteria Optional Criteria to build the query from
-     *
-     * @return ChildGroupI18nQuery
-     */
-    public static function create($modelAlias = null, $criteria = null)
-    {
-        if ($criteria instanceof \Thelia\Model\GroupI18nQuery) {
-            return $criteria;
-        }
-        $query = new \Thelia\Model\GroupI18nQuery();
-        if (null !== $modelAlias) {
-            $query->setModelAlias($modelAlias);
-        }
-        if ($criteria instanceof Criteria) {
-            $query->mergeWith($criteria);
-        }
-
-        return $query;
-    }
-
-    /**
-     * Find object by primary key.
-     * Propel uses the instance pool to skip the database if the object exists.
-     * Go fast if the query is untouched.
-     *
-     * <code>
-     * $obj = $c->findPk(array(12, 34), $con);
-     * </code>
-     *
-     * @param array[$id, $locale] $key Primary key to use for the query
-     * @param ConnectionInterface $con an optional connection object
-     *
-     * @return ChildGroupI18n|array|mixed the result, formatted by the current formatter
-     */
-    public function findPk($key, $con = null)
-    {
-        if ($key === null) {
-            return null;
-        }
-        if ((null !== ($obj = GroupI18nTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1]))))) && !$this->formatter) {
-            // the object is already in the instance pool
-            return $obj;
-        }
-        if ($con === null) {
-            $con = Propel::getServiceContainer()->getReadConnection(GroupI18nTableMap::DATABASE_NAME);
-        }
-        $this->basePreSelect($con);
-        if ($this->formatter || $this->modelAlias || $this->with || $this->select
-         || $this->selectColumns || $this->asColumns || $this->selectModifiers
-         || $this->map || $this->having || $this->joins) {
-            return $this->findPkComplex($key, $con);
-        } else {
-            return $this->findPkSimple($key, $con);
-        }
-    }
-
-    /**
-     * Find object by primary key using raw SQL to go fast.
-     * Bypass doSelect() and the object formatter by using generated code.
-     *
-     * @param     mixed $key Primary key to use for the query
-     * @param     ConnectionInterface $con A connection object
-     *
-     * @return   ChildGroupI18n A model object, or null if the key is not found
-     */
-    protected function findPkSimple($key, $con)
-    {
-        $sql = 'SELECT ID, LOCALE, TITLE, DESCRIPTION, CHAPO, POSTSCRIPTUM FROM group_i18n WHERE ID = :p0 AND LOCALE = :p1';
-        try {
-            $stmt = $con->prepare($sql);
-            $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
-            $stmt->bindValue(':p1', $key[1], PDO::PARAM_STR);
-            $stmt->execute();
-        } catch (Exception $e) {
-            Propel::log($e->getMessage(), Propel::LOG_ERR);
-            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
-        }
-        $obj = null;
-        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
-            $obj = new ChildGroupI18n();
-            $obj->hydrate($row);
-            GroupI18nTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1])));
-        }
-        $stmt->closeCursor();
-
-        return $obj;
-    }
-
-    /**
-     * Find object by primary key.
-     *
-     * @param     mixed $key Primary key to use for the query
-     * @param     ConnectionInterface $con A connection object
-     *
-     * @return ChildGroupI18n|array|mixed the result, formatted by the current formatter
-     */
-    protected function findPkComplex($key, $con)
-    {
-        // As the query uses a PK condition, no limit(1) is necessary.
-        $criteria = $this->isKeepQuery() ? clone $this : $this;
-        $dataFetcher = $criteria
-            ->filterByPrimaryKey($key)
-            ->doSelect($con);
-
-        return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
-    }
-
-    /**
-     * Find objects by primary key
-     * <code>
-     * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con);
-     * </code>
-     * @param     array $keys Primary keys to use for the query
-     * @param     ConnectionInterface $con an optional connection object
-     *
-     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
-     */
-    public function findPks($keys, $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
-        }
-        $this->basePreSelect($con);
-        $criteria = $this->isKeepQuery() ? clone $this : $this;
-        $dataFetcher = $criteria
-            ->filterByPrimaryKeys($keys)
-            ->doSelect($con);
-
-        return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
-    }
-
-    /**
-     * Filter the query by primary key
-     *
-     * @param     mixed $key Primary key to use for the query
-     *
-     * @return ChildGroupI18nQuery The current query, for fluid interface
-     */
-    public function filterByPrimaryKey($key)
-    {
-        $this->addUsingAlias(GroupI18nTableMap::ID, $key[0], Criteria::EQUAL);
-        $this->addUsingAlias(GroupI18nTableMap::LOCALE, $key[1], Criteria::EQUAL);
-
-        return $this;
-    }
-
-    /**
-     * Filter the query by a list of primary keys
-     *
-     * @param     array $keys The list of primary key to use for the query
-     *
-     * @return ChildGroupI18nQuery The current query, for fluid interface
-     */
-    public function filterByPrimaryKeys($keys)
-    {
-        if (empty($keys)) {
-            return $this->add(null, '1<>1', Criteria::CUSTOM);
-        }
-        foreach ($keys as $key) {
-            $cton0 = $this->getNewCriterion(GroupI18nTableMap::ID, $key[0], Criteria::EQUAL);
-            $cton1 = $this->getNewCriterion(GroupI18nTableMap::LOCALE, $key[1], Criteria::EQUAL);
-            $cton0->addAnd($cton1);
-            $this->addOr($cton0);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Filter the query on the id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterById(1234); // WHERE id = 1234
-     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
-     * $query->filterById(array('min' => 12)); // WHERE id > 12
-     * </code>
-     *
-     * @see       filterByGroup()
-     *
-     * @param     mixed $id The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupI18nQuery The current query, for fluid interface
-     */
-    public function filterById($id = null, $comparison = null)
-    {
-        if (is_array($id)) {
-            $useMinMax = false;
-            if (isset($id['min'])) {
-                $this->addUsingAlias(GroupI18nTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($id['max'])) {
-                $this->addUsingAlias(GroupI18nTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupI18nTableMap::ID, $id, $comparison);
-    }
-
-    /**
-     * Filter the query on the locale column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByLocale('fooValue');   // WHERE locale = 'fooValue'
-     * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $locale The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupI18nQuery The current query, for fluid interface
-     */
-    public function filterByLocale($locale = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($locale)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $locale)) {
-                $locale = str_replace('*', '%', $locale);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(GroupI18nTableMap::LOCALE, $locale, $comparison);
-    }
-
-    /**
-     * Filter the query on the title column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByTitle('fooValue');   // WHERE title = 'fooValue'
-     * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $title The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupI18nQuery The current query, for fluid interface
-     */
-    public function filterByTitle($title = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($title)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $title)) {
-                $title = str_replace('*', '%', $title);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(GroupI18nTableMap::TITLE, $title, $comparison);
-    }
-
-    /**
-     * Filter the query on the description column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByDescription('fooValue');   // WHERE description = 'fooValue'
-     * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $description The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupI18nQuery The current query, for fluid interface
-     */
-    public function filterByDescription($description = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($description)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $description)) {
-                $description = str_replace('*', '%', $description);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(GroupI18nTableMap::DESCRIPTION, $description, $comparison);
-    }
-
-    /**
-     * Filter the query on the chapo column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByChapo('fooValue');   // WHERE chapo = 'fooValue'
-     * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $chapo The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupI18nQuery The current query, for fluid interface
-     */
-    public function filterByChapo($chapo = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($chapo)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $chapo)) {
-                $chapo = str_replace('*', '%', $chapo);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(GroupI18nTableMap::CHAPO, $chapo, $comparison);
-    }
-
-    /**
-     * Filter the query on the postscriptum column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByPostscriptum('fooValue');   // WHERE postscriptum = 'fooValue'
-     * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $postscriptum The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupI18nQuery The current query, for fluid interface
-     */
-    public function filterByPostscriptum($postscriptum = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($postscriptum)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $postscriptum)) {
-                $postscriptum = str_replace('*', '%', $postscriptum);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(GroupI18nTableMap::POSTSCRIPTUM, $postscriptum, $comparison);
-    }
-
-    /**
-     * Filter the query by a related \Thelia\Model\Group object
-     *
-     * @param \Thelia\Model\Group|ObjectCollection $group The related object(s) to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupI18nQuery The current query, for fluid interface
-     */
-    public function filterByGroup($group, $comparison = null)
-    {
-        if ($group instanceof \Thelia\Model\Group) {
-            return $this
-                ->addUsingAlias(GroupI18nTableMap::ID, $group->getId(), $comparison);
-        } elseif ($group instanceof ObjectCollection) {
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-
-            return $this
-                ->addUsingAlias(GroupI18nTableMap::ID, $group->toKeyValue('PrimaryKey', 'Id'), $comparison);
-        } else {
-            throw new PropelException('filterByGroup() only accepts arguments of type \Thelia\Model\Group or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the Group relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildGroupI18nQuery The current query, for fluid interface
-     */
-    public function joinGroup($relationAlias = null, $joinType = 'LEFT JOIN')
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('Group');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'Group');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the Group relation Group object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\GroupQuery A secondary query class using the current class as primary query
-     */
-    public function useGroupQuery($relationAlias = null, $joinType = 'LEFT JOIN')
-    {
-        return $this
-            ->joinGroup($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'Group', '\Thelia\Model\GroupQuery');
-    }
-
-    /**
-     * Exclude object from result
-     *
-     * @param   ChildGroupI18n $groupI18n Object to remove from the list of results
-     *
-     * @return ChildGroupI18nQuery The current query, for fluid interface
-     */
-    public function prune($groupI18n = null)
-    {
-        if ($groupI18n) {
-            $this->addCond('pruneCond0', $this->getAliasedColName(GroupI18nTableMap::ID), $groupI18n->getId(), Criteria::NOT_EQUAL);
-            $this->addCond('pruneCond1', $this->getAliasedColName(GroupI18nTableMap::LOCALE), $groupI18n->getLocale(), Criteria::NOT_EQUAL);
-            $this->combine(array('pruneCond0', 'pruneCond1'), Criteria::LOGICAL_OR);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Deletes all rows from the group_i18n table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public function doDeleteAll(ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupI18nTableMap::DATABASE_NAME);
-        }
-        $affectedRows = 0; // initialize var to track total num of affected rows
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table or we could emulating ON DELETE CASCADE, etc.
-            $con->beginTransaction();
-            $affectedRows += parent::doDeleteAll($con);
-            // Because this db requires some delete cascade/set null emulation, we have to
-            // clear the cached instance *after* the emulation has happened (since
-            // instances get re-added by the select statement contained therein).
-            GroupI18nTableMap::clearInstancePool();
-            GroupI18nTableMap::clearRelatedInstancePool();
-
-            $con->commit();
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-
-        return $affectedRows;
-    }
-
-    /**
-     * Performs a DELETE on the database, given a ChildGroupI18n or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or ChildGroupI18n object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-     public function delete(ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupI18nTableMap::DATABASE_NAME);
-        }
-
-        $criteria = $this;
-
-        // Set the correct dbName
-        $criteria->setDbName(GroupI18nTableMap::DATABASE_NAME);
-
-        $affectedRows = 0; // initialize var to track total num of affected rows
-
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table or we could emulating ON DELETE CASCADE, etc.
-            $con->beginTransaction();
-
-
-        GroupI18nTableMap::removeInstanceFromPool($criteria);
-
-            $affectedRows += ModelCriteria::delete($con);
-            GroupI18nTableMap::clearRelatedInstancePool();
-            $con->commit();
-
-            return $affectedRows;
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-    }
-
-} // GroupI18nQuery

core/lib/Thelia/Model/Base/GroupModuleQuery.php

@@ -1,804 +0,0 @@
-<?php
-
-namespace Thelia\Model\Base;
-
-use \Exception;
-use \PDO;
-use Propel\Runtime\Propel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\ModelCriteria;
-use Propel\Runtime\ActiveQuery\ModelJoin;
-use Propel\Runtime\Collection\Collection;
-use Propel\Runtime\Collection\ObjectCollection;
-use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Exception\PropelException;
-use Thelia\Model\GroupModule as ChildGroupModule;
-use Thelia\Model\GroupModuleQuery as ChildGroupModuleQuery;
-use Thelia\Model\Map\GroupModuleTableMap;
-
-/**
- * Base class that represents a query for the 'group_module' table.
- *
- *
- *
- * @method     ChildGroupModuleQuery orderById($order = Criteria::ASC) Order by the id column
- * @method     ChildGroupModuleQuery orderByGroupId($order = Criteria::ASC) Order by the group_id column
- * @method     ChildGroupModuleQuery orderByModuleId($order = Criteria::ASC) Order by the module_id column
- * @method     ChildGroupModuleQuery orderByAccess($order = Criteria::ASC) Order by the access column
- * @method     ChildGroupModuleQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
- * @method     ChildGroupModuleQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
- *
- * @method     ChildGroupModuleQuery groupById() Group by the id column
- * @method     ChildGroupModuleQuery groupByGroupId() Group by the group_id column
- * @method     ChildGroupModuleQuery groupByModuleId() Group by the module_id column
- * @method     ChildGroupModuleQuery groupByAccess() Group by the access column
- * @method     ChildGroupModuleQuery groupByCreatedAt() Group by the created_at column
- * @method     ChildGroupModuleQuery groupByUpdatedAt() Group by the updated_at column
- *
- * @method     ChildGroupModuleQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
- * @method     ChildGroupModuleQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
- * @method     ChildGroupModuleQuery innerJoin($relation) Adds a INNER JOIN clause to the query
- *
- * @method     ChildGroupModuleQuery leftJoinGroup($relationAlias = null) Adds a LEFT JOIN clause to the query using the Group relation
- * @method     ChildGroupModuleQuery rightJoinGroup($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Group relation
- * @method     ChildGroupModuleQuery innerJoinGroup($relationAlias = null) Adds a INNER JOIN clause to the query using the Group relation
- *
- * @method     ChildGroupModuleQuery leftJoinModule($relationAlias = null) Adds a LEFT JOIN clause to the query using the Module relation
- * @method     ChildGroupModuleQuery rightJoinModule($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Module relation
- * @method     ChildGroupModuleQuery innerJoinModule($relationAlias = null) Adds a INNER JOIN clause to the query using the Module relation
- *
- * @method     ChildGroupModule findOne(ConnectionInterface $con = null) Return the first ChildGroupModule matching the query
- * @method     ChildGroupModule findOneOrCreate(ConnectionInterface $con = null) Return the first ChildGroupModule matching the query, or a new ChildGroupModule object populated from the query conditions when no match is found
- *
- * @method     ChildGroupModule findOneById(int $id) Return the first ChildGroupModule filtered by the id column
- * @method     ChildGroupModule findOneByGroupId(int $group_id) Return the first ChildGroupModule filtered by the group_id column
- * @method     ChildGroupModule findOneByModuleId(int $module_id) Return the first ChildGroupModule filtered by the module_id column
- * @method     ChildGroupModule findOneByAccess(int $access) Return the first ChildGroupModule filtered by the access column
- * @method     ChildGroupModule findOneByCreatedAt(string $created_at) Return the first ChildGroupModule filtered by the created_at column
- * @method     ChildGroupModule findOneByUpdatedAt(string $updated_at) Return the first ChildGroupModule filtered by the updated_at column
- *
- * @method     array findById(int $id) Return ChildGroupModule objects filtered by the id column
- * @method     array findByGroupId(int $group_id) Return ChildGroupModule objects filtered by the group_id column
- * @method     array findByModuleId(int $module_id) Return ChildGroupModule objects filtered by the module_id column
- * @method     array findByAccess(int $access) Return ChildGroupModule objects filtered by the access column
- * @method     array findByCreatedAt(string $created_at) Return ChildGroupModule objects filtered by the created_at column
- * @method     array findByUpdatedAt(string $updated_at) Return ChildGroupModule objects filtered by the updated_at column
- *
- */
-abstract class GroupModuleQuery extends ModelCriteria
-{
-
-    /**
-     * Initializes internal state of \Thelia\Model\Base\GroupModuleQuery object.
-     *
-     * @param     string $dbName The database name
-     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
-     */
-    public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\GroupModule', $modelAlias = null)
-    {
-        parent::__construct($dbName, $modelName, $modelAlias);
-    }
-
-    /**
-     * Returns a new ChildGroupModuleQuery object.
-     *
-     * @param     string $modelAlias The alias of a model in the query
-     * @param     Criteria $criteria Optional Criteria to build the query from
-     *
-     * @return ChildGroupModuleQuery
-     */
-    public static function create($modelAlias = null, $criteria = null)
-    {
-        if ($criteria instanceof \Thelia\Model\GroupModuleQuery) {
-            return $criteria;
-        }
-        $query = new \Thelia\Model\GroupModuleQuery();
-        if (null !== $modelAlias) {
-            $query->setModelAlias($modelAlias);
-        }
-        if ($criteria instanceof Criteria) {
-            $query->mergeWith($criteria);
-        }
-
-        return $query;
-    }
-
-    /**
-     * Find object by primary key.
-     * Propel uses the instance pool to skip the database if the object exists.
-     * Go fast if the query is untouched.
-     *
-     * <code>
-     * $obj  = $c->findPk(12, $con);
-     * </code>
-     *
-     * @param mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con an optional connection object
-     *
-     * @return ChildGroupModule|array|mixed the result, formatted by the current formatter
-     */
-    public function findPk($key, $con = null)
-    {
-        if ($key === null) {
-            return null;
-        }
-        if ((null !== ($obj = GroupModuleTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
-            // the object is already in the instance pool
-            return $obj;
-        }
-        if ($con === null) {
-            $con = Propel::getServiceContainer()->getReadConnection(GroupModuleTableMap::DATABASE_NAME);
-        }
-        $this->basePreSelect($con);
-        if ($this->formatter || $this->modelAlias || $this->with || $this->select
-         || $this->selectColumns || $this->asColumns || $this->selectModifiers
-         || $this->map || $this->having || $this->joins) {
-            return $this->findPkComplex($key, $con);
-        } else {
-            return $this->findPkSimple($key, $con);
-        }
-    }
-
-    /**
-     * Find object by primary key using raw SQL to go fast.
-     * Bypass doSelect() and the object formatter by using generated code.
-     *
-     * @param     mixed $key Primary key to use for the query
-     * @param     ConnectionInterface $con A connection object
-     *
-     * @return   ChildGroupModule A model object, or null if the key is not found
-     */
-    protected function findPkSimple($key, $con)
-    {
-        $sql = 'SELECT ID, GROUP_ID, MODULE_ID, ACCESS, CREATED_AT, UPDATED_AT FROM group_module WHERE ID = :p0';
-        try {
-            $stmt = $con->prepare($sql);
-            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
-            $stmt->execute();
-        } catch (Exception $e) {
-            Propel::log($e->getMessage(), Propel::LOG_ERR);
-            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
-        }
-        $obj = null;
-        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
-            $obj = new ChildGroupModule();
-            $obj->hydrate($row);
-            GroupModuleTableMap::addInstanceToPool($obj, (string) $key);
-        }
-        $stmt->closeCursor();
-
-        return $obj;
-    }
-
-    /**
-     * Find object by primary key.
-     *
-     * @param     mixed $key Primary key to use for the query
-     * @param     ConnectionInterface $con A connection object
-     *
-     * @return ChildGroupModule|array|mixed the result, formatted by the current formatter
-     */
-    protected function findPkComplex($key, $con)
-    {
-        // As the query uses a PK condition, no limit(1) is necessary.
-        $criteria = $this->isKeepQuery() ? clone $this : $this;
-        $dataFetcher = $criteria
-            ->filterByPrimaryKey($key)
-            ->doSelect($con);
-
-        return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
-    }
-
-    /**
-     * Find objects by primary key
-     * <code>
-     * $objs = $c->findPks(array(12, 56, 832), $con);
-     * </code>
-     * @param     array $keys Primary keys to use for the query
-     * @param     ConnectionInterface $con an optional connection object
-     *
-     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
-     */
-    public function findPks($keys, $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
-        }
-        $this->basePreSelect($con);
-        $criteria = $this->isKeepQuery() ? clone $this : $this;
-        $dataFetcher = $criteria
-            ->filterByPrimaryKeys($keys)
-            ->doSelect($con);
-
-        return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
-    }
-
-    /**
-     * Filter the query by primary key
-     *
-     * @param     mixed $key Primary key to use for the query
-     *
-     * @return ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function filterByPrimaryKey($key)
-    {
-
-        return $this->addUsingAlias(GroupModuleTableMap::ID, $key, Criteria::EQUAL);
-    }
-
-    /**
-     * Filter the query by a list of primary keys
-     *
-     * @param     array $keys The list of primary key to use for the query
-     *
-     * @return ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function filterByPrimaryKeys($keys)
-    {
-
-        return $this->addUsingAlias(GroupModuleTableMap::ID, $keys, Criteria::IN);
-    }
-
-    /**
-     * Filter the query on the id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterById(1234); // WHERE id = 1234
-     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
-     * $query->filterById(array('min' => 12)); // WHERE id > 12
-     * </code>
-     *
-     * @param     mixed $id The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function filterById($id = null, $comparison = null)
-    {
-        if (is_array($id)) {
-            $useMinMax = false;
-            if (isset($id['min'])) {
-                $this->addUsingAlias(GroupModuleTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($id['max'])) {
-                $this->addUsingAlias(GroupModuleTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupModuleTableMap::ID, $id, $comparison);
-    }
-
-    /**
-     * Filter the query on the group_id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByGroupId(1234); // WHERE group_id = 1234
-     * $query->filterByGroupId(array(12, 34)); // WHERE group_id IN (12, 34)
-     * $query->filterByGroupId(array('min' => 12)); // WHERE group_id > 12
-     * </code>
-     *
-     * @see       filterByGroup()
-     *
-     * @param     mixed $groupId The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function filterByGroupId($groupId = null, $comparison = null)
-    {
-        if (is_array($groupId)) {
-            $useMinMax = false;
-            if (isset($groupId['min'])) {
-                $this->addUsingAlias(GroupModuleTableMap::GROUP_ID, $groupId['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($groupId['max'])) {
-                $this->addUsingAlias(GroupModuleTableMap::GROUP_ID, $groupId['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupModuleTableMap::GROUP_ID, $groupId, $comparison);
-    }
-
-    /**
-     * Filter the query on the module_id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByModuleId(1234); // WHERE module_id = 1234
-     * $query->filterByModuleId(array(12, 34)); // WHERE module_id IN (12, 34)
-     * $query->filterByModuleId(array('min' => 12)); // WHERE module_id > 12
-     * </code>
-     *
-     * @see       filterByModule()
-     *
-     * @param     mixed $moduleId The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function filterByModuleId($moduleId = null, $comparison = null)
-    {
-        if (is_array($moduleId)) {
-            $useMinMax = false;
-            if (isset($moduleId['min'])) {
-                $this->addUsingAlias(GroupModuleTableMap::MODULE_ID, $moduleId['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($moduleId['max'])) {
-                $this->addUsingAlias(GroupModuleTableMap::MODULE_ID, $moduleId['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupModuleTableMap::MODULE_ID, $moduleId, $comparison);
-    }
-
-    /**
-     * Filter the query on the access column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByAccess(1234); // WHERE access = 1234
-     * $query->filterByAccess(array(12, 34)); // WHERE access IN (12, 34)
-     * $query->filterByAccess(array('min' => 12)); // WHERE access > 12
-     * </code>
-     *
-     * @param     mixed $access The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function filterByAccess($access = null, $comparison = null)
-    {
-        if (is_array($access)) {
-            $useMinMax = false;
-            if (isset($access['min'])) {
-                $this->addUsingAlias(GroupModuleTableMap::ACCESS, $access['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($access['max'])) {
-                $this->addUsingAlias(GroupModuleTableMap::ACCESS, $access['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupModuleTableMap::ACCESS, $access, $comparison);
-    }
-
-    /**
-     * Filter the query on the created_at column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
-     * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
-     * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
-     * </code>
-     *
-     * @param     mixed $createdAt The value to use as filter.
-     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *              Empty strings are treated as NULL.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function filterByCreatedAt($createdAt = null, $comparison = null)
-    {
-        if (is_array($createdAt)) {
-            $useMinMax = false;
-            if (isset($createdAt['min'])) {
-                $this->addUsingAlias(GroupModuleTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($createdAt['max'])) {
-                $this->addUsingAlias(GroupModuleTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupModuleTableMap::CREATED_AT, $createdAt, $comparison);
-    }
-
-    /**
-     * Filter the query on the updated_at column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
-     * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
-     * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
-     * </code>
-     *
-     * @param     mixed $updatedAt The value to use as filter.
-     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *              Empty strings are treated as NULL.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function filterByUpdatedAt($updatedAt = null, $comparison = null)
-    {
-        if (is_array($updatedAt)) {
-            $useMinMax = false;
-            if (isset($updatedAt['min'])) {
-                $this->addUsingAlias(GroupModuleTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($updatedAt['max'])) {
-                $this->addUsingAlias(GroupModuleTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupModuleTableMap::UPDATED_AT, $updatedAt, $comparison);
-    }
-
-    /**
-     * Filter the query by a related \Thelia\Model\Group object
-     *
-     * @param \Thelia\Model\Group|ObjectCollection $group The related object(s) to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function filterByGroup($group, $comparison = null)
-    {
-        if ($group instanceof \Thelia\Model\Group) {
-            return $this
-                ->addUsingAlias(GroupModuleTableMap::GROUP_ID, $group->getId(), $comparison);
-        } elseif ($group instanceof ObjectCollection) {
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-
-            return $this
-                ->addUsingAlias(GroupModuleTableMap::GROUP_ID, $group->toKeyValue('PrimaryKey', 'Id'), $comparison);
-        } else {
-            throw new PropelException('filterByGroup() only accepts arguments of type \Thelia\Model\Group or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the Group relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function joinGroup($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('Group');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'Group');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the Group relation Group object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\GroupQuery A secondary query class using the current class as primary query
-     */
-    public function useGroupQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        return $this
-            ->joinGroup($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'Group', '\Thelia\Model\GroupQuery');
-    }
-
-    /**
-     * Filter the query by a related \Thelia\Model\Module object
-     *
-     * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function filterByModule($module, $comparison = null)
-    {
-        if ($module instanceof \Thelia\Model\Module) {
-            return $this
-                ->addUsingAlias(GroupModuleTableMap::MODULE_ID, $module->getId(), $comparison);
-        } elseif ($module instanceof ObjectCollection) {
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-
-            return $this
-                ->addUsingAlias(GroupModuleTableMap::MODULE_ID, $module->toKeyValue('PrimaryKey', 'Id'), $comparison);
-        } else {
-            throw new PropelException('filterByModule() only accepts arguments of type \Thelia\Model\Module or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the Module relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function joinModule($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('Module');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'Module');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the Module relation Module object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query
-     */
-    public function useModuleQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
-    {
-        return $this
-            ->joinModule($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'Module', '\Thelia\Model\ModuleQuery');
-    }
-
-    /**
-     * Exclude object from result
-     *
-     * @param   ChildGroupModule $groupModule Object to remove from the list of results
-     *
-     * @return ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function prune($groupModule = null)
-    {
-        if ($groupModule) {
-            $this->addUsingAlias(GroupModuleTableMap::ID, $groupModule->getId(), Criteria::NOT_EQUAL);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Deletes all rows from the group_module table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public function doDeleteAll(ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupModuleTableMap::DATABASE_NAME);
-        }
-        $affectedRows = 0; // initialize var to track total num of affected rows
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table or we could emulating ON DELETE CASCADE, etc.
-            $con->beginTransaction();
-            $affectedRows += parent::doDeleteAll($con);
-            // Because this db requires some delete cascade/set null emulation, we have to
-            // clear the cached instance *after* the emulation has happened (since
-            // instances get re-added by the select statement contained therein).
-            GroupModuleTableMap::clearInstancePool();
-            GroupModuleTableMap::clearRelatedInstancePool();
-
-            $con->commit();
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-
-        return $affectedRows;
-    }
-
-    /**
-     * Performs a DELETE on the database, given a ChildGroupModule or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or ChildGroupModule object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-     public function delete(ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupModuleTableMap::DATABASE_NAME);
-        }
-
-        $criteria = $this;
-
-        // Set the correct dbName
-        $criteria->setDbName(GroupModuleTableMap::DATABASE_NAME);
-
-        $affectedRows = 0; // initialize var to track total num of affected rows
-
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table or we could emulating ON DELETE CASCADE, etc.
-            $con->beginTransaction();
-
-
-        GroupModuleTableMap::removeInstanceFromPool($criteria);
-
-            $affectedRows += ModelCriteria::delete($con);
-            GroupModuleTableMap::clearRelatedInstancePool();
-            $con->commit();
-
-            return $affectedRows;
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-    }
-
-    // timestampable behavior
-
-    /**
-     * Filter by the latest updated
-     *
-     * @param      int $nbDays Maximum age of the latest update in days
-     *
-     * @return     ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function recentlyUpdated($nbDays = 7)
-    {
-        return $this->addUsingAlias(GroupModuleTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
-    }
-
-    /**
-     * Filter by the latest created
-     *
-     * @param      int $nbDays Maximum age of in days
-     *
-     * @return     ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function recentlyCreated($nbDays = 7)
-    {
-        return $this->addUsingAlias(GroupModuleTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
-    }
-
-    /**
-     * Order by update date desc
-     *
-     * @return     ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function lastUpdatedFirst()
-    {
-        return $this->addDescendingOrderByColumn(GroupModuleTableMap::UPDATED_AT);
-    }
-
-    /**
-     * Order by update date asc
-     *
-     * @return     ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function firstUpdatedFirst()
-    {
-        return $this->addAscendingOrderByColumn(GroupModuleTableMap::UPDATED_AT);
-    }
-
-    /**
-     * Order by create date desc
-     *
-     * @return     ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function lastCreatedFirst()
-    {
-        return $this->addDescendingOrderByColumn(GroupModuleTableMap::CREATED_AT);
-    }
-
-    /**
-     * Order by create date asc
-     *
-     * @return     ChildGroupModuleQuery The current query, for fluid interface
-     */
-    public function firstCreatedFirst()
-    {
-        return $this->addAscendingOrderByColumn(GroupModuleTableMap::CREATED_AT);
-    }
-
-} // GroupModuleQuery

core/lib/Thelia/Model/Base/GroupQuery.php

@@ -1,940 +0,0 @@
-<?php
-
-namespace Thelia\Model\Base;
-
-use \Exception;
-use \PDO;
-use Propel\Runtime\Propel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\ModelCriteria;
-use Propel\Runtime\ActiveQuery\ModelJoin;
-use Propel\Runtime\Collection\Collection;
-use Propel\Runtime\Collection\ObjectCollection;
-use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Exception\PropelException;
-use Thelia\Model\Group as ChildGroup;
-use Thelia\Model\GroupI18nQuery as ChildGroupI18nQuery;
-use Thelia\Model\GroupQuery as ChildGroupQuery;
-use Thelia\Model\Map\GroupTableMap;
-
-/**
- * Base class that represents a query for the 'group' table.
- *
- *
- *
- * @method     ChildGroupQuery orderById($order = Criteria::ASC) Order by the id column
- * @method     ChildGroupQuery orderByCode($order = Criteria::ASC) Order by the code column
- * @method     ChildGroupQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
- * @method     ChildGroupQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
- *
- * @method     ChildGroupQuery groupById() Group by the id column
- * @method     ChildGroupQuery groupByCode() Group by the code column
- * @method     ChildGroupQuery groupByCreatedAt() Group by the created_at column
- * @method     ChildGroupQuery groupByUpdatedAt() Group by the updated_at column
- *
- * @method     ChildGroupQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
- * @method     ChildGroupQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
- * @method     ChildGroupQuery innerJoin($relation) Adds a INNER JOIN clause to the query
- *
- * @method     ChildGroupQuery leftJoinAdminGroup($relationAlias = null) Adds a LEFT JOIN clause to the query using the AdminGroup relation
- * @method     ChildGroupQuery rightJoinAdminGroup($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AdminGroup relation
- * @method     ChildGroupQuery innerJoinAdminGroup($relationAlias = null) Adds a INNER JOIN clause to the query using the AdminGroup relation
- *
- * @method     ChildGroupQuery leftJoinGroupResource($relationAlias = null) Adds a LEFT JOIN clause to the query using the GroupResource relation
- * @method     ChildGroupQuery rightJoinGroupResource($relationAlias = null) Adds a RIGHT JOIN clause to the query using the GroupResource relation
- * @method     ChildGroupQuery innerJoinGroupResource($relationAlias = null) Adds a INNER JOIN clause to the query using the GroupResource relation
- *
- * @method     ChildGroupQuery leftJoinGroupModule($relationAlias = null) Adds a LEFT JOIN clause to the query using the GroupModule relation
- * @method     ChildGroupQuery rightJoinGroupModule($relationAlias = null) Adds a RIGHT JOIN clause to the query using the GroupModule relation
- * @method     ChildGroupQuery innerJoinGroupModule($relationAlias = null) Adds a INNER JOIN clause to the query using the GroupModule relation
- *
- * @method     ChildGroupQuery leftJoinGroupI18n($relationAlias = null) Adds a LEFT JOIN clause to the query using the GroupI18n relation
- * @method     ChildGroupQuery rightJoinGroupI18n($relationAlias = null) Adds a RIGHT JOIN clause to the query using the GroupI18n relation
- * @method     ChildGroupQuery innerJoinGroupI18n($relationAlias = null) Adds a INNER JOIN clause to the query using the GroupI18n relation
- *
- * @method     ChildGroup findOne(ConnectionInterface $con = null) Return the first ChildGroup matching the query
- * @method     ChildGroup findOneOrCreate(ConnectionInterface $con = null) Return the first ChildGroup matching the query, or a new ChildGroup object populated from the query conditions when no match is found
- *
- * @method     ChildGroup findOneById(int $id) Return the first ChildGroup filtered by the id column
- * @method     ChildGroup findOneByCode(string $code) Return the first ChildGroup filtered by the code column
- * @method     ChildGroup findOneByCreatedAt(string $created_at) Return the first ChildGroup filtered by the created_at column
- * @method     ChildGroup findOneByUpdatedAt(string $updated_at) Return the first ChildGroup filtered by the updated_at column
- *
- * @method     array findById(int $id) Return ChildGroup objects filtered by the id column
- * @method     array findByCode(string $code) Return ChildGroup objects filtered by the code column
- * @method     array findByCreatedAt(string $created_at) Return ChildGroup objects filtered by the created_at column
- * @method     array findByUpdatedAt(string $updated_at) Return ChildGroup objects filtered by the updated_at column
- *
- */
-abstract class GroupQuery extends ModelCriteria
-{
-
-    /**
-     * Initializes internal state of \Thelia\Model\Base\GroupQuery object.
-     *
-     * @param     string $dbName The database name
-     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
-     */
-    public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Group', $modelAlias = null)
-    {
-        parent::__construct($dbName, $modelName, $modelAlias);
-    }
-
-    /**
-     * Returns a new ChildGroupQuery object.
-     *
-     * @param     string $modelAlias The alias of a model in the query
-     * @param     Criteria $criteria Optional Criteria to build the query from
-     *
-     * @return ChildGroupQuery
-     */
-    public static function create($modelAlias = null, $criteria = null)
-    {
-        if ($criteria instanceof \Thelia\Model\GroupQuery) {
-            return $criteria;
-        }
-        $query = new \Thelia\Model\GroupQuery();
-        if (null !== $modelAlias) {
-            $query->setModelAlias($modelAlias);
-        }
-        if ($criteria instanceof Criteria) {
-            $query->mergeWith($criteria);
-        }
-
-        return $query;
-    }
-
-    /**
-     * Find object by primary key.
-     * Propel uses the instance pool to skip the database if the object exists.
-     * Go fast if the query is untouched.
-     *
-     * <code>
-     * $obj  = $c->findPk(12, $con);
-     * </code>
-     *
-     * @param mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con an optional connection object
-     *
-     * @return ChildGroup|array|mixed the result, formatted by the current formatter
-     */
-    public function findPk($key, $con = null)
-    {
-        if ($key === null) {
-            return null;
-        }
-        if ((null !== ($obj = GroupTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
-            // the object is already in the instance pool
-            return $obj;
-        }
-        if ($con === null) {
-            $con = Propel::getServiceContainer()->getReadConnection(GroupTableMap::DATABASE_NAME);
-        }
-        $this->basePreSelect($con);
-        if ($this->formatter || $this->modelAlias || $this->with || $this->select
-         || $this->selectColumns || $this->asColumns || $this->selectModifiers
-         || $this->map || $this->having || $this->joins) {
-            return $this->findPkComplex($key, $con);
-        } else {
-            return $this->findPkSimple($key, $con);
-        }
-    }
-
-    /**
-     * Find object by primary key using raw SQL to go fast.
-     * Bypass doSelect() and the object formatter by using generated code.
-     *
-     * @param     mixed $key Primary key to use for the query
-     * @param     ConnectionInterface $con A connection object
-     *
-     * @return   ChildGroup A model object, or null if the key is not found
-     */
-    protected function findPkSimple($key, $con)
-    {
-        $sql = 'SELECT ID, CODE, CREATED_AT, UPDATED_AT FROM group WHERE ID = :p0';
-        try {
-            $stmt = $con->prepare($sql);
-            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
-            $stmt->execute();
-        } catch (Exception $e) {
-            Propel::log($e->getMessage(), Propel::LOG_ERR);
-            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
-        }
-        $obj = null;
-        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
-            $obj = new ChildGroup();
-            $obj->hydrate($row);
-            GroupTableMap::addInstanceToPool($obj, (string) $key);
-        }
-        $stmt->closeCursor();
-
-        return $obj;
-    }
-
-    /**
-     * Find object by primary key.
-     *
-     * @param     mixed $key Primary key to use for the query
-     * @param     ConnectionInterface $con A connection object
-     *
-     * @return ChildGroup|array|mixed the result, formatted by the current formatter
-     */
-    protected function findPkComplex($key, $con)
-    {
-        // As the query uses a PK condition, no limit(1) is necessary.
-        $criteria = $this->isKeepQuery() ? clone $this : $this;
-        $dataFetcher = $criteria
-            ->filterByPrimaryKey($key)
-            ->doSelect($con);
-
-        return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
-    }
-
-    /**
-     * Find objects by primary key
-     * <code>
-     * $objs = $c->findPks(array(12, 56, 832), $con);
-     * </code>
-     * @param     array $keys Primary keys to use for the query
-     * @param     ConnectionInterface $con an optional connection object
-     *
-     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
-     */
-    public function findPks($keys, $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
-        }
-        $this->basePreSelect($con);
-        $criteria = $this->isKeepQuery() ? clone $this : $this;
-        $dataFetcher = $criteria
-            ->filterByPrimaryKeys($keys)
-            ->doSelect($con);
-
-        return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
-    }
-
-    /**
-     * Filter the query by primary key
-     *
-     * @param     mixed $key Primary key to use for the query
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function filterByPrimaryKey($key)
-    {
-
-        return $this->addUsingAlias(GroupTableMap::ID, $key, Criteria::EQUAL);
-    }
-
-    /**
-     * Filter the query by a list of primary keys
-     *
-     * @param     array $keys The list of primary key to use for the query
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function filterByPrimaryKeys($keys)
-    {
-
-        return $this->addUsingAlias(GroupTableMap::ID, $keys, Criteria::IN);
-    }
-
-    /**
-     * Filter the query on the id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterById(1234); // WHERE id = 1234
-     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
-     * $query->filterById(array('min' => 12)); // WHERE id > 12
-     * </code>
-     *
-     * @param     mixed $id The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function filterById($id = null, $comparison = null)
-    {
-        if (is_array($id)) {
-            $useMinMax = false;
-            if (isset($id['min'])) {
-                $this->addUsingAlias(GroupTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($id['max'])) {
-                $this->addUsingAlias(GroupTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupTableMap::ID, $id, $comparison);
-    }
-
-    /**
-     * Filter the query on the code column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByCode('fooValue');   // WHERE code = 'fooValue'
-     * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%'
-     * </code>
-     *
-     * @param     string $code The value to use as filter.
-     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function filterByCode($code = null, $comparison = null)
-    {
-        if (null === $comparison) {
-            if (is_array($code)) {
-                $comparison = Criteria::IN;
-            } elseif (preg_match('/[\%\*]/', $code)) {
-                $code = str_replace('*', '%', $code);
-                $comparison = Criteria::LIKE;
-            }
-        }
-
-        return $this->addUsingAlias(GroupTableMap::CODE, $code, $comparison);
-    }
-
-    /**
-     * Filter the query on the created_at column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
-     * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
-     * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
-     * </code>
-     *
-     * @param     mixed $createdAt The value to use as filter.
-     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *              Empty strings are treated as NULL.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function filterByCreatedAt($createdAt = null, $comparison = null)
-    {
-        if (is_array($createdAt)) {
-            $useMinMax = false;
-            if (isset($createdAt['min'])) {
-                $this->addUsingAlias(GroupTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($createdAt['max'])) {
-                $this->addUsingAlias(GroupTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupTableMap::CREATED_AT, $createdAt, $comparison);
-    }
-
-    /**
-     * Filter the query on the updated_at column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
-     * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
-     * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
-     * </code>
-     *
-     * @param     mixed $updatedAt The value to use as filter.
-     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *              Empty strings are treated as NULL.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function filterByUpdatedAt($updatedAt = null, $comparison = null)
-    {
-        if (is_array($updatedAt)) {
-            $useMinMax = false;
-            if (isset($updatedAt['min'])) {
-                $this->addUsingAlias(GroupTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($updatedAt['max'])) {
-                $this->addUsingAlias(GroupTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupTableMap::UPDATED_AT, $updatedAt, $comparison);
-    }
-
-    /**
-     * Filter the query by a related \Thelia\Model\AdminGroup object
-     *
-     * @param \Thelia\Model\AdminGroup|ObjectCollection $adminGroup  the related object to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function filterByAdminGroup($adminGroup, $comparison = null)
-    {
-        if ($adminGroup instanceof \Thelia\Model\AdminGroup) {
-            return $this
-                ->addUsingAlias(GroupTableMap::ID, $adminGroup->getGroupId(), $comparison);
-        } elseif ($adminGroup instanceof ObjectCollection) {
-            return $this
-                ->useAdminGroupQuery()
-                ->filterByPrimaryKeys($adminGroup->getPrimaryKeys())
-                ->endUse();
-        } else {
-            throw new PropelException('filterByAdminGroup() only accepts arguments of type \Thelia\Model\AdminGroup or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the AdminGroup relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function joinAdminGroup($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('AdminGroup');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'AdminGroup');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the AdminGroup relation AdminGroup object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\AdminGroupQuery A secondary query class using the current class as primary query
-     */
-    public function useAdminGroupQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        return $this
-            ->joinAdminGroup($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'AdminGroup', '\Thelia\Model\AdminGroupQuery');
-    }
-
-    /**
-     * Filter the query by a related \Thelia\Model\GroupResource object
-     *
-     * @param \Thelia\Model\GroupResource|ObjectCollection $groupResource  the related object to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function filterByGroupResource($groupResource, $comparison = null)
-    {
-        if ($groupResource instanceof \Thelia\Model\GroupResource) {
-            return $this
-                ->addUsingAlias(GroupTableMap::ID, $groupResource->getGroupId(), $comparison);
-        } elseif ($groupResource instanceof ObjectCollection) {
-            return $this
-                ->useGroupResourceQuery()
-                ->filterByPrimaryKeys($groupResource->getPrimaryKeys())
-                ->endUse();
-        } else {
-            throw new PropelException('filterByGroupResource() only accepts arguments of type \Thelia\Model\GroupResource or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the GroupResource relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function joinGroupResource($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('GroupResource');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'GroupResource');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the GroupResource relation GroupResource object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\GroupResourceQuery A secondary query class using the current class as primary query
-     */
-    public function useGroupResourceQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        return $this
-            ->joinGroupResource($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'GroupResource', '\Thelia\Model\GroupResourceQuery');
-    }
-
-    /**
-     * Filter the query by a related \Thelia\Model\GroupModule object
-     *
-     * @param \Thelia\Model\GroupModule|ObjectCollection $groupModule  the related object to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function filterByGroupModule($groupModule, $comparison = null)
-    {
-        if ($groupModule instanceof \Thelia\Model\GroupModule) {
-            return $this
-                ->addUsingAlias(GroupTableMap::ID, $groupModule->getGroupId(), $comparison);
-        } elseif ($groupModule instanceof ObjectCollection) {
-            return $this
-                ->useGroupModuleQuery()
-                ->filterByPrimaryKeys($groupModule->getPrimaryKeys())
-                ->endUse();
-        } else {
-            throw new PropelException('filterByGroupModule() only accepts arguments of type \Thelia\Model\GroupModule or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the GroupModule relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function joinGroupModule($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('GroupModule');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'GroupModule');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the GroupModule relation GroupModule object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\GroupModuleQuery A secondary query class using the current class as primary query
-     */
-    public function useGroupModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        return $this
-            ->joinGroupModule($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'GroupModule', '\Thelia\Model\GroupModuleQuery');
-    }
-
-    /**
-     * Filter the query by a related \Thelia\Model\GroupI18n object
-     *
-     * @param \Thelia\Model\GroupI18n|ObjectCollection $groupI18n  the related object to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function filterByGroupI18n($groupI18n, $comparison = null)
-    {
-        if ($groupI18n instanceof \Thelia\Model\GroupI18n) {
-            return $this
-                ->addUsingAlias(GroupTableMap::ID, $groupI18n->getId(), $comparison);
-        } elseif ($groupI18n instanceof ObjectCollection) {
-            return $this
-                ->useGroupI18nQuery()
-                ->filterByPrimaryKeys($groupI18n->getPrimaryKeys())
-                ->endUse();
-        } else {
-            throw new PropelException('filterByGroupI18n() only accepts arguments of type \Thelia\Model\GroupI18n or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the GroupI18n relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function joinGroupI18n($relationAlias = null, $joinType = 'LEFT JOIN')
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('GroupI18n');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'GroupI18n');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the GroupI18n relation GroupI18n object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\GroupI18nQuery A secondary query class using the current class as primary query
-     */
-    public function useGroupI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN')
-    {
-        return $this
-            ->joinGroupI18n($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'GroupI18n', '\Thelia\Model\GroupI18nQuery');
-    }
-
-    /**
-     * Filter the query by a related Admin object
-     * using the admin_group table as cross reference
-     *
-     * @param Admin $admin the related object to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function filterByAdmin($admin, $comparison = Criteria::EQUAL)
-    {
-        return $this
-            ->useAdminGroupQuery()
-            ->filterByAdmin($admin, $comparison)
-            ->endUse();
-    }
-
-    /**
-     * Filter the query by a related Resource object
-     * using the group_resource table as cross reference
-     *
-     * @param Resource $resource the related object to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function filterByResource($resource, $comparison = Criteria::EQUAL)
-    {
-        return $this
-            ->useGroupResourceQuery()
-            ->filterByResource($resource, $comparison)
-            ->endUse();
-    }
-
-    /**
-     * Exclude object from result
-     *
-     * @param   ChildGroup $group Object to remove from the list of results
-     *
-     * @return ChildGroupQuery The current query, for fluid interface
-     */
-    public function prune($group = null)
-    {
-        if ($group) {
-            $this->addUsingAlias(GroupTableMap::ID, $group->getId(), Criteria::NOT_EQUAL);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Deletes all rows from the group table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public function doDeleteAll(ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupTableMap::DATABASE_NAME);
-        }
-        $affectedRows = 0; // initialize var to track total num of affected rows
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table or we could emulating ON DELETE CASCADE, etc.
-            $con->beginTransaction();
-            $affectedRows += parent::doDeleteAll($con);
-            // Because this db requires some delete cascade/set null emulation, we have to
-            // clear the cached instance *after* the emulation has happened (since
-            // instances get re-added by the select statement contained therein).
-            GroupTableMap::clearInstancePool();
-            GroupTableMap::clearRelatedInstancePool();
-
-            $con->commit();
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-
-        return $affectedRows;
-    }
-
-    /**
-     * Performs a DELETE on the database, given a ChildGroup or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or ChildGroup object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-     public function delete(ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupTableMap::DATABASE_NAME);
-        }
-
-        $criteria = $this;
-
-        // Set the correct dbName
-        $criteria->setDbName(GroupTableMap::DATABASE_NAME);
-
-        $affectedRows = 0; // initialize var to track total num of affected rows
-
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table or we could emulating ON DELETE CASCADE, etc.
-            $con->beginTransaction();
-
-
-        GroupTableMap::removeInstanceFromPool($criteria);
-
-            $affectedRows += ModelCriteria::delete($con);
-            GroupTableMap::clearRelatedInstancePool();
-            $con->commit();
-
-            return $affectedRows;
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-    }
-
-    // timestampable behavior
-
-    /**
-     * Filter by the latest updated
-     *
-     * @param      int $nbDays Maximum age of the latest update in days
-     *
-     * @return     ChildGroupQuery The current query, for fluid interface
-     */
-    public function recentlyUpdated($nbDays = 7)
-    {
-        return $this->addUsingAlias(GroupTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
-    }
-
-    /**
-     * Filter by the latest created
-     *
-     * @param      int $nbDays Maximum age of in days
-     *
-     * @return     ChildGroupQuery The current query, for fluid interface
-     */
-    public function recentlyCreated($nbDays = 7)
-    {
-        return $this->addUsingAlias(GroupTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
-    }
-
-    /**
-     * Order by update date desc
-     *
-     * @return     ChildGroupQuery The current query, for fluid interface
-     */
-    public function lastUpdatedFirst()
-    {
-        return $this->addDescendingOrderByColumn(GroupTableMap::UPDATED_AT);
-    }
-
-    /**
-     * Order by update date asc
-     *
-     * @return     ChildGroupQuery The current query, for fluid interface
-     */
-    public function firstUpdatedFirst()
-    {
-        return $this->addAscendingOrderByColumn(GroupTableMap::UPDATED_AT);
-    }
-
-    /**
-     * Order by create date desc
-     *
-     * @return     ChildGroupQuery The current query, for fluid interface
-     */
-    public function lastCreatedFirst()
-    {
-        return $this->addDescendingOrderByColumn(GroupTableMap::CREATED_AT);
-    }
-
-    /**
-     * Order by create date asc
-     *
-     * @return     ChildGroupQuery The current query, for fluid interface
-     */
-    public function firstCreatedFirst()
-    {
-        return $this->addAscendingOrderByColumn(GroupTableMap::CREATED_AT);
-    }
-
-    // i18n behavior
-
-    /**
-     * Adds a JOIN clause to the query using the i18n relation
-     *
-     * @param     string $locale Locale to use for the join condition, e.g. 'fr_FR'
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
-     *
-     * @return    ChildGroupQuery The current query, for fluid interface
-     */
-    public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
-    {
-        $relationName = $relationAlias ? $relationAlias : 'GroupI18n';
-
-        return $this
-            ->joinGroupI18n($relationAlias, $joinType)
-            ->addJoinCondition($relationName, $relationName . '.Locale = ?', $locale);
-    }
-
-    /**
-     * Adds a JOIN clause to the query and hydrates the related I18n object.
-     * Shortcut for $c->joinI18n($locale)->with()
-     *
-     * @param     string $locale Locale to use for the join condition, e.g. 'fr_FR'
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
-     *
-     * @return    ChildGroupQuery The current query, for fluid interface
-     */
-    public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN)
-    {
-        $this
-            ->joinI18n($locale, null, $joinType)
-            ->with('GroupI18n');
-        $this->with['GroupI18n']->setIsWithOneToMany(false);
-
-        return $this;
-    }
-
-    /**
-     * Use the I18n relation query object
-     *
-     * @see       useQuery()
-     *
-     * @param     string $locale Locale to use for the join condition, e.g. 'fr_FR'
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
-     *
-     * @return    ChildGroupI18nQuery A secondary query class using the current class as primary query
-     */
-    public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
-    {
-        return $this
-            ->joinI18n($locale, $relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'GroupI18n', '\Thelia\Model\GroupI18nQuery');
-    }
-
-} // GroupQuery

core/lib/Thelia/Model/Base/GroupResourceQuery.php

@@ -1,868 +0,0 @@
-<?php
-
-namespace Thelia\Model\Base;
-
-use \Exception;
-use \PDO;
-use Propel\Runtime\Propel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\ModelCriteria;
-use Propel\Runtime\ActiveQuery\ModelJoin;
-use Propel\Runtime\Collection\Collection;
-use Propel\Runtime\Collection\ObjectCollection;
-use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Exception\PropelException;
-use Thelia\Model\GroupResource as ChildGroupResource;
-use Thelia\Model\GroupResourceQuery as ChildGroupResourceQuery;
-use Thelia\Model\Map\GroupResourceTableMap;
-
-/**
- * Base class that represents a query for the 'group_resource' table.
- *
- *
- *
- * @method     ChildGroupResourceQuery orderById($order = Criteria::ASC) Order by the id column
- * @method     ChildGroupResourceQuery orderByGroupId($order = Criteria::ASC) Order by the group_id column
- * @method     ChildGroupResourceQuery orderByResourceId($order = Criteria::ASC) Order by the resource_id column
- * @method     ChildGroupResourceQuery orderByRead($order = Criteria::ASC) Order by the read column
- * @method     ChildGroupResourceQuery orderByWrite($order = Criteria::ASC) Order by the write column
- * @method     ChildGroupResourceQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
- * @method     ChildGroupResourceQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
- *
- * @method     ChildGroupResourceQuery groupById() Group by the id column
- * @method     ChildGroupResourceQuery groupByGroupId() Group by the group_id column
- * @method     ChildGroupResourceQuery groupByResourceId() Group by the resource_id column
- * @method     ChildGroupResourceQuery groupByRead() Group by the read column
- * @method     ChildGroupResourceQuery groupByWrite() Group by the write column
- * @method     ChildGroupResourceQuery groupByCreatedAt() Group by the created_at column
- * @method     ChildGroupResourceQuery groupByUpdatedAt() Group by the updated_at column
- *
- * @method     ChildGroupResourceQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
- * @method     ChildGroupResourceQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
- * @method     ChildGroupResourceQuery innerJoin($relation) Adds a INNER JOIN clause to the query
- *
- * @method     ChildGroupResourceQuery leftJoinGroup($relationAlias = null) Adds a LEFT JOIN clause to the query using the Group relation
- * @method     ChildGroupResourceQuery rightJoinGroup($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Group relation
- * @method     ChildGroupResourceQuery innerJoinGroup($relationAlias = null) Adds a INNER JOIN clause to the query using the Group relation
- *
- * @method     ChildGroupResourceQuery leftJoinResource($relationAlias = null) Adds a LEFT JOIN clause to the query using the Resource relation
- * @method     ChildGroupResourceQuery rightJoinResource($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Resource relation
- * @method     ChildGroupResourceQuery innerJoinResource($relationAlias = null) Adds a INNER JOIN clause to the query using the Resource relation
- *
- * @method     ChildGroupResource findOne(ConnectionInterface $con = null) Return the first ChildGroupResource matching the query
- * @method     ChildGroupResource findOneOrCreate(ConnectionInterface $con = null) Return the first ChildGroupResource matching the query, or a new ChildGroupResource object populated from the query conditions when no match is found
- *
- * @method     ChildGroupResource findOneById(int $id) Return the first ChildGroupResource filtered by the id column
- * @method     ChildGroupResource findOneByGroupId(int $group_id) Return the first ChildGroupResource filtered by the group_id column
- * @method     ChildGroupResource findOneByResourceId(int $resource_id) Return the first ChildGroupResource filtered by the resource_id column
- * @method     ChildGroupResource findOneByRead(int $read) Return the first ChildGroupResource filtered by the read column
- * @method     ChildGroupResource findOneByWrite(int $write) Return the first ChildGroupResource filtered by the write column
- * @method     ChildGroupResource findOneByCreatedAt(string $created_at) Return the first ChildGroupResource filtered by the created_at column
- * @method     ChildGroupResource findOneByUpdatedAt(string $updated_at) Return the first ChildGroupResource filtered by the updated_at column
- *
- * @method     array findById(int $id) Return ChildGroupResource objects filtered by the id column
- * @method     array findByGroupId(int $group_id) Return ChildGroupResource objects filtered by the group_id column
- * @method     array findByResourceId(int $resource_id) Return ChildGroupResource objects filtered by the resource_id column
- * @method     array findByRead(int $read) Return ChildGroupResource objects filtered by the read column
- * @method     array findByWrite(int $write) Return ChildGroupResource objects filtered by the write column
- * @method     array findByCreatedAt(string $created_at) Return ChildGroupResource objects filtered by the created_at column
- * @method     array findByUpdatedAt(string $updated_at) Return ChildGroupResource objects filtered by the updated_at column
- *
- */
-abstract class GroupResourceQuery extends ModelCriteria
-{
-
-    /**
-     * Initializes internal state of \Thelia\Model\Base\GroupResourceQuery object.
-     *
-     * @param     string $dbName The database name
-     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
-     */
-    public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\GroupResource', $modelAlias = null)
-    {
-        parent::__construct($dbName, $modelName, $modelAlias);
-    }
-
-    /**
-     * Returns a new ChildGroupResourceQuery object.
-     *
-     * @param     string $modelAlias The alias of a model in the query
-     * @param     Criteria $criteria Optional Criteria to build the query from
-     *
-     * @return ChildGroupResourceQuery
-     */
-    public static function create($modelAlias = null, $criteria = null)
-    {
-        if ($criteria instanceof \Thelia\Model\GroupResourceQuery) {
-            return $criteria;
-        }
-        $query = new \Thelia\Model\GroupResourceQuery();
-        if (null !== $modelAlias) {
-            $query->setModelAlias($modelAlias);
-        }
-        if ($criteria instanceof Criteria) {
-            $query->mergeWith($criteria);
-        }
-
-        return $query;
-    }
-
-    /**
-     * Find object by primary key.
-     * Propel uses the instance pool to skip the database if the object exists.
-     * Go fast if the query is untouched.
-     *
-     * <code>
-     * $obj = $c->findPk(array(12, 34, 56), $con);
-     * </code>
-     *
-     * @param array[$id, $group_id, $resource_id] $key Primary key to use for the query
-     * @param ConnectionInterface $con an optional connection object
-     *
-     * @return ChildGroupResource|array|mixed the result, formatted by the current formatter
-     */
-    public function findPk($key, $con = null)
-    {
-        if ($key === null) {
-            return null;
-        }
-        if ((null !== ($obj = GroupResourceTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1], (string) $key[2]))))) && !$this->formatter) {
-            // the object is already in the instance pool
-            return $obj;
-        }
-        if ($con === null) {
-            $con = Propel::getServiceContainer()->getReadConnection(GroupResourceTableMap::DATABASE_NAME);
-        }
-        $this->basePreSelect($con);
-        if ($this->formatter || $this->modelAlias || $this->with || $this->select
-         || $this->selectColumns || $this->asColumns || $this->selectModifiers
-         || $this->map || $this->having || $this->joins) {
-            return $this->findPkComplex($key, $con);
-        } else {
-            return $this->findPkSimple($key, $con);
-        }
-    }
-
-    /**
-     * Find object by primary key using raw SQL to go fast.
-     * Bypass doSelect() and the object formatter by using generated code.
-     *
-     * @param     mixed $key Primary key to use for the query
-     * @param     ConnectionInterface $con A connection object
-     *
-     * @return   ChildGroupResource A model object, or null if the key is not found
-     */
-    protected function findPkSimple($key, $con)
-    {
-        $sql = 'SELECT ID, GROUP_ID, RESOURCE_ID, READ, WRITE, CREATED_AT, UPDATED_AT FROM group_resource WHERE ID = :p0 AND GROUP_ID = :p1 AND RESOURCE_ID = :p2';
-        try {
-            $stmt = $con->prepare($sql);
-            $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
-            $stmt->bindValue(':p1', $key[1], PDO::PARAM_INT);
-            $stmt->bindValue(':p2', $key[2], PDO::PARAM_INT);
-            $stmt->execute();
-        } catch (Exception $e) {
-            Propel::log($e->getMessage(), Propel::LOG_ERR);
-            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
-        }
-        $obj = null;
-        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
-            $obj = new ChildGroupResource();
-            $obj->hydrate($row);
-            GroupResourceTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1], (string) $key[2])));
-        }
-        $stmt->closeCursor();
-
-        return $obj;
-    }
-
-    /**
-     * Find object by primary key.
-     *
-     * @param     mixed $key Primary key to use for the query
-     * @param     ConnectionInterface $con A connection object
-     *
-     * @return ChildGroupResource|array|mixed the result, formatted by the current formatter
-     */
-    protected function findPkComplex($key, $con)
-    {
-        // As the query uses a PK condition, no limit(1) is necessary.
-        $criteria = $this->isKeepQuery() ? clone $this : $this;
-        $dataFetcher = $criteria
-            ->filterByPrimaryKey($key)
-            ->doSelect($con);
-
-        return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
-    }
-
-    /**
-     * Find objects by primary key
-     * <code>
-     * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con);
-     * </code>
-     * @param     array $keys Primary keys to use for the query
-     * @param     ConnectionInterface $con an optional connection object
-     *
-     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
-     */
-    public function findPks($keys, $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
-        }
-        $this->basePreSelect($con);
-        $criteria = $this->isKeepQuery() ? clone $this : $this;
-        $dataFetcher = $criteria
-            ->filterByPrimaryKeys($keys)
-            ->doSelect($con);
-
-        return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
-    }
-
-    /**
-     * Filter the query by primary key
-     *
-     * @param     mixed $key Primary key to use for the query
-     *
-     * @return ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function filterByPrimaryKey($key)
-    {
-        $this->addUsingAlias(GroupResourceTableMap::ID, $key[0], Criteria::EQUAL);
-        $this->addUsingAlias(GroupResourceTableMap::GROUP_ID, $key[1], Criteria::EQUAL);
-        $this->addUsingAlias(GroupResourceTableMap::RESOURCE_ID, $key[2], Criteria::EQUAL);
-
-        return $this;
-    }
-
-    /**
-     * Filter the query by a list of primary keys
-     *
-     * @param     array $keys The list of primary key to use for the query
-     *
-     * @return ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function filterByPrimaryKeys($keys)
-    {
-        if (empty($keys)) {
-            return $this->add(null, '1<>1', Criteria::CUSTOM);
-        }
-        foreach ($keys as $key) {
-            $cton0 = $this->getNewCriterion(GroupResourceTableMap::ID, $key[0], Criteria::EQUAL);
-            $cton1 = $this->getNewCriterion(GroupResourceTableMap::GROUP_ID, $key[1], Criteria::EQUAL);
-            $cton0->addAnd($cton1);
-            $cton2 = $this->getNewCriterion(GroupResourceTableMap::RESOURCE_ID, $key[2], Criteria::EQUAL);
-            $cton0->addAnd($cton2);
-            $this->addOr($cton0);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Filter the query on the id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterById(1234); // WHERE id = 1234
-     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
-     * $query->filterById(array('min' => 12)); // WHERE id > 12
-     * </code>
-     *
-     * @param     mixed $id The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function filterById($id = null, $comparison = null)
-    {
-        if (is_array($id)) {
-            $useMinMax = false;
-            if (isset($id['min'])) {
-                $this->addUsingAlias(GroupResourceTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($id['max'])) {
-                $this->addUsingAlias(GroupResourceTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupResourceTableMap::ID, $id, $comparison);
-    }
-
-    /**
-     * Filter the query on the group_id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByGroupId(1234); // WHERE group_id = 1234
-     * $query->filterByGroupId(array(12, 34)); // WHERE group_id IN (12, 34)
-     * $query->filterByGroupId(array('min' => 12)); // WHERE group_id > 12
-     * </code>
-     *
-     * @see       filterByGroup()
-     *
-     * @param     mixed $groupId The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function filterByGroupId($groupId = null, $comparison = null)
-    {
-        if (is_array($groupId)) {
-            $useMinMax = false;
-            if (isset($groupId['min'])) {
-                $this->addUsingAlias(GroupResourceTableMap::GROUP_ID, $groupId['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($groupId['max'])) {
-                $this->addUsingAlias(GroupResourceTableMap::GROUP_ID, $groupId['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupResourceTableMap::GROUP_ID, $groupId, $comparison);
-    }
-
-    /**
-     * Filter the query on the resource_id column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByResourceId(1234); // WHERE resource_id = 1234
-     * $query->filterByResourceId(array(12, 34)); // WHERE resource_id IN (12, 34)
-     * $query->filterByResourceId(array('min' => 12)); // WHERE resource_id > 12
-     * </code>
-     *
-     * @see       filterByResource()
-     *
-     * @param     mixed $resourceId The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function filterByResourceId($resourceId = null, $comparison = null)
-    {
-        if (is_array($resourceId)) {
-            $useMinMax = false;
-            if (isset($resourceId['min'])) {
-                $this->addUsingAlias(GroupResourceTableMap::RESOURCE_ID, $resourceId['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($resourceId['max'])) {
-                $this->addUsingAlias(GroupResourceTableMap::RESOURCE_ID, $resourceId['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupResourceTableMap::RESOURCE_ID, $resourceId, $comparison);
-    }
-
-    /**
-     * Filter the query on the read column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByRead(1234); // WHERE read = 1234
-     * $query->filterByRead(array(12, 34)); // WHERE read IN (12, 34)
-     * $query->filterByRead(array('min' => 12)); // WHERE read > 12
-     * </code>
-     *
-     * @param     mixed $read The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function filterByRead($read = null, $comparison = null)
-    {
-        if (is_array($read)) {
-            $useMinMax = false;
-            if (isset($read['min'])) {
-                $this->addUsingAlias(GroupResourceTableMap::READ, $read['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($read['max'])) {
-                $this->addUsingAlias(GroupResourceTableMap::READ, $read['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupResourceTableMap::READ, $read, $comparison);
-    }
-
-    /**
-     * Filter the query on the write column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByWrite(1234); // WHERE write = 1234
-     * $query->filterByWrite(array(12, 34)); // WHERE write IN (12, 34)
-     * $query->filterByWrite(array('min' => 12)); // WHERE write > 12
-     * </code>
-     *
-     * @param     mixed $write The value to use as filter.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function filterByWrite($write = null, $comparison = null)
-    {
-        if (is_array($write)) {
-            $useMinMax = false;
-            if (isset($write['min'])) {
-                $this->addUsingAlias(GroupResourceTableMap::WRITE, $write['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($write['max'])) {
-                $this->addUsingAlias(GroupResourceTableMap::WRITE, $write['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupResourceTableMap::WRITE, $write, $comparison);
-    }
-
-    /**
-     * Filter the query on the created_at column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
-     * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
-     * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
-     * </code>
-     *
-     * @param     mixed $createdAt The value to use as filter.
-     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *              Empty strings are treated as NULL.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function filterByCreatedAt($createdAt = null, $comparison = null)
-    {
-        if (is_array($createdAt)) {
-            $useMinMax = false;
-            if (isset($createdAt['min'])) {
-                $this->addUsingAlias(GroupResourceTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($createdAt['max'])) {
-                $this->addUsingAlias(GroupResourceTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupResourceTableMap::CREATED_AT, $createdAt, $comparison);
-    }
-
-    /**
-     * Filter the query on the updated_at column
-     *
-     * Example usage:
-     * <code>
-     * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
-     * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
-     * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
-     * </code>
-     *
-     * @param     mixed $updatedAt The value to use as filter.
-     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *              Empty strings are treated as NULL.
-     *              Use scalar values for equality.
-     *              Use array values for in_array() equivalent.
-     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function filterByUpdatedAt($updatedAt = null, $comparison = null)
-    {
-        if (is_array($updatedAt)) {
-            $useMinMax = false;
-            if (isset($updatedAt['min'])) {
-                $this->addUsingAlias(GroupResourceTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
-                $useMinMax = true;
-            }
-            if (isset($updatedAt['max'])) {
-                $this->addUsingAlias(GroupResourceTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
-                $useMinMax = true;
-            }
-            if ($useMinMax) {
-                return $this;
-            }
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-        }
-
-        return $this->addUsingAlias(GroupResourceTableMap::UPDATED_AT, $updatedAt, $comparison);
-    }
-
-    /**
-     * Filter the query by a related \Thelia\Model\Group object
-     *
-     * @param \Thelia\Model\Group|ObjectCollection $group The related object(s) to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function filterByGroup($group, $comparison = null)
-    {
-        if ($group instanceof \Thelia\Model\Group) {
-            return $this
-                ->addUsingAlias(GroupResourceTableMap::GROUP_ID, $group->getId(), $comparison);
-        } elseif ($group instanceof ObjectCollection) {
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-
-            return $this
-                ->addUsingAlias(GroupResourceTableMap::GROUP_ID, $group->toKeyValue('PrimaryKey', 'Id'), $comparison);
-        } else {
-            throw new PropelException('filterByGroup() only accepts arguments of type \Thelia\Model\Group or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the Group relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function joinGroup($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('Group');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'Group');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the Group relation Group object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\GroupQuery A secondary query class using the current class as primary query
-     */
-    public function useGroupQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        return $this
-            ->joinGroup($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'Group', '\Thelia\Model\GroupQuery');
-    }
-
-    /**
-     * Filter the query by a related \Thelia\Model\Resource object
-     *
-     * @param \Thelia\Model\Resource|ObjectCollection $resource The related object(s) to use as filter
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
-     *
-     * @return ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function filterByResource($resource, $comparison = null)
-    {
-        if ($resource instanceof \Thelia\Model\Resource) {
-            return $this
-                ->addUsingAlias(GroupResourceTableMap::RESOURCE_ID, $resource->getId(), $comparison);
-        } elseif ($resource instanceof ObjectCollection) {
-            if (null === $comparison) {
-                $comparison = Criteria::IN;
-            }
-
-            return $this
-                ->addUsingAlias(GroupResourceTableMap::RESOURCE_ID, $resource->toKeyValue('PrimaryKey', 'Id'), $comparison);
-        } else {
-            throw new PropelException('filterByResource() only accepts arguments of type \Thelia\Model\Resource or Collection');
-        }
-    }
-
-    /**
-     * Adds a JOIN clause to the query using the Resource relation
-     *
-     * @param     string $relationAlias optional alias for the relation
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function joinResource($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('Resource');
-
-        // create a ModelJoin object for this join
-        $join = new ModelJoin();
-        $join->setJoinType($joinType);
-        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
-        if ($previousJoin = $this->getPreviousJoin()) {
-            $join->setPreviousJoin($previousJoin);
-        }
-
-        // add the ModelJoin to the current object
-        if ($relationAlias) {
-            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
-            $this->addJoinObject($join, $relationAlias);
-        } else {
-            $this->addJoinObject($join, 'Resource');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Use the Resource relation Resource object
-     *
-     * @see useQuery()
-     *
-     * @param     string $relationAlias optional alias for the relation,
-     *                                   to be used as main alias in the secondary query
-     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
-     *
-     * @return   \Thelia\Model\ResourceQuery A secondary query class using the current class as primary query
-     */
-    public function useResourceQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
-    {
-        return $this
-            ->joinResource($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'Resource', '\Thelia\Model\ResourceQuery');
-    }
-
-    /**
-     * Exclude object from result
-     *
-     * @param   ChildGroupResource $groupResource Object to remove from the list of results
-     *
-     * @return ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function prune($groupResource = null)
-    {
-        if ($groupResource) {
-            $this->addCond('pruneCond0', $this->getAliasedColName(GroupResourceTableMap::ID), $groupResource->getId(), Criteria::NOT_EQUAL);
-            $this->addCond('pruneCond1', $this->getAliasedColName(GroupResourceTableMap::GROUP_ID), $groupResource->getGroupId(), Criteria::NOT_EQUAL);
-            $this->addCond('pruneCond2', $this->getAliasedColName(GroupResourceTableMap::RESOURCE_ID), $groupResource->getResourceId(), Criteria::NOT_EQUAL);
-            $this->combine(array('pruneCond0', 'pruneCond1', 'pruneCond2'), Criteria::LOGICAL_OR);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Deletes all rows from the group_resource table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public function doDeleteAll(ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupResourceTableMap::DATABASE_NAME);
-        }
-        $affectedRows = 0; // initialize var to track total num of affected rows
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table or we could emulating ON DELETE CASCADE, etc.
-            $con->beginTransaction();
-            $affectedRows += parent::doDeleteAll($con);
-            // Because this db requires some delete cascade/set null emulation, we have to
-            // clear the cached instance *after* the emulation has happened (since
-            // instances get re-added by the select statement contained therein).
-            GroupResourceTableMap::clearInstancePool();
-            GroupResourceTableMap::clearRelatedInstancePool();
-
-            $con->commit();
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-
-        return $affectedRows;
-    }
-
-    /**
-     * Performs a DELETE on the database, given a ChildGroupResource or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or ChildGroupResource object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-     public function delete(ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupResourceTableMap::DATABASE_NAME);
-        }
-
-        $criteria = $this;
-
-        // Set the correct dbName
-        $criteria->setDbName(GroupResourceTableMap::DATABASE_NAME);
-
-        $affectedRows = 0; // initialize var to track total num of affected rows
-
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table or we could emulating ON DELETE CASCADE, etc.
-            $con->beginTransaction();
-
-
-        GroupResourceTableMap::removeInstanceFromPool($criteria);
-
-            $affectedRows += ModelCriteria::delete($con);
-            GroupResourceTableMap::clearRelatedInstancePool();
-            $con->commit();
-
-            return $affectedRows;
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-    }
-
-    // timestampable behavior
-
-    /**
-     * Filter by the latest updated
-     *
-     * @param      int $nbDays Maximum age of the latest update in days
-     *
-     * @return     ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function recentlyUpdated($nbDays = 7)
-    {
-        return $this->addUsingAlias(GroupResourceTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
-    }
-
-    /**
-     * Filter by the latest created
-     *
-     * @param      int $nbDays Maximum age of in days
-     *
-     * @return     ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function recentlyCreated($nbDays = 7)
-    {
-        return $this->addUsingAlias(GroupResourceTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
-    }
-
-    /**
-     * Order by update date desc
-     *
-     * @return     ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function lastUpdatedFirst()
-    {
-        return $this->addDescendingOrderByColumn(GroupResourceTableMap::UPDATED_AT);
-    }
-
-    /**
-     * Order by update date asc
-     *
-     * @return     ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function firstUpdatedFirst()
-    {
-        return $this->addAscendingOrderByColumn(GroupResourceTableMap::UPDATED_AT);
-    }
-
-    /**
-     * Order by create date desc
-     *
-     * @return     ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function lastCreatedFirst()
-    {
-        return $this->addDescendingOrderByColumn(GroupResourceTableMap::CREATED_AT);
-    }
-
-    /**
-     * Order by create date asc
-     *
-     * @return     ChildGroupResourceQuery The current query, for fluid interface
-     */
-    public function firstCreatedFirst()
-    {
-        return $this->addAscendingOrderByColumn(GroupResourceTableMap::CREATED_AT);
-    }
-
-} // GroupResourceQuery

core/lib/Thelia/Model/Base/Module.php

@@ -19,8 +19,6 @@ use Propel\Runtime\Parser\AbstractParser;
 use Propel\Runtime\Util\PropelDateTime;
 use Thelia\Model\AreaDeliveryModule as ChildAreaDeliveryModule;
 use Thelia\Model\AreaDeliveryModuleQuery as ChildAreaDeliveryModuleQuery;
-use Thelia\Model\GroupModule as ChildGroupModule;
-use Thelia\Model\GroupModuleQuery as ChildGroupModuleQuery;
 use Thelia\Model\Module as ChildModule;
 use Thelia\Model\ModuleI18n as ChildModuleI18n;
 use Thelia\Model\ModuleI18nQuery as ChildModuleI18nQuery;
@@ -29,6 +27,8 @@ use Thelia\Model\ModuleImageQuery as ChildModuleImageQuery;
 use Thelia\Model\ModuleQuery as ChildModuleQuery;
 use Thelia\Model\Order as ChildOrder;
 use Thelia\Model\OrderQuery as ChildOrderQuery;
+use Thelia\Model\ProfileModule as ChildProfileModule;
+use Thelia\Model\ProfileModuleQuery as ChildProfileModuleQuery;
 use Thelia\Model\Map\ModuleTableMap;
 
 abstract class Module implements ActiveRecordInterface
@@ -132,10 +132,10 @@ abstract class Module implements ActiveRecordInterface
     protected $collAreaDeliveryModulesPartial;
 
     /**
-     * @var        ObjectCollection|ChildGroupModule[] Collection to store aggregation of ChildGroupModule objects.
+     * @var        ObjectCollection|ChildProfileModule[] Collection to store aggregation of ChildProfileModule objects.
      */
-    protected $collGroupModules;
-    protected $collGroupModulesPartial;
+    protected $collProfileModules;
+    protected $collProfileModulesPartial;
 
     /**
      * @var        ObjectCollection|ChildModuleImage[] Collection to store aggregation of ChildModuleImage objects.
@@ -193,7 +193,7 @@ abstract class Module implements ActiveRecordInterface
      * An array of objects scheduled for deletion.
      * @var ObjectCollection
      */
-    protected $groupModulesScheduledForDeletion = null;
+    protected $profileModulesScheduledForDeletion = null;
 
     /**
      * An array of objects scheduled for deletion.
@@ -880,7 +880,7 @@ abstract class Module implements ActiveRecordInterface
 
             $this->collAreaDeliveryModules = null;
 
-            $this->collGroupModules = null;
+            $this->collProfileModules = null;
 
             $this->collModuleImages = null;
 
@@ -1070,17 +1070,17 @@ abstract class Module implements ActiveRecordInterface
                 }
             }
 
-            if ($this->groupModulesScheduledForDeletion !== null) {
-                if (!$this->groupModulesScheduledForDeletion->isEmpty()) {
-                    \Thelia\Model\GroupModuleQuery::create()
-                        ->filterByPrimaryKeys($this->groupModulesScheduledForDeletion->getPrimaryKeys(false))
+            if ($this->profileModulesScheduledForDeletion !== null) {
+                if (!$this->profileModulesScheduledForDeletion->isEmpty()) {
+                    \Thelia\Model\ProfileModuleQuery::create()
+                        ->filterByPrimaryKeys($this->profileModulesScheduledForDeletion->getPrimaryKeys(false))
                         ->delete($con);
-                    $this->groupModulesScheduledForDeletion = null;
+                    $this->profileModulesScheduledForDeletion = null;
                 }
             }
 
-                if ($this->collGroupModules !== null) {
-            foreach ($this->collGroupModules as $referrerFK) {
+                if ($this->collProfileModules !== null) {
+            foreach ($this->collProfileModules as $referrerFK) {
                     if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
                         $affectedRows += $referrerFK->save($con);
                     }
@@ -1345,8 +1345,8 @@ abstract class Module implements ActiveRecordInterface
             if (null !== $this->collAreaDeliveryModules) {
                 $result['AreaDeliveryModules'] = $this->collAreaDeliveryModules->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
             }
-            if (null !== $this->collGroupModules) {
-                $result['GroupModules'] = $this->collGroupModules->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+            if (null !== $this->collProfileModules) {
+                $result['ProfileModules'] = $this->collProfileModules->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
             }
             if (null !== $this->collModuleImages) {
                 $result['ModuleImages'] = $this->collModuleImages->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
@@ -1557,9 +1557,9 @@ abstract class Module implements ActiveRecordInterface
                 }
             }
 
-            foreach ($this->getGroupModules() as $relObj) {
+            foreach ($this->getProfileModules() as $relObj) {
                 if ($relObj !== $this) {  // ensure that we don't try to copy a reference to ourselves
-                    $copyObj->addGroupModule($relObj->copy($deepCopy));
+                    $copyObj->addProfileModule($relObj->copy($deepCopy));
                 }
             }
 
@@ -1625,8 +1625,8 @@ abstract class Module implements ActiveRecordInterface
         if ('AreaDeliveryModule' == $relationName) {
             return $this->initAreaDeliveryModules();
         }
-        if ('GroupModule' == $relationName) {
-            return $this->initGroupModules();
+        if ('ProfileModule' == $relationName) {
+            return $this->initProfileModules();
         }
         if ('ModuleImage' == $relationName) {
             return $this->initModuleImages();
@@ -2616,31 +2616,31 @@ abstract class Module implements ActiveRecordInterface
     }
 
     /**
-     * Clears out the collGroupModules collection
+     * Clears out the collProfileModules collection
      *
      * This does not modify the database; however, it will remove any associated objects, causing
      * them to be refetched by subsequent calls to accessor method.
      *
      * @return void
-     * @see        addGroupModules()
+     * @see        addProfileModules()
      */
-    public function clearGroupModules()
+    public function clearProfileModules()
     {
-        $this->collGroupModules = null; // important to set this to NULL since that means it is uninitialized
+        $this->collProfileModules = null; // important to set this to NULL since that means it is uninitialized
     }
 
     /**
-     * Reset is the collGroupModules collection loaded partially.
+     * Reset is the collProfileModules collection loaded partially.
      */
-    public function resetPartialGroupModules($v = true)
+    public function resetPartialProfileModules($v = true)
     {
-        $this->collGroupModulesPartial = $v;
+        $this->collProfileModulesPartial = $v;
     }
 
     /**
-     * Initializes the collGroupModules collection.
+     * Initializes the collProfileModules collection.
      *
-     * By default this just sets the collGroupModules collection to an empty array (like clearcollGroupModules());
+     * By default this just sets the collProfileModules collection to an empty array (like clearcollProfileModules());
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
@@ -2649,17 +2649,17 @@ abstract class Module implements ActiveRecordInterface
      *
      * @return void
      */
-    public function initGroupModules($overrideExisting = true)
+    public function initProfileModules($overrideExisting = true)
     {
-        if (null !== $this->collGroupModules && !$overrideExisting) {
+        if (null !== $this->collProfileModules && !$overrideExisting) {
             return;
         }
-        $this->collGroupModules = new ObjectCollection();
-        $this->collGroupModules->setModel('\Thelia\Model\GroupModule');
+        $this->collProfileModules = new ObjectCollection();
+        $this->collProfileModules->setModel('\Thelia\Model\ProfileModule');
     }
 
     /**
-     * Gets an array of ChildGroupModule objects which contain a foreign key that references this object.
+     * Gets an array of ChildProfileModule objects which contain a foreign key that references this object.
      *
      * If the $criteria is not null, it is used to always fetch the results from the database.
      * Otherwise the results are fetched from the database the first time, then cached.
@@ -2669,109 +2669,109 @@ abstract class Module implements ActiveRecordInterface
      *
      * @param      Criteria $criteria optional Criteria object to narrow the query
      * @param      ConnectionInterface $con optional connection object
-     * @return Collection|ChildGroupModule[] List of ChildGroupModule objects
+     * @return Collection|ChildProfileModule[] List of ChildProfileModule objects
      * @throws PropelException
      */
-    public function getGroupModules($criteria = null, ConnectionInterface $con = null)
+    public function getProfileModules($criteria = null, ConnectionInterface $con = null)
     {
-        $partial = $this->collGroupModulesPartial && !$this->isNew();
-        if (null === $this->collGroupModules || null !== $criteria  || $partial) {
-            if ($this->isNew() && null === $this->collGroupModules) {
+        $partial = $this->collProfileModulesPartial && !$this->isNew();
+        if (null === $this->collProfileModules || null !== $criteria  || $partial) {
+            if ($this->isNew() && null === $this->collProfileModules) {
                 // return empty collection
-                $this->initGroupModules();
+                $this->initProfileModules();
             } else {
-                $collGroupModules = ChildGroupModuleQuery::create(null, $criteria)
+                $collProfileModules = ChildProfileModuleQuery::create(null, $criteria)
                     ->filterByModule($this)
                     ->find($con);
 
                 if (null !== $criteria) {
-                    if (false !== $this->collGroupModulesPartial && count($collGroupModules)) {
-                        $this->initGroupModules(false);
+                    if (false !== $this->collProfileModulesPartial && count($collProfileModules)) {
+                        $this->initProfileModules(false);
 
-                        foreach ($collGroupModules as $obj) {
-                            if (false == $this->collGroupModules->contains($obj)) {
-                                $this->collGroupModules->append($obj);
+                        foreach ($collProfileModules as $obj) {
+                            if (false == $this->collProfileModules->contains($obj)) {
+                                $this->collProfileModules->append($obj);
                             }
                         }
 
-                        $this->collGroupModulesPartial = true;
+                        $this->collProfileModulesPartial = true;
                     }
 
-                    $collGroupModules->getInternalIterator()->rewind();
+                    $collProfileModules->getInternalIterator()->rewind();
 
-                    return $collGroupModules;
+                    return $collProfileModules;
                 }
 
-                if ($partial && $this->collGroupModules) {
-                    foreach ($this->collGroupModules as $obj) {
+                if ($partial && $this->collProfileModules) {
+                    foreach ($this->collProfileModules as $obj) {
                         if ($obj->isNew()) {
-                            $collGroupModules[] = $obj;
+                            $collProfileModules[] = $obj;
                         }
                     }
                 }
 
-                $this->collGroupModules = $collGroupModules;
-                $this->collGroupModulesPartial = false;
+                $this->collProfileModules = $collProfileModules;
+                $this->collProfileModulesPartial = false;
             }
         }
 
-        return $this->collGroupModules;
+        return $this->collProfileModules;
     }
 
     /**
-     * Sets a collection of GroupModule objects related by a one-to-many relationship
+     * Sets a collection of ProfileModule objects related by a one-to-many relationship
      * to the current object.
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param      Collection $groupModules A Propel collection.
+     * @param      Collection $profileModules A Propel collection.
      * @param      ConnectionInterface $con Optional connection object
      * @return   ChildModule The current object (for fluent API support)
      */
-    public function setGroupModules(Collection $groupModules, ConnectionInterface $con = null)
+    public function setProfileModules(Collection $profileModules, ConnectionInterface $con = null)
     {
-        $groupModulesToDelete = $this->getGroupModules(new Criteria(), $con)->diff($groupModules);
+        $profileModulesToDelete = $this->getProfileModules(new Criteria(), $con)->diff($profileModules);
 
 
-        $this->groupModulesScheduledForDeletion = $groupModulesToDelete;
+        $this->profileModulesScheduledForDeletion = $profileModulesToDelete;
 
-        foreach ($groupModulesToDelete as $groupModuleRemoved) {
-            $groupModuleRemoved->setModule(null);
+        foreach ($profileModulesToDelete as $profileModuleRemoved) {
+            $profileModuleRemoved->setModule(null);
         }
 
-        $this->collGroupModules = null;
-        foreach ($groupModules as $groupModule) {
-            $this->addGroupModule($groupModule);
+        $this->collProfileModules = null;
+        foreach ($profileModules as $profileModule) {
+            $this->addProfileModule($profileModule);
         }
 
-        $this->collGroupModules = $groupModules;
-        $this->collGroupModulesPartial = false;
+        $this->collProfileModules = $profileModules;
+        $this->collProfileModulesPartial = false;
 
         return $this;
     }
 
     /**
-     * Returns the number of related GroupModule objects.
+     * Returns the number of related ProfileModule objects.
      *
      * @param      Criteria $criteria
      * @param      boolean $distinct
      * @param      ConnectionInterface $con
-     * @return int             Count of related GroupModule objects.
+     * @return int             Count of related ProfileModule objects.
      * @throws PropelException
      */
-    public function countGroupModules(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+    public function countProfileModules(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
     {
-        $partial = $this->collGroupModulesPartial && !$this->isNew();
-        if (null === $this->collGroupModules || null !== $criteria || $partial) {
-            if ($this->isNew() && null === $this->collGroupModules) {
+        $partial = $this->collProfileModulesPartial && !$this->isNew();
+        if (null === $this->collProfileModules || null !== $criteria || $partial) {
+            if ($this->isNew() && null === $this->collProfileModules) {
                 return 0;
             }
 
             if ($partial && !$criteria) {
-                return count($this->getGroupModules());
+                return count($this->getProfileModules());
             }
 
-            $query = ChildGroupModuleQuery::create(null, $criteria);
+            $query = ChildProfileModuleQuery::create(null, $criteria);
             if ($distinct) {
                 $query->distinct();
             }
@@ -2781,53 +2781,53 @@ abstract class Module implements ActiveRecordInterface
                 ->count($con);
         }
 
-        return count($this->collGroupModules);
+        return count($this->collProfileModules);
     }
 
     /**
-     * Method called to associate a ChildGroupModule object to this object
-     * through the ChildGroupModule foreign key attribute.
+     * Method called to associate a ChildProfileModule object to this object
+     * through the ChildProfileModule foreign key attribute.
      *
-     * @param    ChildGroupModule $l ChildGroupModule
+     * @param    ChildProfileModule $l ChildProfileModule
      * @return   \Thelia\Model\Module The current object (for fluent API support)
      */
-    public function addGroupModule(ChildGroupModule $l)
+    public function addProfileModule(ChildProfileModule $l)
     {
-        if ($this->collGroupModules === null) {
-            $this->initGroupModules();
-            $this->collGroupModulesPartial = true;
+        if ($this->collProfileModules === null) {
+            $this->initProfileModules();
+            $this->collProfileModulesPartial = true;
         }
 
-        if (!in_array($l, $this->collGroupModules->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
-            $this->doAddGroupModule($l);
+        if (!in_array($l, $this->collProfileModules->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+            $this->doAddProfileModule($l);
         }
 
         return $this;
     }
 
     /**
-     * @param GroupModule $groupModule The groupModule object to add.
+     * @param ProfileModule $profileModule The profileModule object to add.
      */
-    protected function doAddGroupModule($groupModule)
+    protected function doAddProfileModule($profileModule)
     {
-        $this->collGroupModules[]= $groupModule;
-        $groupModule->setModule($this);
+        $this->collProfileModules[]= $profileModule;
+        $profileModule->setModule($this);
     }
 
     /**
-     * @param  GroupModule $groupModule The groupModule object to remove.
+     * @param  ProfileModule $profileModule The profileModule object to remove.
      * @return ChildModule The current object (for fluent API support)
      */
-    public function removeGroupModule($groupModule)
+    public function removeProfileModule($profileModule)
     {
-        if ($this->getGroupModules()->contains($groupModule)) {
-            $this->collGroupModules->remove($this->collGroupModules->search($groupModule));
-            if (null === $this->groupModulesScheduledForDeletion) {
-                $this->groupModulesScheduledForDeletion = clone $this->collGroupModules;
-                $this->groupModulesScheduledForDeletion->clear();
+        if ($this->getProfileModules()->contains($profileModule)) {
+            $this->collProfileModules->remove($this->collProfileModules->search($profileModule));
+            if (null === $this->profileModulesScheduledForDeletion) {
+                $this->profileModulesScheduledForDeletion = clone $this->collProfileModules;
+                $this->profileModulesScheduledForDeletion->clear();
             }
-            $this->groupModulesScheduledForDeletion[]= $groupModule;
-            $groupModule->setModule(null);
+            $this->profileModulesScheduledForDeletion[]= $profileModule;
+            $profileModule->setModule(null);
         }
 
         return $this;
@@ -2839,7 +2839,7 @@ abstract class Module implements ActiveRecordInterface
      * an identical criteria, it returns the collection.
      * Otherwise if this Module is new, it will return
      * an empty collection; or if this Module has previously
-     * been saved, it will retrieve related GroupModules from storage.
+     * been saved, it will retrieve related ProfileModules from storage.
      *
      * This method is protected by default in order to keep the public
      * api reasonable.  You can provide public methods for those you
@@ -2848,14 +2848,14 @@ abstract class Module implements ActiveRecordInterface
      * @param      Criteria $criteria optional Criteria object to narrow the query
      * @param      ConnectionInterface $con optional connection object
      * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
-     * @return Collection|ChildGroupModule[] List of ChildGroupModule objects
+     * @return Collection|ChildProfileModule[] List of ChildProfileModule objects
      */
-    public function getGroupModulesJoinGroup($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+    public function getProfileModulesJoinProfile($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
     {
-        $query = ChildGroupModuleQuery::create(null, $criteria);
-        $query->joinWith('Group', $joinBehavior);
+        $query = ChildProfileModuleQuery::create(null, $criteria);
+        $query->joinWith('Profile', $joinBehavior);
 
-        return $this->getGroupModules($query, $con);
+        return $this->getProfileModules($query, $con);
     }
 
     /**
@@ -3348,8 +3348,8 @@ abstract class Module implements ActiveRecordInterface
                     $o->clearAllReferences($deep);
                 }
             }
-            if ($this->collGroupModules) {
-                foreach ($this->collGroupModules as $o) {
+            if ($this->collProfileModules) {
+                foreach ($this->collProfileModules as $o) {
                     $o->clearAllReferences($deep);
                 }
             }
@@ -3381,10 +3381,10 @@ abstract class Module implements ActiveRecordInterface
             $this->collAreaDeliveryModules->clearIterator();
         }
         $this->collAreaDeliveryModules = null;
-        if ($this->collGroupModules instanceof Collection) {
-            $this->collGroupModules->clearIterator();
+        if ($this->collProfileModules instanceof Collection) {
+            $this->collProfileModules->clearIterator();
         }
-        $this->collGroupModules = null;
+        $this->collProfileModules = null;
         if ($this->collModuleImages instanceof Collection) {
             $this->collModuleImages->clearIterator();
         }

core/lib/Thelia/Model/Base/ModuleQuery.php

@@ -56,9 +56,9 @@ use Thelia\Model\Map\ModuleTableMap;
  * @method     ChildModuleQuery rightJoinAreaDeliveryModule($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AreaDeliveryModule relation
  * @method     ChildModuleQuery innerJoinAreaDeliveryModule($relationAlias = null) Adds a INNER JOIN clause to the query using the AreaDeliveryModule relation
  *
- * @method     ChildModuleQuery leftJoinGroupModule($relationAlias = null) Adds a LEFT JOIN clause to the query using the GroupModule relation
- * @method     ChildModuleQuery rightJoinGroupModule($relationAlias = null) Adds a RIGHT JOIN clause to the query using the GroupModule relation
- * @method     ChildModuleQuery innerJoinGroupModule($relationAlias = null) Adds a INNER JOIN clause to the query using the GroupModule relation
+ * @method     ChildModuleQuery leftJoinProfileModule($relationAlias = null) Adds a LEFT JOIN clause to the query using the ProfileModule relation
+ * @method     ChildModuleQuery rightJoinProfileModule($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ProfileModule relation
+ * @method     ChildModuleQuery innerJoinProfileModule($relationAlias = null) Adds a INNER JOIN clause to the query using the ProfileModule relation
  *
  * @method     ChildModuleQuery leftJoinModuleImage($relationAlias = null) Adds a LEFT JOIN clause to the query using the ModuleImage relation
  * @method     ChildModuleQuery rightJoinModuleImage($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ModuleImage relation
@@ -793,40 +793,40 @@ abstract class ModuleQuery extends ModelCriteria
     }
 
     /**
-     * Filter the query by a related \Thelia\Model\GroupModule object
+     * Filter the query by a related \Thelia\Model\ProfileModule object
      *
-     * @param \Thelia\Model\GroupModule|ObjectCollection $groupModule  the related object to use as filter
+     * @param \Thelia\Model\ProfileModule|ObjectCollection $profileModule  the related object to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildModuleQuery The current query, for fluid interface
      */
-    public function filterByGroupModule($groupModule, $comparison = null)
+    public function filterByProfileModule($profileModule, $comparison = null)
     {
-        if ($groupModule instanceof \Thelia\Model\GroupModule) {
+        if ($profileModule instanceof \Thelia\Model\ProfileModule) {
             return $this
-                ->addUsingAlias(ModuleTableMap::ID, $groupModule->getModuleId(), $comparison);
-        } elseif ($groupModule instanceof ObjectCollection) {
+                ->addUsingAlias(ModuleTableMap::ID, $profileModule->getModuleId(), $comparison);
+        } elseif ($profileModule instanceof ObjectCollection) {
             return $this
-                ->useGroupModuleQuery()
-                ->filterByPrimaryKeys($groupModule->getPrimaryKeys())
+                ->useProfileModuleQuery()
+                ->filterByPrimaryKeys($profileModule->getPrimaryKeys())
                 ->endUse();
         } else {
-            throw new PropelException('filterByGroupModule() only accepts arguments of type \Thelia\Model\GroupModule or Collection');
+            throw new PropelException('filterByProfileModule() only accepts arguments of type \Thelia\Model\ProfileModule or Collection');
         }
     }
 
     /**
-     * Adds a JOIN clause to the query using the GroupModule relation
+     * Adds a JOIN clause to the query using the ProfileModule relation
      *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildModuleQuery The current query, for fluid interface
      */
-    public function joinGroupModule($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    public function joinProfileModule($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
         $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('GroupModule');
+        $relationMap = $tableMap->getRelation('ProfileModule');
 
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -841,14 +841,14 @@ abstract class ModuleQuery extends ModelCriteria
             $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
             $this->addJoinObject($join, $relationAlias);
         } else {
-            $this->addJoinObject($join, 'GroupModule');
+            $this->addJoinObject($join, 'ProfileModule');
         }
 
         return $this;
     }
 
     /**
-     * Use the GroupModule relation GroupModule object
+     * Use the ProfileModule relation ProfileModule object
      *
      * @see useQuery()
      *
@@ -856,13 +856,13 @@ abstract class ModuleQuery extends ModelCriteria
      *                                   to be used as main alias in the secondary query
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return   \Thelia\Model\GroupModuleQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\ProfileModuleQuery A secondary query class using the current class as primary query
      */
-    public function useGroupModuleQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    public function useProfileModuleQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
         return $this
-            ->joinGroupModule($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'GroupModule', '\Thelia\Model\GroupModuleQuery');
+            ->joinProfileModule($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'ProfileModule', '\Thelia\Model\ProfileModuleQuery');
     }
 
     /**

core/lib/Thelia/Model/Base/OrderProduct.php

@@ -145,6 +145,12 @@ abstract class OrderProduct implements ActiveRecordInterface
      */
     protected $weight;
 
+    /**
+     * The value for the ean_code field.
+     * @var        string
+     */
+    protected $ean_code;
+
     /**
      * The value for the tax_rule_title field.
      * @var        string
@@ -624,6 +630,17 @@ abstract class OrderProduct implements ActiveRecordInterface
         return $this->weight;
     }
 
+    /**
+     * Get the [ean_code] column value.
+     *
+     * @return   string
+     */
+    public function getEanCode()
+    {
+
+        return $this->ean_code;
+    }
+
     /**
      * Get the [tax_rule_title] column value.
      *
@@ -995,6 +1012,27 @@ abstract class OrderProduct implements ActiveRecordInterface
         return $this;
     } // setWeight()
 
+    /**
+     * Set the value of [ean_code] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\OrderProduct The current object (for fluent API support)
+     */
+    public function setEanCode($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->ean_code !== $v) {
+            $this->ean_code = $v;
+            $this->modifiedColumns[] = OrderProductTableMap::EAN_CODE;
+        }
+
+
+        return $this;
+    } // setEanCode()
+
     /**
      * Set the value of [tax_rule_title] column.
      *
@@ -1179,22 +1217,25 @@ abstract class OrderProduct implements ActiveRecordInterface
             $col = $row[TableMap::TYPE_NUM == $indexType ? 13 + $startcol : OrderProductTableMap::translateFieldName('Weight', TableMap::TYPE_PHPNAME, $indexType)];
             $this->weight = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : OrderProductTableMap::translateFieldName('TaxRuleTitle', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 14 + $startcol : OrderProductTableMap::translateFieldName('EanCode', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->ean_code = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : OrderProductTableMap::translateFieldName('TaxRuleTitle', TableMap::TYPE_PHPNAME, $indexType)];
             $this->tax_rule_title = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 15 + $startcol : OrderProductTableMap::translateFieldName('TaxRuleDescription', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : OrderProductTableMap::translateFieldName('TaxRuleDescription', TableMap::TYPE_PHPNAME, $indexType)];
             $this->tax_rule_description = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 16 + $startcol : OrderProductTableMap::translateFieldName('Parent', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 17 + $startcol : OrderProductTableMap::translateFieldName('Parent', TableMap::TYPE_PHPNAME, $indexType)];
             $this->parent = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 17 + $startcol : OrderProductTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 18 + $startcol : OrderProductTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 18 + $startcol : OrderProductTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 19 + $startcol : OrderProductTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
@@ -1207,7 +1248,7 @@ abstract class OrderProduct implements ActiveRecordInterface
                 $this->ensureConsistency();
             }
 
-            return $startcol + 19; // 19 = OrderProductTableMap::NUM_HYDRATE_COLUMNS.
+            return $startcol + 20; // 20 = OrderProductTableMap::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
             throw new PropelException("Error populating \Thelia\Model\OrderProduct object", 0, $e);
@@ -1523,6 +1564,9 @@ abstract class OrderProduct implements ActiveRecordInterface
         if ($this->isColumnModified(OrderProductTableMap::WEIGHT)) {
             $modifiedColumns[':p' . $index++]  = 'WEIGHT';
         }
+        if ($this->isColumnModified(OrderProductTableMap::EAN_CODE)) {
+            $modifiedColumns[':p' . $index++]  = 'EAN_CODE';
+        }
         if ($this->isColumnModified(OrderProductTableMap::TAX_RULE_TITLE)) {
             $modifiedColumns[':p' . $index++]  = 'TAX_RULE_TITLE';
         }
@@ -1591,6 +1635,9 @@ abstract class OrderProduct implements ActiveRecordInterface
                     case 'WEIGHT':
                         $stmt->bindValue($identifier, $this->weight, PDO::PARAM_STR);
                         break;
+                    case 'EAN_CODE':
+                        $stmt->bindValue($identifier, $this->ean_code, PDO::PARAM_STR);
+                        break;
                     case 'TAX_RULE_TITLE':
                         $stmt->bindValue($identifier, $this->tax_rule_title, PDO::PARAM_STR);
                         break;
@@ -1711,18 +1758,21 @@ abstract class OrderProduct implements ActiveRecordInterface
                 return $this->getWeight();
                 break;
             case 14:
-                return $this->getTaxRuleTitle();
+                return $this->getEanCode();
                 break;
             case 15:
-                return $this->getTaxRuleDescription();
+                return $this->getTaxRuleTitle();
                 break;
             case 16:
-                return $this->getParent();
+                return $this->getTaxRuleDescription();
                 break;
             case 17:
-                return $this->getCreatedAt();
+                return $this->getParent();
                 break;
             case 18:
+                return $this->getCreatedAt();
+                break;
+            case 19:
                 return $this->getUpdatedAt();
                 break;
             default:
@@ -1768,11 +1818,12 @@ abstract class OrderProduct implements ActiveRecordInterface
             $keys[11] => $this->getWasNew(),
             $keys[12] => $this->getWasInPromo(),
             $keys[13] => $this->getWeight(),
-            $keys[14] => $this->getTaxRuleTitle(),
-            $keys[15] => $this->getTaxRuleDescription(),
-            $keys[16] => $this->getParent(),
-            $keys[17] => $this->getCreatedAt(),
-            $keys[18] => $this->getUpdatedAt(),
+            $keys[14] => $this->getEanCode(),
+            $keys[15] => $this->getTaxRuleTitle(),
+            $keys[16] => $this->getTaxRuleDescription(),
+            $keys[17] => $this->getParent(),
+            $keys[18] => $this->getCreatedAt(),
+            $keys[19] => $this->getUpdatedAt(),
         );
         $virtualColumns = $this->virtualColumns;
         foreach ($virtualColumns as $key => $virtualColumn) {
@@ -1866,18 +1917,21 @@ abstract class OrderProduct implements ActiveRecordInterface
                 $this->setWeight($value);
                 break;
             case 14:
-                $this->setTaxRuleTitle($value);
+                $this->setEanCode($value);
                 break;
             case 15:
-                $this->setTaxRuleDescription($value);
+                $this->setTaxRuleTitle($value);
                 break;
             case 16:
-                $this->setParent($value);
+                $this->setTaxRuleDescription($value);
                 break;
             case 17:
-                $this->setCreatedAt($value);
+                $this->setParent($value);
                 break;
             case 18:
+                $this->setCreatedAt($value);
+                break;
+            case 19:
                 $this->setUpdatedAt($value);
                 break;
         } // switch()
@@ -1918,11 +1972,12 @@ abstract class OrderProduct implements ActiveRecordInterface
         if (array_key_exists($keys[11], $arr)) $this->setWasNew($arr[$keys[11]]);
         if (array_key_exists($keys[12], $arr)) $this->setWasInPromo($arr[$keys[12]]);
         if (array_key_exists($keys[13], $arr)) $this->setWeight($arr[$keys[13]]);
-        if (array_key_exists($keys[14], $arr)) $this->setTaxRuleTitle($arr[$keys[14]]);
-        if (array_key_exists($keys[15], $arr)) $this->setTaxRuleDescription($arr[$keys[15]]);
-        if (array_key_exists($keys[16], $arr)) $this->setParent($arr[$keys[16]]);
-        if (array_key_exists($keys[17], $arr)) $this->setCreatedAt($arr[$keys[17]]);
-        if (array_key_exists($keys[18], $arr)) $this->setUpdatedAt($arr[$keys[18]]);
+        if (array_key_exists($keys[14], $arr)) $this->setEanCode($arr[$keys[14]]);
+        if (array_key_exists($keys[15], $arr)) $this->setTaxRuleTitle($arr[$keys[15]]);
+        if (array_key_exists($keys[16], $arr)) $this->setTaxRuleDescription($arr[$keys[16]]);
+        if (array_key_exists($keys[17], $arr)) $this->setParent($arr[$keys[17]]);
+        if (array_key_exists($keys[18], $arr)) $this->setCreatedAt($arr[$keys[18]]);
+        if (array_key_exists($keys[19], $arr)) $this->setUpdatedAt($arr[$keys[19]]);
     }
 
     /**
@@ -1948,6 +2003,7 @@ abstract class OrderProduct implements ActiveRecordInterface
         if ($this->isColumnModified(OrderProductTableMap::WAS_NEW)) $criteria->add(OrderProductTableMap::WAS_NEW, $this->was_new);
         if ($this->isColumnModified(OrderProductTableMap::WAS_IN_PROMO)) $criteria->add(OrderProductTableMap::WAS_IN_PROMO, $this->was_in_promo);
         if ($this->isColumnModified(OrderProductTableMap::WEIGHT)) $criteria->add(OrderProductTableMap::WEIGHT, $this->weight);
+        if ($this->isColumnModified(OrderProductTableMap::EAN_CODE)) $criteria->add(OrderProductTableMap::EAN_CODE, $this->ean_code);
         if ($this->isColumnModified(OrderProductTableMap::TAX_RULE_TITLE)) $criteria->add(OrderProductTableMap::TAX_RULE_TITLE, $this->tax_rule_title);
         if ($this->isColumnModified(OrderProductTableMap::TAX_RULE_DESCRIPTION)) $criteria->add(OrderProductTableMap::TAX_RULE_DESCRIPTION, $this->tax_rule_description);
         if ($this->isColumnModified(OrderProductTableMap::PARENT)) $criteria->add(OrderProductTableMap::PARENT, $this->parent);
@@ -2029,6 +2085,7 @@ abstract class OrderProduct implements ActiveRecordInterface
         $copyObj->setWasNew($this->getWasNew());
         $copyObj->setWasInPromo($this->getWasInPromo());
         $copyObj->setWeight($this->getWeight());
+        $copyObj->setEanCode($this->getEanCode());
         $copyObj->setTaxRuleTitle($this->getTaxRuleTitle());
         $copyObj->setTaxRuleDescription($this->getTaxRuleDescription());
         $copyObj->setParent($this->getParent());
@@ -2607,6 +2664,7 @@ abstract class OrderProduct implements ActiveRecordInterface
         $this->was_new = null;
         $this->was_in_promo = null;
         $this->weight = null;
+        $this->ean_code = null;
         $this->tax_rule_title = null;
         $this->tax_rule_description = null;
         $this->parent = null;

core/lib/Thelia/Model/Base/OrderProductQuery.php

@@ -35,6 +35,7 @@ use Thelia\Model\Map\OrderProductTableMap;
  * @method     ChildOrderProductQuery orderByWasNew($order = Criteria::ASC) Order by the was_new column
  * @method     ChildOrderProductQuery orderByWasInPromo($order = Criteria::ASC) Order by the was_in_promo column
  * @method     ChildOrderProductQuery orderByWeight($order = Criteria::ASC) Order by the weight column
+ * @method     ChildOrderProductQuery orderByEanCode($order = Criteria::ASC) Order by the ean_code column
  * @method     ChildOrderProductQuery orderByTaxRuleTitle($order = Criteria::ASC) Order by the tax_rule_title column
  * @method     ChildOrderProductQuery orderByTaxRuleDescription($order = Criteria::ASC) Order by the tax_rule_description column
  * @method     ChildOrderProductQuery orderByParent($order = Criteria::ASC) Order by the parent column
@@ -55,6 +56,7 @@ use Thelia\Model\Map\OrderProductTableMap;
  * @method     ChildOrderProductQuery groupByWasNew() Group by the was_new column
  * @method     ChildOrderProductQuery groupByWasInPromo() Group by the was_in_promo column
  * @method     ChildOrderProductQuery groupByWeight() Group by the weight column
+ * @method     ChildOrderProductQuery groupByEanCode() Group by the ean_code column
  * @method     ChildOrderProductQuery groupByTaxRuleTitle() Group by the tax_rule_title column
  * @method     ChildOrderProductQuery groupByTaxRuleDescription() Group by the tax_rule_description column
  * @method     ChildOrderProductQuery groupByParent() Group by the parent column
@@ -94,6 +96,7 @@ use Thelia\Model\Map\OrderProductTableMap;
  * @method     ChildOrderProduct findOneByWasNew(int $was_new) Return the first ChildOrderProduct filtered by the was_new column
  * @method     ChildOrderProduct findOneByWasInPromo(int $was_in_promo) Return the first ChildOrderProduct filtered by the was_in_promo column
  * @method     ChildOrderProduct findOneByWeight(string $weight) Return the first ChildOrderProduct filtered by the weight column
+ * @method     ChildOrderProduct findOneByEanCode(string $ean_code) Return the first ChildOrderProduct filtered by the ean_code column
  * @method     ChildOrderProduct findOneByTaxRuleTitle(string $tax_rule_title) Return the first ChildOrderProduct filtered by the tax_rule_title column
  * @method     ChildOrderProduct findOneByTaxRuleDescription(string $tax_rule_description) Return the first ChildOrderProduct filtered by the tax_rule_description column
  * @method     ChildOrderProduct findOneByParent(int $parent) Return the first ChildOrderProduct filtered by the parent column
@@ -114,6 +117,7 @@ use Thelia\Model\Map\OrderProductTableMap;
  * @method     array findByWasNew(int $was_new) Return ChildOrderProduct objects filtered by the was_new column
  * @method     array findByWasInPromo(int $was_in_promo) Return ChildOrderProduct objects filtered by the was_in_promo column
  * @method     array findByWeight(string $weight) Return ChildOrderProduct objects filtered by the weight column
+ * @method     array findByEanCode(string $ean_code) Return ChildOrderProduct objects filtered by the ean_code column
  * @method     array findByTaxRuleTitle(string $tax_rule_title) Return ChildOrderProduct objects filtered by the tax_rule_title column
  * @method     array findByTaxRuleDescription(string $tax_rule_description) Return ChildOrderProduct objects filtered by the tax_rule_description column
  * @method     array findByParent(int $parent) Return ChildOrderProduct objects filtered by the parent column
@@ -207,7 +211,7 @@ abstract class OrderProductQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT ID, ORDER_ID, PRODUCT_REF, PRODUCT_SALE_ELEMENTS_REF, TITLE, CHAPO, DESCRIPTION, POSTSCRIPTUM, QUANTITY, PRICE, PROMO_PRICE, WAS_NEW, WAS_IN_PROMO, WEIGHT, TAX_RULE_TITLE, TAX_RULE_DESCRIPTION, PARENT, CREATED_AT, UPDATED_AT FROM order_product WHERE ID = :p0';
+        $sql = 'SELECT ID, ORDER_ID, PRODUCT_REF, PRODUCT_SALE_ELEMENTS_REF, TITLE, CHAPO, DESCRIPTION, POSTSCRIPTUM, QUANTITY, PRICE, PROMO_PRICE, WAS_NEW, WAS_IN_PROMO, WEIGHT, EAN_CODE, TAX_RULE_TITLE, TAX_RULE_DESCRIPTION, PARENT, CREATED_AT, UPDATED_AT FROM order_product WHERE ID = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -776,6 +780,35 @@ abstract class OrderProductQuery extends ModelCriteria
         return $this->addUsingAlias(OrderProductTableMap::WEIGHT, $weight, $comparison);
     }
 
+    /**
+     * Filter the query on the ean_code column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByEanCode('fooValue');   // WHERE ean_code = 'fooValue'
+     * $query->filterByEanCode('%fooValue%'); // WHERE ean_code LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $eanCode The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildOrderProductQuery The current query, for fluid interface
+     */
+    public function filterByEanCode($eanCode = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($eanCode)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $eanCode)) {
+                $eanCode = str_replace('*', '%', $eanCode);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(OrderProductTableMap::EAN_CODE, $eanCode, $comparison);
+    }
+
     /**
      * Filter the query on the tax_rule_title column
      *

core/lib/Thelia/Model/Base/ProductSaleElements.php

@@ -115,6 +115,12 @@ abstract class ProductSaleElements implements ActiveRecordInterface
      */
     protected $is_default;
 
+    /**
+     * The value for the ean_code field.
+     * @var        string
+     */
+    protected $ean_code;
+
     /**
      * The value for the created_at field.
      * @var        string
@@ -538,6 +544,17 @@ abstract class ProductSaleElements implements ActiveRecordInterface
         return $this->is_default;
     }
 
+    /**
+     * Get the [ean_code] column value.
+     *
+     * @return   string
+     */
+    public function getEanCode()
+    {
+
+        return $this->ean_code;
+    }
+
     /**
      * Get the [optionally formatted] temporal [created_at] column value.
      *
@@ -758,6 +775,27 @@ abstract class ProductSaleElements implements ActiveRecordInterface
         return $this;
     } // setIsDefault()
 
+    /**
+     * Set the value of [ean_code] column.
+     *
+     * @param      string $v new value
+     * @return   \Thelia\Model\ProductSaleElements The current object (for fluent API support)
+     */
+    public function setEanCode($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if ($this->ean_code !== $v) {
+            $this->ean_code = $v;
+            $this->modifiedColumns[] = ProductSaleElementsTableMap::EAN_CODE;
+        }
+
+
+        return $this;
+    } // setEanCode()
+
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
      *
@@ -877,13 +915,16 @@ abstract class ProductSaleElements implements ActiveRecordInterface
             $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : ProductSaleElementsTableMap::translateFieldName('IsDefault', TableMap::TYPE_PHPNAME, $indexType)];
             $this->is_default = (null !== $col) ? (boolean) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : ProductSaleElementsTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : ProductSaleElementsTableMap::translateFieldName('EanCode', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->ean_code = (null !== $col) ? (string) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : ProductSaleElementsTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
             $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 9 + $startcol : ProductSaleElementsTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 10 + $startcol : ProductSaleElementsTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
             if ($col === '0000-00-00 00:00:00') {
                 $col = null;
             }
@@ -896,7 +937,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface
                 $this->ensureConsistency();
             }
 
-            return $startcol + 10; // 10 = ProductSaleElementsTableMap::NUM_HYDRATE_COLUMNS.
+            return $startcol + 11; // 11 = ProductSaleElementsTableMap::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
             throw new PropelException("Error populating \Thelia\Model\ProductSaleElements object", 0, $e);
@@ -1213,6 +1254,9 @@ abstract class ProductSaleElements implements ActiveRecordInterface
         if ($this->isColumnModified(ProductSaleElementsTableMap::IS_DEFAULT)) {
             $modifiedColumns[':p' . $index++]  = 'IS_DEFAULT';
         }
+        if ($this->isColumnModified(ProductSaleElementsTableMap::EAN_CODE)) {
+            $modifiedColumns[':p' . $index++]  = 'EAN_CODE';
+        }
         if ($this->isColumnModified(ProductSaleElementsTableMap::CREATED_AT)) {
             $modifiedColumns[':p' . $index++]  = 'CREATED_AT';
         }
@@ -1254,6 +1298,9 @@ abstract class ProductSaleElements implements ActiveRecordInterface
                     case 'IS_DEFAULT':
                         $stmt->bindValue($identifier, (int) $this->is_default, PDO::PARAM_INT);
                         break;
+                    case 'EAN_CODE':
+                        $stmt->bindValue($identifier, $this->ean_code, PDO::PARAM_STR);
+                        break;
                     case 'CREATED_AT':
                         $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
                         break;
@@ -1347,9 +1394,12 @@ abstract class ProductSaleElements implements ActiveRecordInterface
                 return $this->getIsDefault();
                 break;
             case 8:
-                return $this->getCreatedAt();
+                return $this->getEanCode();
                 break;
             case 9:
+                return $this->getCreatedAt();
+                break;
+            case 10:
                 return $this->getUpdatedAt();
                 break;
             default:
@@ -1389,8 +1439,9 @@ abstract class ProductSaleElements implements ActiveRecordInterface
             $keys[5] => $this->getNewness(),
             $keys[6] => $this->getWeight(),
             $keys[7] => $this->getIsDefault(),
-            $keys[8] => $this->getCreatedAt(),
-            $keys[9] => $this->getUpdatedAt(),
+            $keys[8] => $this->getEanCode(),
+            $keys[9] => $this->getCreatedAt(),
+            $keys[10] => $this->getUpdatedAt(),
         );
         $virtualColumns = $this->virtualColumns;
         foreach ($virtualColumns as $key => $virtualColumn) {
@@ -1469,9 +1520,12 @@ abstract class ProductSaleElements implements ActiveRecordInterface
                 $this->setIsDefault($value);
                 break;
             case 8:
-                $this->setCreatedAt($value);
+                $this->setEanCode($value);
                 break;
             case 9:
+                $this->setCreatedAt($value);
+                break;
+            case 10:
                 $this->setUpdatedAt($value);
                 break;
         } // switch()
@@ -1506,8 +1560,9 @@ abstract class ProductSaleElements implements ActiveRecordInterface
         if (array_key_exists($keys[5], $arr)) $this->setNewness($arr[$keys[5]]);
         if (array_key_exists($keys[6], $arr)) $this->setWeight($arr[$keys[6]]);
         if (array_key_exists($keys[7], $arr)) $this->setIsDefault($arr[$keys[7]]);
-        if (array_key_exists($keys[8], $arr)) $this->setCreatedAt($arr[$keys[8]]);
-        if (array_key_exists($keys[9], $arr)) $this->setUpdatedAt($arr[$keys[9]]);
+        if (array_key_exists($keys[8], $arr)) $this->setEanCode($arr[$keys[8]]);
+        if (array_key_exists($keys[9], $arr)) $this->setCreatedAt($arr[$keys[9]]);
+        if (array_key_exists($keys[10], $arr)) $this->setUpdatedAt($arr[$keys[10]]);
     }
 
     /**
@@ -1527,6 +1582,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface
         if ($this->isColumnModified(ProductSaleElementsTableMap::NEWNESS)) $criteria->add(ProductSaleElementsTableMap::NEWNESS, $this->newness);
         if ($this->isColumnModified(ProductSaleElementsTableMap::WEIGHT)) $criteria->add(ProductSaleElementsTableMap::WEIGHT, $this->weight);
         if ($this->isColumnModified(ProductSaleElementsTableMap::IS_DEFAULT)) $criteria->add(ProductSaleElementsTableMap::IS_DEFAULT, $this->is_default);
+        if ($this->isColumnModified(ProductSaleElementsTableMap::EAN_CODE)) $criteria->add(ProductSaleElementsTableMap::EAN_CODE, $this->ean_code);
         if ($this->isColumnModified(ProductSaleElementsTableMap::CREATED_AT)) $criteria->add(ProductSaleElementsTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(ProductSaleElementsTableMap::UPDATED_AT)) $criteria->add(ProductSaleElementsTableMap::UPDATED_AT, $this->updated_at);
 
@@ -1599,6 +1655,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface
         $copyObj->setNewness($this->getNewness());
         $copyObj->setWeight($this->getWeight());
         $copyObj->setIsDefault($this->getIsDefault());
+        $copyObj->setEanCode($this->getEanCode());
         $copyObj->setCreatedAt($this->getCreatedAt());
         $copyObj->setUpdatedAt($this->getUpdatedAt());
 
@@ -2526,6 +2583,7 @@ abstract class ProductSaleElements implements ActiveRecordInterface
         $this->newness = null;
         $this->weight = null;
         $this->is_default = null;
+        $this->ean_code = null;
         $this->created_at = null;
         $this->updated_at = null;
         $this->alreadyInSave = false;

core/lib/Thelia/Model/Base/ProductSaleElementsQuery.php

@@ -29,6 +29,7 @@ use Thelia\Model\Map\ProductSaleElementsTableMap;
  * @method     ChildProductSaleElementsQuery orderByNewness($order = Criteria::ASC) Order by the newness column
  * @method     ChildProductSaleElementsQuery orderByWeight($order = Criteria::ASC) Order by the weight column
  * @method     ChildProductSaleElementsQuery orderByIsDefault($order = Criteria::ASC) Order by the is_default column
+ * @method     ChildProductSaleElementsQuery orderByEanCode($order = Criteria::ASC) Order by the ean_code column
  * @method     ChildProductSaleElementsQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
  * @method     ChildProductSaleElementsQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
  *
@@ -40,6 +41,7 @@ use Thelia\Model\Map\ProductSaleElementsTableMap;
  * @method     ChildProductSaleElementsQuery groupByNewness() Group by the newness column
  * @method     ChildProductSaleElementsQuery groupByWeight() Group by the weight column
  * @method     ChildProductSaleElementsQuery groupByIsDefault() Group by the is_default column
+ * @method     ChildProductSaleElementsQuery groupByEanCode() Group by the ean_code column
  * @method     ChildProductSaleElementsQuery groupByCreatedAt() Group by the created_at column
  * @method     ChildProductSaleElementsQuery groupByUpdatedAt() Group by the updated_at column
  *
@@ -74,6 +76,7 @@ use Thelia\Model\Map\ProductSaleElementsTableMap;
  * @method     ChildProductSaleElements findOneByNewness(int $newness) Return the first ChildProductSaleElements filtered by the newness column
  * @method     ChildProductSaleElements findOneByWeight(double $weight) Return the first ChildProductSaleElements filtered by the weight column
  * @method     ChildProductSaleElements findOneByIsDefault(boolean $is_default) Return the first ChildProductSaleElements filtered by the is_default column
+ * @method     ChildProductSaleElements findOneByEanCode(string $ean_code) Return the first ChildProductSaleElements filtered by the ean_code column
  * @method     ChildProductSaleElements findOneByCreatedAt(string $created_at) Return the first ChildProductSaleElements filtered by the created_at column
  * @method     ChildProductSaleElements findOneByUpdatedAt(string $updated_at) Return the first ChildProductSaleElements filtered by the updated_at column
  *
@@ -85,6 +88,7 @@ use Thelia\Model\Map\ProductSaleElementsTableMap;
  * @method     array findByNewness(int $newness) Return ChildProductSaleElements objects filtered by the newness column
  * @method     array findByWeight(double $weight) Return ChildProductSaleElements objects filtered by the weight column
  * @method     array findByIsDefault(boolean $is_default) Return ChildProductSaleElements objects filtered by the is_default column
+ * @method     array findByEanCode(string $ean_code) Return ChildProductSaleElements objects filtered by the ean_code column
  * @method     array findByCreatedAt(string $created_at) Return ChildProductSaleElements objects filtered by the created_at column
  * @method     array findByUpdatedAt(string $updated_at) Return ChildProductSaleElements objects filtered by the updated_at column
  *
@@ -175,7 +179,7 @@ abstract class ProductSaleElementsQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT ID, PRODUCT_ID, REF, QUANTITY, PROMO, NEWNESS, WEIGHT, IS_DEFAULT, CREATED_AT, UPDATED_AT FROM product_sale_elements WHERE ID = :p0';
+        $sql = 'SELECT ID, PRODUCT_ID, REF, QUANTITY, PROMO, NEWNESS, WEIGHT, IS_DEFAULT, EAN_CODE, CREATED_AT, UPDATED_AT FROM product_sale_elements WHERE ID = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -568,6 +572,35 @@ abstract class ProductSaleElementsQuery extends ModelCriteria
         return $this->addUsingAlias(ProductSaleElementsTableMap::IS_DEFAULT, $isDefault, $comparison);
     }
 
+    /**
+     * Filter the query on the ean_code column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByEanCode('fooValue');   // WHERE ean_code = 'fooValue'
+     * $query->filterByEanCode('%fooValue%'); // WHERE ean_code LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $eanCode The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildProductSaleElementsQuery The current query, for fluid interface
+     */
+    public function filterByEanCode($eanCode = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($eanCode)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $eanCode)) {
+                $eanCode = str_replace('*', '%', $eanCode);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(ProductSaleElementsTableMap::EAN_CODE, $eanCode, $comparison);
+    }
+
     /**
      * Filter the query on the created_at column
      *

core/lib/Thelia/Model/Base/Resource.php

@@ -17,10 +17,10 @@ use Propel\Runtime\Exception\PropelException;
 use Propel\Runtime\Map\TableMap;
 use Propel\Runtime\Parser\AbstractParser;
 use Propel\Runtime\Util\PropelDateTime;
-use Thelia\Model\Group as ChildGroup;
-use Thelia\Model\GroupQuery as ChildGroupQuery;
-use Thelia\Model\GroupResource as ChildGroupResource;
-use Thelia\Model\GroupResourceQuery as ChildGroupResourceQuery;
+use Thelia\Model\Profile as ChildProfile;
+use Thelia\Model\ProfileQuery as ChildProfileQuery;
+use Thelia\Model\ProfileResource as ChildProfileResource;
+use Thelia\Model\ProfileResourceQuery as ChildProfileResourceQuery;
 use Thelia\Model\Resource as ChildResource;
 use Thelia\Model\ResourceI18n as ChildResourceI18n;
 use Thelia\Model\ResourceI18nQuery as ChildResourceI18nQuery;
@@ -86,10 +86,10 @@ abstract class Resource implements ActiveRecordInterface
     protected $updated_at;
 
     /**
-     * @var        ObjectCollection|ChildGroupResource[] Collection to store aggregation of ChildGroupResource objects.
+     * @var        ObjectCollection|ChildProfileResource[] Collection to store aggregation of ChildProfileResource objects.
      */
-    protected $collGroupResources;
-    protected $collGroupResourcesPartial;
+    protected $collProfileResources;
+    protected $collProfileResourcesPartial;
 
     /**
      * @var        ObjectCollection|ChildResourceI18n[] Collection to store aggregation of ChildResourceI18n objects.
@@ -98,9 +98,9 @@ abstract class Resource implements ActiveRecordInterface
     protected $collResourceI18nsPartial;
 
     /**
-     * @var        ChildGroup[] Collection to store aggregation of ChildGroup objects.
+     * @var        ChildProfile[] Collection to store aggregation of ChildProfile objects.
      */
-    protected $collGroups;
+    protected $collProfiles;
 
     /**
      * Flag to prevent endless save loop, if this object is referenced
@@ -128,13 +128,13 @@ abstract class Resource implements ActiveRecordInterface
      * An array of objects scheduled for deletion.
      * @var ObjectCollection
      */
-    protected $groupsScheduledForDeletion = null;
+    protected $profilesScheduledForDeletion = null;
 
     /**
      * An array of objects scheduled for deletion.
      * @var ObjectCollection
      */
-    protected $groupResourcesScheduledForDeletion = null;
+    protected $profileResourcesScheduledForDeletion = null;
 
     /**
      * An array of objects scheduled for deletion.
@@ -669,11 +669,11 @@ abstract class Resource implements ActiveRecordInterface
 
         if ($deep) {  // also de-associate any related objects?
 
-            $this->collGroupResources = null;
+            $this->collProfileResources = null;
 
             $this->collResourceI18ns = null;
 
-            $this->collGroups = null;
+            $this->collProfiles = null;
         } // if (deep)
     }
 
@@ -807,44 +807,44 @@ abstract class Resource implements ActiveRecordInterface
                 $this->resetModified();
             }
 
-            if ($this->groupsScheduledForDeletion !== null) {
-                if (!$this->groupsScheduledForDeletion->isEmpty()) {
+            if ($this->profilesScheduledForDeletion !== null) {
+                if (!$this->profilesScheduledForDeletion->isEmpty()) {
                     $pks = array();
                     $pk  = $this->getPrimaryKey();
-                    foreach ($this->groupsScheduledForDeletion->getPrimaryKeys(false) as $remotePk) {
+                    foreach ($this->profilesScheduledForDeletion->getPrimaryKeys(false) as $remotePk) {
                         $pks[] = array($remotePk, $pk);
                     }
 
-                    GroupResourceQuery::create()
+                    ProfileResourceQuery::create()
                         ->filterByPrimaryKeys($pks)
                         ->delete($con);
-                    $this->groupsScheduledForDeletion = null;
+                    $this->profilesScheduledForDeletion = null;
                 }
 
-                foreach ($this->getGroups() as $group) {
-                    if ($group->isModified()) {
-                        $group->save($con);
+                foreach ($this->getProfiles() as $profile) {
+                    if ($profile->isModified()) {
+                        $profile->save($con);
                     }
                 }
-            } elseif ($this->collGroups) {
-                foreach ($this->collGroups as $group) {
-                    if ($group->isModified()) {
-                        $group->save($con);
+            } elseif ($this->collProfiles) {
+                foreach ($this->collProfiles as $profile) {
+                    if ($profile->isModified()) {
+                        $profile->save($con);
                     }
                 }
             }
 
-            if ($this->groupResourcesScheduledForDeletion !== null) {
-                if (!$this->groupResourcesScheduledForDeletion->isEmpty()) {
-                    \Thelia\Model\GroupResourceQuery::create()
-                        ->filterByPrimaryKeys($this->groupResourcesScheduledForDeletion->getPrimaryKeys(false))
+            if ($this->profileResourcesScheduledForDeletion !== null) {
+                if (!$this->profileResourcesScheduledForDeletion->isEmpty()) {
+                    \Thelia\Model\ProfileResourceQuery::create()
+                        ->filterByPrimaryKeys($this->profileResourcesScheduledForDeletion->getPrimaryKeys(false))
                         ->delete($con);
-                    $this->groupResourcesScheduledForDeletion = null;
+                    $this->profileResourcesScheduledForDeletion = null;
                 }
             }
 
-                if ($this->collGroupResources !== null) {
-            foreach ($this->collGroupResources as $referrerFK) {
+                if ($this->collProfileResources !== null) {
+            foreach ($this->collProfileResources as $referrerFK) {
                     if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
                         $affectedRows += $referrerFK->save($con);
                     }
@@ -1043,8 +1043,8 @@ abstract class Resource implements ActiveRecordInterface
         }
 
         if ($includeForeignObjects) {
-            if (null !== $this->collGroupResources) {
-                $result['GroupResources'] = $this->collGroupResources->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+            if (null !== $this->collProfileResources) {
+                $result['ProfileResources'] = $this->collProfileResources->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
             }
             if (null !== $this->collResourceI18ns) {
                 $result['ResourceI18ns'] = $this->collResourceI18ns->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
@@ -1210,9 +1210,9 @@ abstract class Resource implements ActiveRecordInterface
             // the getter/setter methods for fkey referrer objects.
             $copyObj->setNew(false);
 
-            foreach ($this->getGroupResources() as $relObj) {
+            foreach ($this->getProfileResources() as $relObj) {
                 if ($relObj !== $this) {  // ensure that we don't try to copy a reference to ourselves
-                    $copyObj->addGroupResource($relObj->copy($deepCopy));
+                    $copyObj->addProfileResource($relObj->copy($deepCopy));
                 }
             }
 
@@ -1263,8 +1263,8 @@ abstract class Resource implements ActiveRecordInterface
      */
     public function initRelation($relationName)
     {
-        if ('GroupResource' == $relationName) {
-            return $this->initGroupResources();
+        if ('ProfileResource' == $relationName) {
+            return $this->initProfileResources();
         }
         if ('ResourceI18n' == $relationName) {
             return $this->initResourceI18ns();
@@ -1272,31 +1272,31 @@ abstract class Resource implements ActiveRecordInterface
     }
 
     /**
-     * Clears out the collGroupResources collection
+     * Clears out the collProfileResources collection
      *
      * This does not modify the database; however, it will remove any associated objects, causing
      * them to be refetched by subsequent calls to accessor method.
      *
      * @return void
-     * @see        addGroupResources()
+     * @see        addProfileResources()
      */
-    public function clearGroupResources()
+    public function clearProfileResources()
     {
-        $this->collGroupResources = null; // important to set this to NULL since that means it is uninitialized
+        $this->collProfileResources = null; // important to set this to NULL since that means it is uninitialized
     }
 
     /**
-     * Reset is the collGroupResources collection loaded partially.
+     * Reset is the collProfileResources collection loaded partially.
      */
-    public function resetPartialGroupResources($v = true)
+    public function resetPartialProfileResources($v = true)
     {
-        $this->collGroupResourcesPartial = $v;
+        $this->collProfileResourcesPartial = $v;
     }
 
     /**
-     * Initializes the collGroupResources collection.
+     * Initializes the collProfileResources collection.
      *
-     * By default this just sets the collGroupResources collection to an empty array (like clearcollGroupResources());
+     * By default this just sets the collProfileResources collection to an empty array (like clearcollProfileResources());
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
@@ -1305,17 +1305,17 @@ abstract class Resource implements ActiveRecordInterface
      *
      * @return void
      */
-    public function initGroupResources($overrideExisting = true)
+    public function initProfileResources($overrideExisting = true)
     {
-        if (null !== $this->collGroupResources && !$overrideExisting) {
+        if (null !== $this->collProfileResources && !$overrideExisting) {
             return;
         }
-        $this->collGroupResources = new ObjectCollection();
-        $this->collGroupResources->setModel('\Thelia\Model\GroupResource');
+        $this->collProfileResources = new ObjectCollection();
+        $this->collProfileResources->setModel('\Thelia\Model\ProfileResource');
     }
 
     /**
-     * Gets an array of ChildGroupResource objects which contain a foreign key that references this object.
+     * Gets an array of ChildProfileResource objects which contain a foreign key that references this object.
      *
      * If the $criteria is not null, it is used to always fetch the results from the database.
      * Otherwise the results are fetched from the database the first time, then cached.
@@ -1325,112 +1325,112 @@ abstract class Resource implements ActiveRecordInterface
      *
      * @param      Criteria $criteria optional Criteria object to narrow the query
      * @param      ConnectionInterface $con optional connection object
-     * @return Collection|ChildGroupResource[] List of ChildGroupResource objects
+     * @return Collection|ChildProfileResource[] List of ChildProfileResource objects
      * @throws PropelException
      */
-    public function getGroupResources($criteria = null, ConnectionInterface $con = null)
+    public function getProfileResources($criteria = null, ConnectionInterface $con = null)
     {
-        $partial = $this->collGroupResourcesPartial && !$this->isNew();
-        if (null === $this->collGroupResources || null !== $criteria  || $partial) {
-            if ($this->isNew() && null === $this->collGroupResources) {
+        $partial = $this->collProfileResourcesPartial && !$this->isNew();
+        if (null === $this->collProfileResources || null !== $criteria  || $partial) {
+            if ($this->isNew() && null === $this->collProfileResources) {
                 // return empty collection
-                $this->initGroupResources();
+                $this->initProfileResources();
             } else {
-                $collGroupResources = ChildGroupResourceQuery::create(null, $criteria)
+                $collProfileResources = ChildProfileResourceQuery::create(null, $criteria)
                     ->filterByResource($this)
                     ->find($con);
 
                 if (null !== $criteria) {
-                    if (false !== $this->collGroupResourcesPartial && count($collGroupResources)) {
-                        $this->initGroupResources(false);
+                    if (false !== $this->collProfileResourcesPartial && count($collProfileResources)) {
+                        $this->initProfileResources(false);
 
-                        foreach ($collGroupResources as $obj) {
-                            if (false == $this->collGroupResources->contains($obj)) {
-                                $this->collGroupResources->append($obj);
+                        foreach ($collProfileResources as $obj) {
+                            if (false == $this->collProfileResources->contains($obj)) {
+                                $this->collProfileResources->append($obj);
                             }
                         }
 
-                        $this->collGroupResourcesPartial = true;
+                        $this->collProfileResourcesPartial = true;
                     }
 
-                    $collGroupResources->getInternalIterator()->rewind();
+                    $collProfileResources->getInternalIterator()->rewind();
 
-                    return $collGroupResources;
+                    return $collProfileResources;
                 }
 
-                if ($partial && $this->collGroupResources) {
-                    foreach ($this->collGroupResources as $obj) {
+                if ($partial && $this->collProfileResources) {
+                    foreach ($this->collProfileResources as $obj) {
                         if ($obj->isNew()) {
-                            $collGroupResources[] = $obj;
+                            $collProfileResources[] = $obj;
                         }
                     }
                 }
 
-                $this->collGroupResources = $collGroupResources;
-                $this->collGroupResourcesPartial = false;
+                $this->collProfileResources = $collProfileResources;
+                $this->collProfileResourcesPartial = false;
             }
         }
 
-        return $this->collGroupResources;
+        return $this->collProfileResources;
     }
 
     /**
-     * Sets a collection of GroupResource objects related by a one-to-many relationship
+     * Sets a collection of ProfileResource objects related by a one-to-many relationship
      * to the current object.
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param      Collection $groupResources A Propel collection.
+     * @param      Collection $profileResources A Propel collection.
      * @param      ConnectionInterface $con Optional connection object
      * @return   ChildResource The current object (for fluent API support)
      */
-    public function setGroupResources(Collection $groupResources, ConnectionInterface $con = null)
+    public function setProfileResources(Collection $profileResources, ConnectionInterface $con = null)
     {
-        $groupResourcesToDelete = $this->getGroupResources(new Criteria(), $con)->diff($groupResources);
+        $profileResourcesToDelete = $this->getProfileResources(new Criteria(), $con)->diff($profileResources);
 
 
         //since at least one column in the foreign key is at the same time a PK
         //we can not just set a PK to NULL in the lines below. We have to store
         //a backup of all values, so we are able to manipulate these items based on the onDelete value later.
-        $this->groupResourcesScheduledForDeletion = clone $groupResourcesToDelete;
+        $this->profileResourcesScheduledForDeletion = clone $profileResourcesToDelete;
 
-        foreach ($groupResourcesToDelete as $groupResourceRemoved) {
-            $groupResourceRemoved->setResource(null);
+        foreach ($profileResourcesToDelete as $profileResourceRemoved) {
+            $profileResourceRemoved->setResource(null);
         }
 
-        $this->collGroupResources = null;
-        foreach ($groupResources as $groupResource) {
-            $this->addGroupResource($groupResource);
+        $this->collProfileResources = null;
+        foreach ($profileResources as $profileResource) {
+            $this->addProfileResource($profileResource);
         }
 
-        $this->collGroupResources = $groupResources;
-        $this->collGroupResourcesPartial = false;
+        $this->collProfileResources = $profileResources;
+        $this->collProfileResourcesPartial = false;
 
         return $this;
     }
 
     /**
-     * Returns the number of related GroupResource objects.
+     * Returns the number of related ProfileResource objects.
      *
      * @param      Criteria $criteria
      * @param      boolean $distinct
      * @param      ConnectionInterface $con
-     * @return int             Count of related GroupResource objects.
+     * @return int             Count of related ProfileResource objects.
      * @throws PropelException
      */
-    public function countGroupResources(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+    public function countProfileResources(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
     {
-        $partial = $this->collGroupResourcesPartial && !$this->isNew();
-        if (null === $this->collGroupResources || null !== $criteria || $partial) {
-            if ($this->isNew() && null === $this->collGroupResources) {
+        $partial = $this->collProfileResourcesPartial && !$this->isNew();
+        if (null === $this->collProfileResources || null !== $criteria || $partial) {
+            if ($this->isNew() && null === $this->collProfileResources) {
                 return 0;
             }
 
             if ($partial && !$criteria) {
-                return count($this->getGroupResources());
+                return count($this->getProfileResources());
             }
 
-            $query = ChildGroupResourceQuery::create(null, $criteria);
+            $query = ChildProfileResourceQuery::create(null, $criteria);
             if ($distinct) {
                 $query->distinct();
             }
@@ -1440,53 +1440,53 @@ abstract class Resource implements ActiveRecordInterface
                 ->count($con);
         }
 
-        return count($this->collGroupResources);
+        return count($this->collProfileResources);
     }
 
     /**
-     * Method called to associate a ChildGroupResource object to this object
-     * through the ChildGroupResource foreign key attribute.
+     * Method called to associate a ChildProfileResource object to this object
+     * through the ChildProfileResource foreign key attribute.
      *
-     * @param    ChildGroupResource $l ChildGroupResource
+     * @param    ChildProfileResource $l ChildProfileResource
      * @return   \Thelia\Model\Resource The current object (for fluent API support)
      */
-    public function addGroupResource(ChildGroupResource $l)
+    public function addProfileResource(ChildProfileResource $l)
     {
-        if ($this->collGroupResources === null) {
-            $this->initGroupResources();
-            $this->collGroupResourcesPartial = true;
+        if ($this->collProfileResources === null) {
+            $this->initProfileResources();
+            $this->collProfileResourcesPartial = true;
         }
 
-        if (!in_array($l, $this->collGroupResources->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
-            $this->doAddGroupResource($l);
+        if (!in_array($l, $this->collProfileResources->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+            $this->doAddProfileResource($l);
         }
 
         return $this;
     }
 
     /**
-     * @param GroupResource $groupResource The groupResource object to add.
+     * @param ProfileResource $profileResource The profileResource object to add.
      */
-    protected function doAddGroupResource($groupResource)
+    protected function doAddProfileResource($profileResource)
     {
-        $this->collGroupResources[]= $groupResource;
-        $groupResource->setResource($this);
+        $this->collProfileResources[]= $profileResource;
+        $profileResource->setResource($this);
     }
 
     /**
-     * @param  GroupResource $groupResource The groupResource object to remove.
+     * @param  ProfileResource $profileResource The profileResource object to remove.
      * @return ChildResource The current object (for fluent API support)
      */
-    public function removeGroupResource($groupResource)
+    public function removeProfileResource($profileResource)
     {
-        if ($this->getGroupResources()->contains($groupResource)) {
-            $this->collGroupResources->remove($this->collGroupResources->search($groupResource));
-            if (null === $this->groupResourcesScheduledForDeletion) {
-                $this->groupResourcesScheduledForDeletion = clone $this->collGroupResources;
-                $this->groupResourcesScheduledForDeletion->clear();
+        if ($this->getProfileResources()->contains($profileResource)) {
+            $this->collProfileResources->remove($this->collProfileResources->search($profileResource));
+            if (null === $this->profileResourcesScheduledForDeletion) {
+                $this->profileResourcesScheduledForDeletion = clone $this->collProfileResources;
+                $this->profileResourcesScheduledForDeletion->clear();
             }
-            $this->groupResourcesScheduledForDeletion[]= clone $groupResource;
-            $groupResource->setResource(null);
+            $this->profileResourcesScheduledForDeletion[]= clone $profileResource;
+            $profileResource->setResource(null);
         }
 
         return $this;
@@ -1498,7 +1498,7 @@ abstract class Resource implements ActiveRecordInterface
      * an identical criteria, it returns the collection.
      * Otherwise if this Resource is new, it will return
      * an empty collection; or if this Resource has previously
-     * been saved, it will retrieve related GroupResources from storage.
+     * been saved, it will retrieve related ProfileResources from storage.
      *
      * This method is protected by default in order to keep the public
      * api reasonable.  You can provide public methods for those you
@@ -1507,14 +1507,14 @@ abstract class Resource implements ActiveRecordInterface
      * @param      Criteria $criteria optional Criteria object to narrow the query
      * @param      ConnectionInterface $con optional connection object
      * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
-     * @return Collection|ChildGroupResource[] List of ChildGroupResource objects
+     * @return Collection|ChildProfileResource[] List of ChildProfileResource objects
      */
-    public function getGroupResourcesJoinGroup($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
+    public function getProfileResourcesJoinProfile($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
     {
-        $query = ChildGroupResourceQuery::create(null, $criteria);
-        $query->joinWith('Group', $joinBehavior);
+        $query = ChildProfileResourceQuery::create(null, $criteria);
+        $query->joinWith('Profile', $joinBehavior);
 
-        return $this->getGroupResources($query, $con);
+        return $this->getProfileResources($query, $con);
     }
 
     /**
@@ -1743,38 +1743,38 @@ abstract class Resource implements ActiveRecordInterface
     }
 
     /**
-     * Clears out the collGroups collection
+     * Clears out the collProfiles collection
      *
      * This does not modify the database; however, it will remove any associated objects, causing
      * them to be refetched by subsequent calls to accessor method.
      *
      * @return void
-     * @see        addGroups()
+     * @see        addProfiles()
      */
-    public function clearGroups()
+    public function clearProfiles()
     {
-        $this->collGroups = null; // important to set this to NULL since that means it is uninitialized
-        $this->collGroupsPartial = null;
+        $this->collProfiles = null; // important to set this to NULL since that means it is uninitialized
+        $this->collProfilesPartial = null;
     }
 
     /**
-     * Initializes the collGroups collection.
+     * Initializes the collProfiles collection.
      *
-     * By default this just sets the collGroups collection to an empty collection (like clearGroups());
+     * By default this just sets the collProfiles collection to an empty collection (like clearProfiles());
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
      * @return void
      */
-    public function initGroups()
+    public function initProfiles()
     {
-        $this->collGroups = new ObjectCollection();
-        $this->collGroups->setModel('\Thelia\Model\Group');
+        $this->collProfiles = new ObjectCollection();
+        $this->collProfiles->setModel('\Thelia\Model\Profile');
     }
 
     /**
-     * Gets a collection of ChildGroup objects related by a many-to-many relationship
-     * to the current object by way of the group_resource cross-reference table.
+     * Gets a collection of ChildProfile objects related by a many-to-many relationship
+     * to the current object by way of the profile_resource cross-reference table.
      *
      * If the $criteria is not null, it is used to always fetch the results from the database.
      * Otherwise the results are fetched from the database the first time, then cached.
@@ -1785,73 +1785,73 @@ abstract class Resource implements ActiveRecordInterface
      * @param      Criteria $criteria Optional query object to filter the query
      * @param      ConnectionInterface $con Optional connection object
      *
-     * @return ObjectCollection|ChildGroup[] List of ChildGroup objects
+     * @return ObjectCollection|ChildProfile[] List of ChildProfile objects
      */
-    public function getGroups($criteria = null, ConnectionInterface $con = null)
+    public function getProfiles($criteria = null, ConnectionInterface $con = null)
     {
-        if (null === $this->collGroups || null !== $criteria) {
-            if ($this->isNew() && null === $this->collGroups) {
+        if (null === $this->collProfiles || null !== $criteria) {
+            if ($this->isNew() && null === $this->collProfiles) {
                 // return empty collection
-                $this->initGroups();
+                $this->initProfiles();
             } else {
-                $collGroups = ChildGroupQuery::create(null, $criteria)
+                $collProfiles = ChildProfileQuery::create(null, $criteria)
                     ->filterByResource($this)
                     ->find($con);
                 if (null !== $criteria) {
-                    return $collGroups;
+                    return $collProfiles;
                 }
-                $this->collGroups = $collGroups;
+                $this->collProfiles = $collProfiles;
             }
         }
 
-        return $this->collGroups;
+        return $this->collProfiles;
     }
 
     /**
-     * Sets a collection of Group objects related by a many-to-many relationship
-     * to the current object by way of the group_resource cross-reference table.
+     * Sets a collection of Profile objects related by a many-to-many relationship
+     * to the current object by way of the profile_resource cross-reference table.
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param  Collection $groups A Propel collection.
+     * @param  Collection $profiles A Propel collection.
      * @param  ConnectionInterface $con Optional connection object
      * @return ChildResource The current object (for fluent API support)
      */
-    public function setGroups(Collection $groups, ConnectionInterface $con = null)
+    public function setProfiles(Collection $profiles, ConnectionInterface $con = null)
     {
-        $this->clearGroups();
-        $currentGroups = $this->getGroups();
+        $this->clearProfiles();
+        $currentProfiles = $this->getProfiles();
 
-        $this->groupsScheduledForDeletion = $currentGroups->diff($groups);
+        $this->profilesScheduledForDeletion = $currentProfiles->diff($profiles);
 
-        foreach ($groups as $group) {
-            if (!$currentGroups->contains($group)) {
-                $this->doAddGroup($group);
+        foreach ($profiles as $profile) {
+            if (!$currentProfiles->contains($profile)) {
+                $this->doAddProfile($profile);
             }
         }
 
-        $this->collGroups = $groups;
+        $this->collProfiles = $profiles;
 
         return $this;
     }
 
     /**
-     * Gets the number of ChildGroup objects related by a many-to-many relationship
-     * to the current object by way of the group_resource cross-reference table.
+     * Gets the number of ChildProfile objects related by a many-to-many relationship
+     * to the current object by way of the profile_resource cross-reference table.
      *
      * @param      Criteria $criteria Optional query object to filter the query
      * @param      boolean $distinct Set to true to force count distinct
      * @param      ConnectionInterface $con Optional connection object
      *
-     * @return int the number of related ChildGroup objects
+     * @return int the number of related ChildProfile objects
      */
-    public function countGroups($criteria = null, $distinct = false, ConnectionInterface $con = null)
+    public function countProfiles($criteria = null, $distinct = false, ConnectionInterface $con = null)
     {
-        if (null === $this->collGroups || null !== $criteria) {
-            if ($this->isNew() && null === $this->collGroups) {
+        if (null === $this->collProfiles || null !== $criteria) {
+            if ($this->isNew() && null === $this->collProfiles) {
                 return 0;
             } else {
-                $query = ChildGroupQuery::create(null, $criteria);
+                $query = ChildProfileQuery::create(null, $criteria);
                 if ($distinct) {
                     $query->distinct();
                 }
@@ -1861,65 +1861,65 @@ abstract class Resource implements ActiveRecordInterface
                     ->count($con);
             }
         } else {
-            return count($this->collGroups);
+            return count($this->collProfiles);
         }
     }
 
     /**
-     * Associate a ChildGroup object to this object
-     * through the group_resource cross reference table.
+     * Associate a ChildProfile object to this object
+     * through the profile_resource cross reference table.
      *
-     * @param  ChildGroup $group The ChildGroupResource object to relate
+     * @param  ChildProfile $profile The ChildProfileResource object to relate
      * @return ChildResource The current object (for fluent API support)
      */
-    public function addGroup(ChildGroup $group)
+    public function addProfile(ChildProfile $profile)
     {
-        if ($this->collGroups === null) {
-            $this->initGroups();
+        if ($this->collProfiles === null) {
+            $this->initProfiles();
         }
 
-        if (!$this->collGroups->contains($group)) { // only add it if the **same** object is not already associated
-            $this->doAddGroup($group);
-            $this->collGroups[] = $group;
+        if (!$this->collProfiles->contains($profile)) { // only add it if the **same** object is not already associated
+            $this->doAddProfile($profile);
+            $this->collProfiles[] = $profile;
         }
 
         return $this;
     }
 
     /**
-     * @param    Group $group The group object to add.
+     * @param    Profile $profile The profile object to add.
      */
-    protected function doAddGroup($group)
+    protected function doAddProfile($profile)
     {
-        $groupResource = new ChildGroupResource();
-        $groupResource->setGroup($group);
-        $this->addGroupResource($groupResource);
+        $profileResource = new ChildProfileResource();
+        $profileResource->setProfile($profile);
+        $this->addProfileResource($profileResource);
         // set the back reference to this object directly as using provided method either results
         // in endless loop or in multiple relations
-        if (!$group->getResources()->contains($this)) {
-            $foreignCollection   = $group->getResources();
+        if (!$profile->getResources()->contains($this)) {
+            $foreignCollection   = $profile->getResources();
             $foreignCollection[] = $this;
         }
     }
 
     /**
-     * Remove a ChildGroup object to this object
-     * through the group_resource cross reference table.
+     * Remove a ChildProfile object to this object
+     * through the profile_resource cross reference table.
      *
-     * @param ChildGroup $group The ChildGroupResource object to relate
+     * @param ChildProfile $profile The ChildProfileResource object to relate
      * @return ChildResource The current object (for fluent API support)
      */
-    public function removeGroup(ChildGroup $group)
+    public function removeProfile(ChildProfile $profile)
     {
-        if ($this->getGroups()->contains($group)) {
-            $this->collGroups->remove($this->collGroups->search($group));
+        if ($this->getProfiles()->contains($profile)) {
+            $this->collProfiles->remove($this->collProfiles->search($profile));
 
-            if (null === $this->groupsScheduledForDeletion) {
-                $this->groupsScheduledForDeletion = clone $this->collGroups;
-                $this->groupsScheduledForDeletion->clear();
+            if (null === $this->profilesScheduledForDeletion) {
+                $this->profilesScheduledForDeletion = clone $this->collProfiles;
+                $this->profilesScheduledForDeletion->clear();
             }
 
-            $this->groupsScheduledForDeletion[] = $group;
+            $this->profilesScheduledForDeletion[] = $profile;
         }
 
         return $this;
@@ -1953,8 +1953,8 @@ abstract class Resource implements ActiveRecordInterface
     public function clearAllReferences($deep = false)
     {
         if ($deep) {
-            if ($this->collGroupResources) {
-                foreach ($this->collGroupResources as $o) {
+            if ($this->collProfileResources) {
+                foreach ($this->collProfileResources as $o) {
                     $o->clearAllReferences($deep);
                 }
             }
@@ -1963,8 +1963,8 @@ abstract class Resource implements ActiveRecordInterface
                     $o->clearAllReferences($deep);
                 }
             }
-            if ($this->collGroups) {
-                foreach ($this->collGroups as $o) {
+            if ($this->collProfiles) {
+                foreach ($this->collProfiles as $o) {
                     $o->clearAllReferences($deep);
                 }
             }
@@ -1974,18 +1974,18 @@ abstract class Resource implements ActiveRecordInterface
         $this->currentLocale = 'en_US';
         $this->currentTranslations = null;
 
-        if ($this->collGroupResources instanceof Collection) {
-            $this->collGroupResources->clearIterator();
+        if ($this->collProfileResources instanceof Collection) {
+            $this->collProfileResources->clearIterator();
         }
-        $this->collGroupResources = null;
+        $this->collProfileResources = null;
         if ($this->collResourceI18ns instanceof Collection) {
             $this->collResourceI18ns->clearIterator();
         }
         $this->collResourceI18ns = null;
-        if ($this->collGroups instanceof Collection) {
-            $this->collGroups->clearIterator();
+        if ($this->collProfiles instanceof Collection) {
+            $this->collProfiles->clearIterator();
         }
-        $this->collGroups = null;
+        $this->collProfiles = null;
     }
 
     /**

core/lib/Thelia/Model/Base/ResourceQuery.php

@@ -36,9 +36,9 @@ use Thelia\Model\Map\ResourceTableMap;
  * @method     ChildResourceQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
  * @method     ChildResourceQuery innerJoin($relation) Adds a INNER JOIN clause to the query
  *
- * @method     ChildResourceQuery leftJoinGroupResource($relationAlias = null) Adds a LEFT JOIN clause to the query using the GroupResource relation
- * @method     ChildResourceQuery rightJoinGroupResource($relationAlias = null) Adds a RIGHT JOIN clause to the query using the GroupResource relation
- * @method     ChildResourceQuery innerJoinGroupResource($relationAlias = null) Adds a INNER JOIN clause to the query using the GroupResource relation
+ * @method     ChildResourceQuery leftJoinProfileResource($relationAlias = null) Adds a LEFT JOIN clause to the query using the ProfileResource relation
+ * @method     ChildResourceQuery rightJoinProfileResource($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ProfileResource relation
+ * @method     ChildResourceQuery innerJoinProfileResource($relationAlias = null) Adds a INNER JOIN clause to the query using the ProfileResource relation
  *
  * @method     ChildResourceQuery leftJoinResourceI18n($relationAlias = null) Adds a LEFT JOIN clause to the query using the ResourceI18n relation
  * @method     ChildResourceQuery rightJoinResourceI18n($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ResourceI18n relation
@@ -390,40 +390,40 @@ abstract class ResourceQuery extends ModelCriteria
     }
 
     /**
-     * Filter the query by a related \Thelia\Model\GroupResource object
+     * Filter the query by a related \Thelia\Model\ProfileResource object
      *
-     * @param \Thelia\Model\GroupResource|ObjectCollection $groupResource  the related object to use as filter
+     * @param \Thelia\Model\ProfileResource|ObjectCollection $profileResource  the related object to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildResourceQuery The current query, for fluid interface
      */
-    public function filterByGroupResource($groupResource, $comparison = null)
+    public function filterByProfileResource($profileResource, $comparison = null)
     {
-        if ($groupResource instanceof \Thelia\Model\GroupResource) {
+        if ($profileResource instanceof \Thelia\Model\ProfileResource) {
             return $this
-                ->addUsingAlias(ResourceTableMap::ID, $groupResource->getResourceId(), $comparison);
-        } elseif ($groupResource instanceof ObjectCollection) {
+                ->addUsingAlias(ResourceTableMap::ID, $profileResource->getResourceId(), $comparison);
+        } elseif ($profileResource instanceof ObjectCollection) {
             return $this
-                ->useGroupResourceQuery()
-                ->filterByPrimaryKeys($groupResource->getPrimaryKeys())
+                ->useProfileResourceQuery()
+                ->filterByPrimaryKeys($profileResource->getPrimaryKeys())
                 ->endUse();
         } else {
-            throw new PropelException('filterByGroupResource() only accepts arguments of type \Thelia\Model\GroupResource or Collection');
+            throw new PropelException('filterByProfileResource() only accepts arguments of type \Thelia\Model\ProfileResource or Collection');
         }
     }
 
     /**
-     * Adds a JOIN clause to the query using the GroupResource relation
+     * Adds a JOIN clause to the query using the ProfileResource relation
      *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildResourceQuery The current query, for fluid interface
      */
-    public function joinGroupResource($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function joinProfileResource($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         $tableMap = $this->getTableMap();
-        $relationMap = $tableMap->getRelation('GroupResource');
+        $relationMap = $tableMap->getRelation('ProfileResource');
 
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -438,14 +438,14 @@ abstract class ResourceQuery extends ModelCriteria
             $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
             $this->addJoinObject($join, $relationAlias);
         } else {
-            $this->addJoinObject($join, 'GroupResource');
+            $this->addJoinObject($join, 'ProfileResource');
         }
 
         return $this;
     }
 
     /**
-     * Use the GroupResource relation GroupResource object
+     * Use the ProfileResource relation ProfileResource object
      *
      * @see useQuery()
      *
@@ -453,13 +453,13 @@ abstract class ResourceQuery extends ModelCriteria
      *                                   to be used as main alias in the secondary query
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return   \Thelia\Model\GroupResourceQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\ProfileResourceQuery A secondary query class using the current class as primary query
      */
-    public function useGroupResourceQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+    public function useProfileResourceQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
         return $this
-            ->joinGroupResource($relationAlias, $joinType)
-            ->useQuery($relationAlias ? $relationAlias : 'GroupResource', '\Thelia\Model\GroupResourceQuery');
+            ->joinProfileResource($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'ProfileResource', '\Thelia\Model\ProfileResourceQuery');
     }
 
     /**
@@ -536,19 +536,19 @@ abstract class ResourceQuery extends ModelCriteria
     }
 
     /**
-     * Filter the query by a related Group object
-     * using the group_resource table as cross reference
+     * Filter the query by a related Profile object
+     * using the profile_resource table as cross reference
      *
-     * @param Group $group the related object to use as filter
+     * @param Profile $profile the related object to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildResourceQuery The current query, for fluid interface
      */
-    public function filterByGroup($group, $comparison = Criteria::EQUAL)
+    public function filterByProfile($profile, $comparison = Criteria::EQUAL)
     {
         return $this
-            ->useGroupResourceQuery()
-            ->filterByGroup($group, $comparison)
+            ->useProfileResourceQuery()
+            ->filterByProfile($profile, $comparison)
             ->endUse();
     }
 

core/lib/Thelia/Model/Group.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\Group as BaseGroup;
-
-class Group extends BaseGroup {
-
-}

core/lib/Thelia/Model/GroupI18n.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\GroupI18n as BaseGroupI18n;
-
-class GroupI18n extends BaseGroupI18n {
-
-}

core/lib/Thelia/Model/GroupI18nQuery.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\GroupI18nQuery as BaseGroupI18nQuery;
-
-
-/**
- * Skeleton subclass for performing query and update operations on the 'group_i18n' table.
- *
- *
- *
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- */
-class GroupI18nQuery extends BaseGroupI18nQuery {
-
-} // GroupI18nQuery

core/lib/Thelia/Model/GroupModule.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\GroupModule as BaseGroupModule;
-
-class GroupModule extends BaseGroupModule {
-
-}

core/lib/Thelia/Model/GroupModuleQuery.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\GroupModuleQuery as BaseGroupModuleQuery;
-
-
-/**
- * Skeleton subclass for performing query and update operations on the 'group_module' table.
- *
- *
- *
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- */
-class GroupModuleQuery extends BaseGroupModuleQuery {
-
-} // GroupModuleQuery

core/lib/Thelia/Model/GroupQuery.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\GroupQuery as BaseGroupQuery;
-
-
-/**
- * Skeleton subclass for performing query and update operations on the 'group' table.
- *
- *
- *
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- */
-class GroupQuery extends BaseGroupQuery {
-
-} // GroupQuery

core/lib/Thelia/Model/GroupResource.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\GroupResource as BaseGroupResource;
-
-class GroupResource extends BaseGroupResource {
-
-}

core/lib/Thelia/Model/GroupResourceQuery.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\GroupResourceQuery as BaseGroupResourceQuery;
-
-
-/**
- * Skeleton subclass for performing query and update operations on the 'group_resource' table.
- *
- *
- *
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- */
-class GroupResourceQuery extends BaseGroupResourceQuery {
-
-} // GroupResourceQuery

core/lib/Thelia/Model/Map/AdminGroupTableMap.php

@@ -1,509 +0,0 @@
-<?php
-
-namespace Thelia\Model\Map;
-
-use Propel\Runtime\Propel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\InstancePoolTrait;
-use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Exception\PropelException;
-use Propel\Runtime\Map\RelationMap;
-use Propel\Runtime\Map\TableMap;
-use Propel\Runtime\Map\TableMapTrait;
-use Thelia\Model\AdminGroup;
-use Thelia\Model\AdminGroupQuery;
-
-
-/**
- * This class defines the structure of the 'admin_group' table.
- *
- *
- *
- * This map class is used by Propel to do runtime db structure discovery.
- * For example, the createSelectSql() method checks the type of a given column used in an
- * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
- * (i.e. if it's a text column type).
- *
- */
-class AdminGroupTableMap extends TableMap
-{
-    use InstancePoolTrait;
-    use TableMapTrait;
-    /**
-     * The (dot-path) name of this class
-     */
-    const CLASS_NAME = 'Thelia.Model.Map.AdminGroupTableMap';
-
-    /**
-     * The default database name for this class
-     */
-    const DATABASE_NAME = 'thelia';
-
-    /**
-     * The table name for this class
-     */
-    const TABLE_NAME = 'admin_group';
-
-    /**
-     * The related Propel class for this table
-     */
-    const OM_CLASS = '\\Thelia\\Model\\AdminGroup';
-
-    /**
-     * A class that can be returned by this tableMap
-     */
-    const CLASS_DEFAULT = 'Thelia.Model.AdminGroup';
-
-    /**
-     * The total number of columns
-     */
-    const NUM_COLUMNS = 5;
-
-    /**
-     * The number of lazy-loaded columns
-     */
-    const NUM_LAZY_LOAD_COLUMNS = 0;
-
-    /**
-     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
-     */
-    const NUM_HYDRATE_COLUMNS = 5;
-
-    /**
-     * the column name for the ID field
-     */
-    const ID = 'admin_group.ID';
-
-    /**
-     * the column name for the GROUP_ID field
-     */
-    const GROUP_ID = 'admin_group.GROUP_ID';
-
-    /**
-     * the column name for the ADMIN_ID field
-     */
-    const ADMIN_ID = 'admin_group.ADMIN_ID';
-
-    /**
-     * the column name for the CREATED_AT field
-     */
-    const CREATED_AT = 'admin_group.CREATED_AT';
-
-    /**
-     * the column name for the UPDATED_AT field
-     */
-    const UPDATED_AT = 'admin_group.UPDATED_AT';
-
-    /**
-     * The default string format for model objects of the related table
-     */
-    const DEFAULT_STRING_FORMAT = 'YAML';
-
-    /**
-     * holds an array of fieldnames
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
-     */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'GroupId', 'AdminId', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'groupId', 'adminId', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(AdminGroupTableMap::ID, AdminGroupTableMap::GROUP_ID, AdminGroupTableMap::ADMIN_ID, AdminGroupTableMap::CREATED_AT, AdminGroupTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'GROUP_ID', 'ADMIN_ID', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'group_id', 'admin_id', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, )
-    );
-
-    /**
-     * holds an array of keys for quick access to the fieldnames array
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
-     */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'GroupId' => 1, 'AdminId' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'groupId' => 1, 'adminId' => 2, 'createdAt' => 3, 'updatedAt' => 4, ),
-        self::TYPE_COLNAME       => array(AdminGroupTableMap::ID => 0, AdminGroupTableMap::GROUP_ID => 1, AdminGroupTableMap::ADMIN_ID => 2, AdminGroupTableMap::CREATED_AT => 3, AdminGroupTableMap::UPDATED_AT => 4, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'GROUP_ID' => 1, 'ADMIN_ID' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'group_id' => 1, 'admin_id' => 2, 'created_at' => 3, 'updated_at' => 4, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, )
-    );
-
-    /**
-     * Initialize the table attributes and columns
-     * Relations are not initialized by this method since they are lazy loaded
-     *
-     * @return void
-     * @throws PropelException
-     */
-    public function initialize()
-    {
-        // attributes
-        $this->setName('admin_group');
-        $this->setPhpName('AdminGroup');
-        $this->setClassName('\\Thelia\\Model\\AdminGroup');
-        $this->setPackage('Thelia.Model');
-        $this->setUseIdGenerator(true);
-        $this->setIsCrossRef(true);
-        // columns
-        $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
-        $this->addForeignPrimaryKey('GROUP_ID', 'GroupId', 'INTEGER' , 'group', 'ID', true, null, null);
-        $this->addForeignPrimaryKey('ADMIN_ID', 'AdminId', 'INTEGER' , 'admin', 'ID', true, null, null);
-        $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
-        $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
-    } // initialize()
-
-    /**
-     * Build the RelationMap objects for this table relationships
-     */
-    public function buildRelations()
-    {
-        $this->addRelation('Group', '\\Thelia\\Model\\Group', RelationMap::MANY_TO_ONE, array('group_id' => 'id', ), 'CASCADE', 'RESTRICT');
-        $this->addRelation('Admin', '\\Thelia\\Model\\Admin', RelationMap::MANY_TO_ONE, array('admin_id' => 'id', ), 'CASCADE', 'RESTRICT');
-    } // buildRelations()
-
-    /**
-     *
-     * Gets the list of behaviors registered for this table
-     *
-     * @return array Associative array (name => parameters) of behaviors
-     */
-    public function getBehaviors()
-    {
-        return array(
-            'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
-        );
-    } // getBehaviors()
-
-    /**
-     * Adds an object to the instance pool.
-     *
-     * Propel keeps cached copies of objects in an instance pool when they are retrieved
-     * from the database. In some cases you may need to explicitly add objects
-     * to the cache in order to ensure that the same objects are always returned by find*()
-     * and findPk*() calls.
-     *
-     * @param \Thelia\Model\AdminGroup $obj A \Thelia\Model\AdminGroup object.
-     * @param string $key             (optional) key to use for instance map (for performance boost if key was already calculated externally).
-     */
-    public static function addInstanceToPool($obj, $key = null)
-    {
-        if (Propel::isInstancePoolingEnabled()) {
-            if (null === $key) {
-                $key = serialize(array((string) $obj->getId(), (string) $obj->getGroupId(), (string) $obj->getAdminId()));
-            } // if key === null
-            self::$instances[$key] = $obj;
-        }
-    }
-
-    /**
-     * Removes an object from the instance pool.
-     *
-     * Propel keeps cached copies of objects in an instance pool when they are retrieved
-     * from the database.  In some cases -- especially when you override doDelete
-     * methods in your stub classes -- you may need to explicitly remove objects
-     * from the cache in order to prevent returning objects that no longer exist.
-     *
-     * @param mixed $value A \Thelia\Model\AdminGroup object or a primary key value.
-     */
-    public static function removeInstanceFromPool($value)
-    {
-        if (Propel::isInstancePoolingEnabled() && null !== $value) {
-            if (is_object($value) && $value instanceof \Thelia\Model\AdminGroup) {
-                $key = serialize(array((string) $value->getId(), (string) $value->getGroupId(), (string) $value->getAdminId()));
-
-            } elseif (is_array($value) && count($value) === 3) {
-                // assume we've been passed a primary key";
-                $key = serialize(array((string) $value[0], (string) $value[1], (string) $value[2]));
-            } elseif ($value instanceof Criteria) {
-                self::$instances = [];
-
-                return;
-            } else {
-                $e = new PropelException("Invalid value passed to removeInstanceFromPool().  Expected primary key or \Thelia\Model\AdminGroup object; got " . (is_object($value) ? get_class($value) . ' object.' : var_export($value, true)));
-                throw $e;
-            }
-
-            unset(self::$instances[$key]);
-        }
-    }
-
-    /**
-     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-     *
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, a serialize()d version of the primary key will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     */
-    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('GroupId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('AdminId', TableMap::TYPE_PHPNAME, $indexType)] === null) {
-            return null;
-        }
-
-        return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('GroupId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('AdminId', TableMap::TYPE_PHPNAME, $indexType)]));
-    }
-
-    /**
-     * Retrieves the primary key from the DB resultset row
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, an array of the primary key columns will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return mixed The primary key of the row
-     */
-    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-
-            return $pks;
-    }
-
-    /**
-     * The class that the tableMap will make instances of.
-     *
-     * If $withPrefix is true, the returned path
-     * uses a dot-path notation which is translated into a path
-     * relative to a location on the PHP include_path.
-     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
-     *
-     * @param boolean $withPrefix Whether or not to return the path with the class name
-     * @return string path.to.ClassName
-     */
-    public static function getOMClass($withPrefix = true)
-    {
-        return $withPrefix ? AdminGroupTableMap::CLASS_DEFAULT : AdminGroupTableMap::OM_CLASS;
-    }
-
-    /**
-     * Populates an object of the default type or an object that inherit from the default.
-     *
-     * @param array  $row       row returned by DataFetcher->fetch().
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
-                                 One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     * @return array (AdminGroup object, last column rank)
-     */
-    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        $key = AdminGroupTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
-        if (null !== ($obj = AdminGroupTableMap::getInstanceFromPool($key))) {
-            // We no longer rehydrate the object, since this can cause data loss.
-            // See http://www.propelorm.org/ticket/509
-            // $obj->hydrate($row, $offset, true); // rehydrate
-            $col = $offset + AdminGroupTableMap::NUM_HYDRATE_COLUMNS;
-        } else {
-            $cls = AdminGroupTableMap::OM_CLASS;
-            $obj = new $cls();
-            $col = $obj->hydrate($row, $offset, false, $indexType);
-            AdminGroupTableMap::addInstanceToPool($obj, $key);
-        }
-
-        return array($obj, $col);
-    }
-
-    /**
-     * The returned array will contain objects of the default type or
-     * objects that inherit from the default.
-     *
-     * @param DataFetcherInterface $dataFetcher
-     * @return array
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function populateObjects(DataFetcherInterface $dataFetcher)
-    {
-        $results = array();
-
-        // set the class once to avoid overhead in the loop
-        $cls = static::getOMClass(false);
-        // populate the object(s)
-        while ($row = $dataFetcher->fetch()) {
-            $key = AdminGroupTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
-            if (null !== ($obj = AdminGroupTableMap::getInstanceFromPool($key))) {
-                // We no longer rehydrate the object, since this can cause data loss.
-                // See http://www.propelorm.org/ticket/509
-                // $obj->hydrate($row, 0, true); // rehydrate
-                $results[] = $obj;
-            } else {
-                $obj = new $cls();
-                $obj->hydrate($row);
-                $results[] = $obj;
-                AdminGroupTableMap::addInstanceToPool($obj, $key);
-            } // if key exists
-        }
-
-        return $results;
-    }
-    /**
-     * Add all the columns needed to create a new object.
-     *
-     * Note: any columns that were marked with lazyLoad="true" in the
-     * XML schema will not be added to the select list and only loaded
-     * on demand.
-     *
-     * @param Criteria $criteria object containing the columns to add.
-     * @param string   $alias    optional table alias
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function addSelectColumns(Criteria $criteria, $alias = null)
-    {
-        if (null === $alias) {
-            $criteria->addSelectColumn(AdminGroupTableMap::ID);
-            $criteria->addSelectColumn(AdminGroupTableMap::GROUP_ID);
-            $criteria->addSelectColumn(AdminGroupTableMap::ADMIN_ID);
-            $criteria->addSelectColumn(AdminGroupTableMap::CREATED_AT);
-            $criteria->addSelectColumn(AdminGroupTableMap::UPDATED_AT);
-        } else {
-            $criteria->addSelectColumn($alias . '.ID');
-            $criteria->addSelectColumn($alias . '.GROUP_ID');
-            $criteria->addSelectColumn($alias . '.ADMIN_ID');
-            $criteria->addSelectColumn($alias . '.CREATED_AT');
-            $criteria->addSelectColumn($alias . '.UPDATED_AT');
-        }
-    }
-
-    /**
-     * Returns the TableMap related to this object.
-     * This method is not needed for general use but a specific application could have a need.
-     * @return TableMap
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function getTableMap()
-    {
-        return Propel::getServiceContainer()->getDatabaseMap(AdminGroupTableMap::DATABASE_NAME)->getTable(AdminGroupTableMap::TABLE_NAME);
-    }
-
-    /**
-     * Add a TableMap instance to the database for this tableMap class.
-     */
-    public static function buildTableMap()
-    {
-      $dbMap = Propel::getServiceContainer()->getDatabaseMap(AdminGroupTableMap::DATABASE_NAME);
-      if (!$dbMap->hasTable(AdminGroupTableMap::TABLE_NAME)) {
-        $dbMap->addTableObject(new AdminGroupTableMap());
-      }
-    }
-
-    /**
-     * Performs a DELETE on the database, given a AdminGroup or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or AdminGroup object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-     public static function doDelete($values, ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(AdminGroupTableMap::DATABASE_NAME);
-        }
-
-        if ($values instanceof Criteria) {
-            // rename for clarity
-            $criteria = $values;
-        } elseif ($values instanceof \Thelia\Model\AdminGroup) { // it's a model object
-            // create criteria based on pk values
-            $criteria = $values->buildPkeyCriteria();
-        } else { // it's a primary key, or an array of pks
-            $criteria = new Criteria(AdminGroupTableMap::DATABASE_NAME);
-            // primary key is composite; we therefore, expect
-            // the primary key passed to be an array of pkey values
-            if (count($values) == count($values, COUNT_RECURSIVE)) {
-                // array is not multi-dimensional
-                $values = array($values);
-            }
-            foreach ($values as $value) {
-                $criterion = $criteria->getNewCriterion(AdminGroupTableMap::ID, $value[0]);
-                $criterion->addAnd($criteria->getNewCriterion(AdminGroupTableMap::GROUP_ID, $value[1]));
-                $criterion->addAnd($criteria->getNewCriterion(AdminGroupTableMap::ADMIN_ID, $value[2]));
-                $criteria->addOr($criterion);
-            }
-        }
-
-        $query = AdminGroupQuery::create()->mergeWith($criteria);
-
-        if ($values instanceof Criteria) { AdminGroupTableMap::clearInstancePool();
-        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
-            foreach ((array) $values as $singleval) { AdminGroupTableMap::removeInstanceFromPool($singleval);
-            }
-        }
-
-        return $query->delete($con);
-    }
-
-    /**
-     * Deletes all rows from the admin_group table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public static function doDeleteAll(ConnectionInterface $con = null)
-    {
-        return AdminGroupQuery::create()->doDeleteAll($con);
-    }
-
-    /**
-     * Performs an INSERT on the database, given a AdminGroup or Criteria object.
-     *
-     * @param mixed               $criteria Criteria or AdminGroup object containing data that is used to create the INSERT statement.
-     * @param ConnectionInterface $con the ConnectionInterface connection to use
-     * @return mixed           The new primary key.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function doInsert($criteria, ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(AdminGroupTableMap::DATABASE_NAME);
-        }
-
-        if ($criteria instanceof Criteria) {
-            $criteria = clone $criteria; // rename for clarity
-        } else {
-            $criteria = $criteria->buildCriteria(); // build Criteria from AdminGroup object
-        }
-
-        if ($criteria->containsKey(AdminGroupTableMap::ID) && $criteria->keyContainsValue(AdminGroupTableMap::ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.AdminGroupTableMap::ID.')');
-        }
-
-
-        // Set the correct dbName
-        $query = AdminGroupQuery::create()->mergeWith($criteria);
-
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table (I guess, conceivably)
-            $con->beginTransaction();
-            $pk = $query->doInsert($con);
-            $con->commit();
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-
-        return $pk;
-    }
-
-} // AdminGroupTableMap
-// This is the static code needed to register the TableMap for this table with the main Propel class.
-//
-AdminGroupTableMap::buildTableMap();

core/lib/Thelia/Model/Map/AdminTableMap.php

@@ -193,8 +193,8 @@ class AdminTableMap extends TableMap
      */
     public function buildRelations()
     {
-        $this->addRelation('AdminGroup', '\\Thelia\\Model\\AdminGroup', RelationMap::ONE_TO_MANY, array('id' => 'admin_id', ), 'CASCADE', 'RESTRICT', 'AdminGroups');
-        $this->addRelation('Group', '\\Thelia\\Model\\Group', RelationMap::MANY_TO_MANY, array(), 'CASCADE', 'RESTRICT', 'Groups');
+        $this->addRelation('AdminProfile', '\\Thelia\\Model\\AdminProfile', RelationMap::ONE_TO_MANY, array('id' => 'admin_id', ), 'CASCADE', 'RESTRICT', 'AdminProfiles');
+        $this->addRelation('Profile', '\\Thelia\\Model\\Profile', RelationMap::MANY_TO_MANY, array(), 'CASCADE', 'RESTRICT', 'Profiles');
     } // buildRelations()
 
     /**
@@ -216,7 +216,7 @@ class AdminTableMap extends TableMap
     {
         // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool,
         // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
-                AdminGroupTableMap::clearInstancePool();
+                AdminProfileTableMap::clearInstancePool();
             }
 
     /**

core/lib/Thelia/Model/Map/GroupI18nTableMap.php

@@ -1,497 +0,0 @@
-<?php
-
-namespace Thelia\Model\Map;
-
-use Propel\Runtime\Propel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\InstancePoolTrait;
-use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Exception\PropelException;
-use Propel\Runtime\Map\RelationMap;
-use Propel\Runtime\Map\TableMap;
-use Propel\Runtime\Map\TableMapTrait;
-use Thelia\Model\GroupI18n;
-use Thelia\Model\GroupI18nQuery;
-
-
-/**
- * This class defines the structure of the 'group_i18n' table.
- *
- *
- *
- * This map class is used by Propel to do runtime db structure discovery.
- * For example, the createSelectSql() method checks the type of a given column used in an
- * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
- * (i.e. if it's a text column type).
- *
- */
-class GroupI18nTableMap extends TableMap
-{
-    use InstancePoolTrait;
-    use TableMapTrait;
-    /**
-     * The (dot-path) name of this class
-     */
-    const CLASS_NAME = 'Thelia.Model.Map.GroupI18nTableMap';
-
-    /**
-     * The default database name for this class
-     */
-    const DATABASE_NAME = 'thelia';
-
-    /**
-     * The table name for this class
-     */
-    const TABLE_NAME = 'group_i18n';
-
-    /**
-     * The related Propel class for this table
-     */
-    const OM_CLASS = '\\Thelia\\Model\\GroupI18n';
-
-    /**
-     * A class that can be returned by this tableMap
-     */
-    const CLASS_DEFAULT = 'Thelia.Model.GroupI18n';
-
-    /**
-     * The total number of columns
-     */
-    const NUM_COLUMNS = 6;
-
-    /**
-     * The number of lazy-loaded columns
-     */
-    const NUM_LAZY_LOAD_COLUMNS = 0;
-
-    /**
-     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
-     */
-    const NUM_HYDRATE_COLUMNS = 6;
-
-    /**
-     * the column name for the ID field
-     */
-    const ID = 'group_i18n.ID';
-
-    /**
-     * the column name for the LOCALE field
-     */
-    const LOCALE = 'group_i18n.LOCALE';
-
-    /**
-     * the column name for the TITLE field
-     */
-    const TITLE = 'group_i18n.TITLE';
-
-    /**
-     * the column name for the DESCRIPTION field
-     */
-    const DESCRIPTION = 'group_i18n.DESCRIPTION';
-
-    /**
-     * the column name for the CHAPO field
-     */
-    const CHAPO = 'group_i18n.CHAPO';
-
-    /**
-     * the column name for the POSTSCRIPTUM field
-     */
-    const POSTSCRIPTUM = 'group_i18n.POSTSCRIPTUM';
-
-    /**
-     * The default string format for model objects of the related table
-     */
-    const DEFAULT_STRING_FORMAT = 'YAML';
-
-    /**
-     * holds an array of fieldnames
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
-     */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'Locale', 'Title', 'Description', 'Chapo', 'Postscriptum', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'locale', 'title', 'description', 'chapo', 'postscriptum', ),
-        self::TYPE_COLNAME       => array(GroupI18nTableMap::ID, GroupI18nTableMap::LOCALE, GroupI18nTableMap::TITLE, GroupI18nTableMap::DESCRIPTION, GroupI18nTableMap::CHAPO, GroupI18nTableMap::POSTSCRIPTUM, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'LOCALE', 'TITLE', 'DESCRIPTION', 'CHAPO', 'POSTSCRIPTUM', ),
-        self::TYPE_FIELDNAME     => array('id', 'locale', 'title', 'description', 'chapo', 'postscriptum', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
-    );
-
-    /**
-     * holds an array of keys for quick access to the fieldnames array
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
-     */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'Locale' => 1, 'Title' => 2, 'Description' => 3, 'Chapo' => 4, 'Postscriptum' => 5, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'description' => 3, 'chapo' => 4, 'postscriptum' => 5, ),
-        self::TYPE_COLNAME       => array(GroupI18nTableMap::ID => 0, GroupI18nTableMap::LOCALE => 1, GroupI18nTableMap::TITLE => 2, GroupI18nTableMap::DESCRIPTION => 3, GroupI18nTableMap::CHAPO => 4, GroupI18nTableMap::POSTSCRIPTUM => 5, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'LOCALE' => 1, 'TITLE' => 2, 'DESCRIPTION' => 3, 'CHAPO' => 4, 'POSTSCRIPTUM' => 5, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'locale' => 1, 'title' => 2, 'description' => 3, 'chapo' => 4, 'postscriptum' => 5, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
-    );
-
-    /**
-     * Initialize the table attributes and columns
-     * Relations are not initialized by this method since they are lazy loaded
-     *
-     * @return void
-     * @throws PropelException
-     */
-    public function initialize()
-    {
-        // attributes
-        $this->setName('group_i18n');
-        $this->setPhpName('GroupI18n');
-        $this->setClassName('\\Thelia\\Model\\GroupI18n');
-        $this->setPackage('Thelia.Model');
-        $this->setUseIdGenerator(false);
-        // columns
-        $this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'group', 'ID', true, null, null);
-        $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
-        $this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
-        $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
-        $this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
-        $this->addColumn('POSTSCRIPTUM', 'Postscriptum', 'LONGVARCHAR', false, null, null);
-    } // initialize()
-
-    /**
-     * Build the RelationMap objects for this table relationships
-     */
-    public function buildRelations()
-    {
-        $this->addRelation('Group', '\\Thelia\\Model\\Group', RelationMap::MANY_TO_ONE, array('id' => 'id', ), 'CASCADE', null);
-    } // buildRelations()
-
-    /**
-     * Adds an object to the instance pool.
-     *
-     * Propel keeps cached copies of objects in an instance pool when they are retrieved
-     * from the database. In some cases you may need to explicitly add objects
-     * to the cache in order to ensure that the same objects are always returned by find*()
-     * and findPk*() calls.
-     *
-     * @param \Thelia\Model\GroupI18n $obj A \Thelia\Model\GroupI18n object.
-     * @param string $key             (optional) key to use for instance map (for performance boost if key was already calculated externally).
-     */
-    public static function addInstanceToPool($obj, $key = null)
-    {
-        if (Propel::isInstancePoolingEnabled()) {
-            if (null === $key) {
-                $key = serialize(array((string) $obj->getId(), (string) $obj->getLocale()));
-            } // if key === null
-            self::$instances[$key] = $obj;
-        }
-    }
-
-    /**
-     * Removes an object from the instance pool.
-     *
-     * Propel keeps cached copies of objects in an instance pool when they are retrieved
-     * from the database.  In some cases -- especially when you override doDelete
-     * methods in your stub classes -- you may need to explicitly remove objects
-     * from the cache in order to prevent returning objects that no longer exist.
-     *
-     * @param mixed $value A \Thelia\Model\GroupI18n object or a primary key value.
-     */
-    public static function removeInstanceFromPool($value)
-    {
-        if (Propel::isInstancePoolingEnabled() && null !== $value) {
-            if (is_object($value) && $value instanceof \Thelia\Model\GroupI18n) {
-                $key = serialize(array((string) $value->getId(), (string) $value->getLocale()));
-
-            } elseif (is_array($value) && count($value) === 2) {
-                // assume we've been passed a primary key";
-                $key = serialize(array((string) $value[0], (string) $value[1]));
-            } elseif ($value instanceof Criteria) {
-                self::$instances = [];
-
-                return;
-            } else {
-                $e = new PropelException("Invalid value passed to removeInstanceFromPool().  Expected primary key or \Thelia\Model\GroupI18n object; got " . (is_object($value) ? get_class($value) . ' object.' : var_export($value, true)));
-                throw $e;
-            }
-
-            unset(self::$instances[$key]);
-        }
-    }
-
-    /**
-     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-     *
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, a serialize()d version of the primary key will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     */
-    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('Locale', TableMap::TYPE_PHPNAME, $indexType)] === null) {
-            return null;
-        }
-
-        return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('Locale', TableMap::TYPE_PHPNAME, $indexType)]));
-    }
-
-    /**
-     * Retrieves the primary key from the DB resultset row
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, an array of the primary key columns will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return mixed The primary key of the row
-     */
-    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-
-            return $pks;
-    }
-
-    /**
-     * The class that the tableMap will make instances of.
-     *
-     * If $withPrefix is true, the returned path
-     * uses a dot-path notation which is translated into a path
-     * relative to a location on the PHP include_path.
-     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
-     *
-     * @param boolean $withPrefix Whether or not to return the path with the class name
-     * @return string path.to.ClassName
-     */
-    public static function getOMClass($withPrefix = true)
-    {
-        return $withPrefix ? GroupI18nTableMap::CLASS_DEFAULT : GroupI18nTableMap::OM_CLASS;
-    }
-
-    /**
-     * Populates an object of the default type or an object that inherit from the default.
-     *
-     * @param array  $row       row returned by DataFetcher->fetch().
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
-                                 One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     * @return array (GroupI18n object, last column rank)
-     */
-    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        $key = GroupI18nTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
-        if (null !== ($obj = GroupI18nTableMap::getInstanceFromPool($key))) {
-            // We no longer rehydrate the object, since this can cause data loss.
-            // See http://www.propelorm.org/ticket/509
-            // $obj->hydrate($row, $offset, true); // rehydrate
-            $col = $offset + GroupI18nTableMap::NUM_HYDRATE_COLUMNS;
-        } else {
-            $cls = GroupI18nTableMap::OM_CLASS;
-            $obj = new $cls();
-            $col = $obj->hydrate($row, $offset, false, $indexType);
-            GroupI18nTableMap::addInstanceToPool($obj, $key);
-        }
-
-        return array($obj, $col);
-    }
-
-    /**
-     * The returned array will contain objects of the default type or
-     * objects that inherit from the default.
-     *
-     * @param DataFetcherInterface $dataFetcher
-     * @return array
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function populateObjects(DataFetcherInterface $dataFetcher)
-    {
-        $results = array();
-
-        // set the class once to avoid overhead in the loop
-        $cls = static::getOMClass(false);
-        // populate the object(s)
-        while ($row = $dataFetcher->fetch()) {
-            $key = GroupI18nTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
-            if (null !== ($obj = GroupI18nTableMap::getInstanceFromPool($key))) {
-                // We no longer rehydrate the object, since this can cause data loss.
-                // See http://www.propelorm.org/ticket/509
-                // $obj->hydrate($row, 0, true); // rehydrate
-                $results[] = $obj;
-            } else {
-                $obj = new $cls();
-                $obj->hydrate($row);
-                $results[] = $obj;
-                GroupI18nTableMap::addInstanceToPool($obj, $key);
-            } // if key exists
-        }
-
-        return $results;
-    }
-    /**
-     * Add all the columns needed to create a new object.
-     *
-     * Note: any columns that were marked with lazyLoad="true" in the
-     * XML schema will not be added to the select list and only loaded
-     * on demand.
-     *
-     * @param Criteria $criteria object containing the columns to add.
-     * @param string   $alias    optional table alias
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function addSelectColumns(Criteria $criteria, $alias = null)
-    {
-        if (null === $alias) {
-            $criteria->addSelectColumn(GroupI18nTableMap::ID);
-            $criteria->addSelectColumn(GroupI18nTableMap::LOCALE);
-            $criteria->addSelectColumn(GroupI18nTableMap::TITLE);
-            $criteria->addSelectColumn(GroupI18nTableMap::DESCRIPTION);
-            $criteria->addSelectColumn(GroupI18nTableMap::CHAPO);
-            $criteria->addSelectColumn(GroupI18nTableMap::POSTSCRIPTUM);
-        } else {
-            $criteria->addSelectColumn($alias . '.ID');
-            $criteria->addSelectColumn($alias . '.LOCALE');
-            $criteria->addSelectColumn($alias . '.TITLE');
-            $criteria->addSelectColumn($alias . '.DESCRIPTION');
-            $criteria->addSelectColumn($alias . '.CHAPO');
-            $criteria->addSelectColumn($alias . '.POSTSCRIPTUM');
-        }
-    }
-
-    /**
-     * Returns the TableMap related to this object.
-     * This method is not needed for general use but a specific application could have a need.
-     * @return TableMap
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function getTableMap()
-    {
-        return Propel::getServiceContainer()->getDatabaseMap(GroupI18nTableMap::DATABASE_NAME)->getTable(GroupI18nTableMap::TABLE_NAME);
-    }
-
-    /**
-     * Add a TableMap instance to the database for this tableMap class.
-     */
-    public static function buildTableMap()
-    {
-      $dbMap = Propel::getServiceContainer()->getDatabaseMap(GroupI18nTableMap::DATABASE_NAME);
-      if (!$dbMap->hasTable(GroupI18nTableMap::TABLE_NAME)) {
-        $dbMap->addTableObject(new GroupI18nTableMap());
-      }
-    }
-
-    /**
-     * Performs a DELETE on the database, given a GroupI18n or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or GroupI18n object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-     public static function doDelete($values, ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupI18nTableMap::DATABASE_NAME);
-        }
-
-        if ($values instanceof Criteria) {
-            // rename for clarity
-            $criteria = $values;
-        } elseif ($values instanceof \Thelia\Model\GroupI18n) { // it's a model object
-            // create criteria based on pk values
-            $criteria = $values->buildPkeyCriteria();
-        } else { // it's a primary key, or an array of pks
-            $criteria = new Criteria(GroupI18nTableMap::DATABASE_NAME);
-            // primary key is composite; we therefore, expect
-            // the primary key passed to be an array of pkey values
-            if (count($values) == count($values, COUNT_RECURSIVE)) {
-                // array is not multi-dimensional
-                $values = array($values);
-            }
-            foreach ($values as $value) {
-                $criterion = $criteria->getNewCriterion(GroupI18nTableMap::ID, $value[0]);
-                $criterion->addAnd($criteria->getNewCriterion(GroupI18nTableMap::LOCALE, $value[1]));
-                $criteria->addOr($criterion);
-            }
-        }
-
-        $query = GroupI18nQuery::create()->mergeWith($criteria);
-
-        if ($values instanceof Criteria) { GroupI18nTableMap::clearInstancePool();
-        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
-            foreach ((array) $values as $singleval) { GroupI18nTableMap::removeInstanceFromPool($singleval);
-            }
-        }
-
-        return $query->delete($con);
-    }
-
-    /**
-     * Deletes all rows from the group_i18n table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public static function doDeleteAll(ConnectionInterface $con = null)
-    {
-        return GroupI18nQuery::create()->doDeleteAll($con);
-    }
-
-    /**
-     * Performs an INSERT on the database, given a GroupI18n or Criteria object.
-     *
-     * @param mixed               $criteria Criteria or GroupI18n object containing data that is used to create the INSERT statement.
-     * @param ConnectionInterface $con the ConnectionInterface connection to use
-     * @return mixed           The new primary key.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function doInsert($criteria, ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupI18nTableMap::DATABASE_NAME);
-        }
-
-        if ($criteria instanceof Criteria) {
-            $criteria = clone $criteria; // rename for clarity
-        } else {
-            $criteria = $criteria->buildCriteria(); // build Criteria from GroupI18n object
-        }
-
-
-        // Set the correct dbName
-        $query = GroupI18nQuery::create()->mergeWith($criteria);
-
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table (I guess, conceivably)
-            $con->beginTransaction();
-            $pk = $query->doInsert($con);
-            $con->commit();
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-
-        return $pk;
-    }
-
-} // GroupI18nTableMap
-// This is the static code needed to register the TableMap for this table with the main Propel class.
-//
-GroupI18nTableMap::buildTableMap();

core/lib/Thelia/Model/Map/GroupModuleTableMap.php

@@ -1,456 +0,0 @@
-<?php
-
-namespace Thelia\Model\Map;
-
-use Propel\Runtime\Propel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\InstancePoolTrait;
-use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Exception\PropelException;
-use Propel\Runtime\Map\RelationMap;
-use Propel\Runtime\Map\TableMap;
-use Propel\Runtime\Map\TableMapTrait;
-use Thelia\Model\GroupModule;
-use Thelia\Model\GroupModuleQuery;
-
-
-/**
- * This class defines the structure of the 'group_module' table.
- *
- *
- *
- * This map class is used by Propel to do runtime db structure discovery.
- * For example, the createSelectSql() method checks the type of a given column used in an
- * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
- * (i.e. if it's a text column type).
- *
- */
-class GroupModuleTableMap extends TableMap
-{
-    use InstancePoolTrait;
-    use TableMapTrait;
-    /**
-     * The (dot-path) name of this class
-     */
-    const CLASS_NAME = 'Thelia.Model.Map.GroupModuleTableMap';
-
-    /**
-     * The default database name for this class
-     */
-    const DATABASE_NAME = 'thelia';
-
-    /**
-     * The table name for this class
-     */
-    const TABLE_NAME = 'group_module';
-
-    /**
-     * The related Propel class for this table
-     */
-    const OM_CLASS = '\\Thelia\\Model\\GroupModule';
-
-    /**
-     * A class that can be returned by this tableMap
-     */
-    const CLASS_DEFAULT = 'Thelia.Model.GroupModule';
-
-    /**
-     * The total number of columns
-     */
-    const NUM_COLUMNS = 6;
-
-    /**
-     * The number of lazy-loaded columns
-     */
-    const NUM_LAZY_LOAD_COLUMNS = 0;
-
-    /**
-     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
-     */
-    const NUM_HYDRATE_COLUMNS = 6;
-
-    /**
-     * the column name for the ID field
-     */
-    const ID = 'group_module.ID';
-
-    /**
-     * the column name for the GROUP_ID field
-     */
-    const GROUP_ID = 'group_module.GROUP_ID';
-
-    /**
-     * the column name for the MODULE_ID field
-     */
-    const MODULE_ID = 'group_module.MODULE_ID';
-
-    /**
-     * the column name for the ACCESS field
-     */
-    const ACCESS = 'group_module.ACCESS';
-
-    /**
-     * the column name for the CREATED_AT field
-     */
-    const CREATED_AT = 'group_module.CREATED_AT';
-
-    /**
-     * the column name for the UPDATED_AT field
-     */
-    const UPDATED_AT = 'group_module.UPDATED_AT';
-
-    /**
-     * The default string format for model objects of the related table
-     */
-    const DEFAULT_STRING_FORMAT = 'YAML';
-
-    /**
-     * holds an array of fieldnames
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
-     */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'GroupId', 'ModuleId', 'Access', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'groupId', 'moduleId', 'access', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(GroupModuleTableMap::ID, GroupModuleTableMap::GROUP_ID, GroupModuleTableMap::MODULE_ID, GroupModuleTableMap::ACCESS, GroupModuleTableMap::CREATED_AT, GroupModuleTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'GROUP_ID', 'MODULE_ID', 'ACCESS', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'group_id', 'module_id', 'access', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
-    );
-
-    /**
-     * holds an array of keys for quick access to the fieldnames array
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
-     */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'GroupId' => 1, 'ModuleId' => 2, 'Access' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'groupId' => 1, 'moduleId' => 2, 'access' => 3, 'createdAt' => 4, 'updatedAt' => 5, ),
-        self::TYPE_COLNAME       => array(GroupModuleTableMap::ID => 0, GroupModuleTableMap::GROUP_ID => 1, GroupModuleTableMap::MODULE_ID => 2, GroupModuleTableMap::ACCESS => 3, GroupModuleTableMap::CREATED_AT => 4, GroupModuleTableMap::UPDATED_AT => 5, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'GROUP_ID' => 1, 'MODULE_ID' => 2, 'ACCESS' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'group_id' => 1, 'module_id' => 2, 'access' => 3, 'created_at' => 4, 'updated_at' => 5, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, )
-    );
-
-    /**
-     * Initialize the table attributes and columns
-     * Relations are not initialized by this method since they are lazy loaded
-     *
-     * @return void
-     * @throws PropelException
-     */
-    public function initialize()
-    {
-        // attributes
-        $this->setName('group_module');
-        $this->setPhpName('GroupModule');
-        $this->setClassName('\\Thelia\\Model\\GroupModule');
-        $this->setPackage('Thelia.Model');
-        $this->setUseIdGenerator(true);
-        // columns
-        $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
-        $this->addForeignKey('GROUP_ID', 'GroupId', 'INTEGER', 'group', 'ID', true, null, null);
-        $this->addForeignKey('MODULE_ID', 'ModuleId', 'INTEGER', 'module', 'ID', false, null, null);
-        $this->addColumn('ACCESS', 'Access', 'TINYINT', false, null, 0);
-        $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
-        $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
-    } // initialize()
-
-    /**
-     * Build the RelationMap objects for this table relationships
-     */
-    public function buildRelations()
-    {
-        $this->addRelation('Group', '\\Thelia\\Model\\Group', RelationMap::MANY_TO_ONE, array('group_id' => 'id', ), 'CASCADE', 'CASCADE');
-        $this->addRelation('Module', '\\Thelia\\Model\\Module', RelationMap::MANY_TO_ONE, array('module_id' => 'id', ), 'CASCADE', 'RESTRICT');
-    } // buildRelations()
-
-    /**
-     *
-     * Gets the list of behaviors registered for this table
-     *
-     * @return array Associative array (name => parameters) of behaviors
-     */
-    public function getBehaviors()
-    {
-        return array(
-            'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
-        );
-    } // getBehaviors()
-
-    /**
-     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-     *
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, a serialize()d version of the primary key will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     */
-    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
-            return null;
-        }
-
-        return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
-    }
-
-    /**
-     * Retrieves the primary key from the DB resultset row
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, an array of the primary key columns will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return mixed The primary key of the row
-     */
-    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-
-            return (int) $row[
-                            $indexType == TableMap::TYPE_NUM
-                            ? 0 + $offset
-                            : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
-                        ];
-    }
-
-    /**
-     * The class that the tableMap will make instances of.
-     *
-     * If $withPrefix is true, the returned path
-     * uses a dot-path notation which is translated into a path
-     * relative to a location on the PHP include_path.
-     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
-     *
-     * @param boolean $withPrefix Whether or not to return the path with the class name
-     * @return string path.to.ClassName
-     */
-    public static function getOMClass($withPrefix = true)
-    {
-        return $withPrefix ? GroupModuleTableMap::CLASS_DEFAULT : GroupModuleTableMap::OM_CLASS;
-    }
-
-    /**
-     * Populates an object of the default type or an object that inherit from the default.
-     *
-     * @param array  $row       row returned by DataFetcher->fetch().
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
-                                 One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     * @return array (GroupModule object, last column rank)
-     */
-    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        $key = GroupModuleTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
-        if (null !== ($obj = GroupModuleTableMap::getInstanceFromPool($key))) {
-            // We no longer rehydrate the object, since this can cause data loss.
-            // See http://www.propelorm.org/ticket/509
-            // $obj->hydrate($row, $offset, true); // rehydrate
-            $col = $offset + GroupModuleTableMap::NUM_HYDRATE_COLUMNS;
-        } else {
-            $cls = GroupModuleTableMap::OM_CLASS;
-            $obj = new $cls();
-            $col = $obj->hydrate($row, $offset, false, $indexType);
-            GroupModuleTableMap::addInstanceToPool($obj, $key);
-        }
-
-        return array($obj, $col);
-    }
-
-    /**
-     * The returned array will contain objects of the default type or
-     * objects that inherit from the default.
-     *
-     * @param DataFetcherInterface $dataFetcher
-     * @return array
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function populateObjects(DataFetcherInterface $dataFetcher)
-    {
-        $results = array();
-
-        // set the class once to avoid overhead in the loop
-        $cls = static::getOMClass(false);
-        // populate the object(s)
-        while ($row = $dataFetcher->fetch()) {
-            $key = GroupModuleTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
-            if (null !== ($obj = GroupModuleTableMap::getInstanceFromPool($key))) {
-                // We no longer rehydrate the object, since this can cause data loss.
-                // See http://www.propelorm.org/ticket/509
-                // $obj->hydrate($row, 0, true); // rehydrate
-                $results[] = $obj;
-            } else {
-                $obj = new $cls();
-                $obj->hydrate($row);
-                $results[] = $obj;
-                GroupModuleTableMap::addInstanceToPool($obj, $key);
-            } // if key exists
-        }
-
-        return $results;
-    }
-    /**
-     * Add all the columns needed to create a new object.
-     *
-     * Note: any columns that were marked with lazyLoad="true" in the
-     * XML schema will not be added to the select list and only loaded
-     * on demand.
-     *
-     * @param Criteria $criteria object containing the columns to add.
-     * @param string   $alias    optional table alias
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function addSelectColumns(Criteria $criteria, $alias = null)
-    {
-        if (null === $alias) {
-            $criteria->addSelectColumn(GroupModuleTableMap::ID);
-            $criteria->addSelectColumn(GroupModuleTableMap::GROUP_ID);
-            $criteria->addSelectColumn(GroupModuleTableMap::MODULE_ID);
-            $criteria->addSelectColumn(GroupModuleTableMap::ACCESS);
-            $criteria->addSelectColumn(GroupModuleTableMap::CREATED_AT);
-            $criteria->addSelectColumn(GroupModuleTableMap::UPDATED_AT);
-        } else {
-            $criteria->addSelectColumn($alias . '.ID');
-            $criteria->addSelectColumn($alias . '.GROUP_ID');
-            $criteria->addSelectColumn($alias . '.MODULE_ID');
-            $criteria->addSelectColumn($alias . '.ACCESS');
-            $criteria->addSelectColumn($alias . '.CREATED_AT');
-            $criteria->addSelectColumn($alias . '.UPDATED_AT');
-        }
-    }
-
-    /**
-     * Returns the TableMap related to this object.
-     * This method is not needed for general use but a specific application could have a need.
-     * @return TableMap
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function getTableMap()
-    {
-        return Propel::getServiceContainer()->getDatabaseMap(GroupModuleTableMap::DATABASE_NAME)->getTable(GroupModuleTableMap::TABLE_NAME);
-    }
-
-    /**
-     * Add a TableMap instance to the database for this tableMap class.
-     */
-    public static function buildTableMap()
-    {
-      $dbMap = Propel::getServiceContainer()->getDatabaseMap(GroupModuleTableMap::DATABASE_NAME);
-      if (!$dbMap->hasTable(GroupModuleTableMap::TABLE_NAME)) {
-        $dbMap->addTableObject(new GroupModuleTableMap());
-      }
-    }
-
-    /**
-     * Performs a DELETE on the database, given a GroupModule or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or GroupModule object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-     public static function doDelete($values, ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupModuleTableMap::DATABASE_NAME);
-        }
-
-        if ($values instanceof Criteria) {
-            // rename for clarity
-            $criteria = $values;
-        } elseif ($values instanceof \Thelia\Model\GroupModule) { // it's a model object
-            // create criteria based on pk values
-            $criteria = $values->buildPkeyCriteria();
-        } else { // it's a primary key, or an array of pks
-            $criteria = new Criteria(GroupModuleTableMap::DATABASE_NAME);
-            $criteria->add(GroupModuleTableMap::ID, (array) $values, Criteria::IN);
-        }
-
-        $query = GroupModuleQuery::create()->mergeWith($criteria);
-
-        if ($values instanceof Criteria) { GroupModuleTableMap::clearInstancePool();
-        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
-            foreach ((array) $values as $singleval) { GroupModuleTableMap::removeInstanceFromPool($singleval);
-            }
-        }
-
-        return $query->delete($con);
-    }
-
-    /**
-     * Deletes all rows from the group_module table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public static function doDeleteAll(ConnectionInterface $con = null)
-    {
-        return GroupModuleQuery::create()->doDeleteAll($con);
-    }
-
-    /**
-     * Performs an INSERT on the database, given a GroupModule or Criteria object.
-     *
-     * @param mixed               $criteria Criteria or GroupModule object containing data that is used to create the INSERT statement.
-     * @param ConnectionInterface $con the ConnectionInterface connection to use
-     * @return mixed           The new primary key.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function doInsert($criteria, ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupModuleTableMap::DATABASE_NAME);
-        }
-
-        if ($criteria instanceof Criteria) {
-            $criteria = clone $criteria; // rename for clarity
-        } else {
-            $criteria = $criteria->buildCriteria(); // build Criteria from GroupModule object
-        }
-
-        if ($criteria->containsKey(GroupModuleTableMap::ID) && $criteria->keyContainsValue(GroupModuleTableMap::ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.GroupModuleTableMap::ID.')');
-        }
-
-
-        // Set the correct dbName
-        $query = GroupModuleQuery::create()->mergeWith($criteria);
-
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table (I guess, conceivably)
-            $con->beginTransaction();
-            $pk = $query->doInsert($con);
-            $con->commit();
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-
-        return $pk;
-    }
-
-} // GroupModuleTableMap
-// This is the static code needed to register the TableMap for this table with the main Propel class.
-//
-GroupModuleTableMap::buildTableMap();

core/lib/Thelia/Model/Map/GroupResourceTableMap.php

@@ -1,525 +0,0 @@
-<?php
-
-namespace Thelia\Model\Map;
-
-use Propel\Runtime\Propel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\InstancePoolTrait;
-use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Exception\PropelException;
-use Propel\Runtime\Map\RelationMap;
-use Propel\Runtime\Map\TableMap;
-use Propel\Runtime\Map\TableMapTrait;
-use Thelia\Model\GroupResource;
-use Thelia\Model\GroupResourceQuery;
-
-
-/**
- * This class defines the structure of the 'group_resource' table.
- *
- *
- *
- * This map class is used by Propel to do runtime db structure discovery.
- * For example, the createSelectSql() method checks the type of a given column used in an
- * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
- * (i.e. if it's a text column type).
- *
- */
-class GroupResourceTableMap extends TableMap
-{
-    use InstancePoolTrait;
-    use TableMapTrait;
-    /**
-     * The (dot-path) name of this class
-     */
-    const CLASS_NAME = 'Thelia.Model.Map.GroupResourceTableMap';
-
-    /**
-     * The default database name for this class
-     */
-    const DATABASE_NAME = 'thelia';
-
-    /**
-     * The table name for this class
-     */
-    const TABLE_NAME = 'group_resource';
-
-    /**
-     * The related Propel class for this table
-     */
-    const OM_CLASS = '\\Thelia\\Model\\GroupResource';
-
-    /**
-     * A class that can be returned by this tableMap
-     */
-    const CLASS_DEFAULT = 'Thelia.Model.GroupResource';
-
-    /**
-     * The total number of columns
-     */
-    const NUM_COLUMNS = 7;
-
-    /**
-     * The number of lazy-loaded columns
-     */
-    const NUM_LAZY_LOAD_COLUMNS = 0;
-
-    /**
-     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
-     */
-    const NUM_HYDRATE_COLUMNS = 7;
-
-    /**
-     * the column name for the ID field
-     */
-    const ID = 'group_resource.ID';
-
-    /**
-     * the column name for the GROUP_ID field
-     */
-    const GROUP_ID = 'group_resource.GROUP_ID';
-
-    /**
-     * the column name for the RESOURCE_ID field
-     */
-    const RESOURCE_ID = 'group_resource.RESOURCE_ID';
-
-    /**
-     * the column name for the READ field
-     */
-    const READ = 'group_resource.READ';
-
-    /**
-     * the column name for the WRITE field
-     */
-    const WRITE = 'group_resource.WRITE';
-
-    /**
-     * the column name for the CREATED_AT field
-     */
-    const CREATED_AT = 'group_resource.CREATED_AT';
-
-    /**
-     * the column name for the UPDATED_AT field
-     */
-    const UPDATED_AT = 'group_resource.UPDATED_AT';
-
-    /**
-     * The default string format for model objects of the related table
-     */
-    const DEFAULT_STRING_FORMAT = 'YAML';
-
-    /**
-     * holds an array of fieldnames
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
-     */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'GroupId', 'ResourceId', 'Read', 'Write', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'groupId', 'resourceId', 'read', 'write', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(GroupResourceTableMap::ID, GroupResourceTableMap::GROUP_ID, GroupResourceTableMap::RESOURCE_ID, GroupResourceTableMap::READ, GroupResourceTableMap::WRITE, GroupResourceTableMap::CREATED_AT, GroupResourceTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'GROUP_ID', 'RESOURCE_ID', 'READ', 'WRITE', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'group_id', 'resource_id', 'read', 'write', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
-    );
-
-    /**
-     * holds an array of keys for quick access to the fieldnames array
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
-     */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'GroupId' => 1, 'ResourceId' => 2, 'Read' => 3, 'Write' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'groupId' => 1, 'resourceId' => 2, 'read' => 3, 'write' => 4, 'createdAt' => 5, 'updatedAt' => 6, ),
-        self::TYPE_COLNAME       => array(GroupResourceTableMap::ID => 0, GroupResourceTableMap::GROUP_ID => 1, GroupResourceTableMap::RESOURCE_ID => 2, GroupResourceTableMap::READ => 3, GroupResourceTableMap::WRITE => 4, GroupResourceTableMap::CREATED_AT => 5, GroupResourceTableMap::UPDATED_AT => 6, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'GROUP_ID' => 1, 'RESOURCE_ID' => 2, 'READ' => 3, 'WRITE' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'group_id' => 1, 'resource_id' => 2, 'read' => 3, 'write' => 4, 'created_at' => 5, 'updated_at' => 6, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
-    );
-
-    /**
-     * Initialize the table attributes and columns
-     * Relations are not initialized by this method since they are lazy loaded
-     *
-     * @return void
-     * @throws PropelException
-     */
-    public function initialize()
-    {
-        // attributes
-        $this->setName('group_resource');
-        $this->setPhpName('GroupResource');
-        $this->setClassName('\\Thelia\\Model\\GroupResource');
-        $this->setPackage('Thelia.Model');
-        $this->setUseIdGenerator(true);
-        $this->setIsCrossRef(true);
-        // columns
-        $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
-        $this->addForeignPrimaryKey('GROUP_ID', 'GroupId', 'INTEGER' , 'group', 'ID', true, null, null);
-        $this->addForeignPrimaryKey('RESOURCE_ID', 'ResourceId', 'INTEGER' , 'resource', 'ID', true, null, null);
-        $this->addColumn('READ', 'Read', 'TINYINT', false, null, 0);
-        $this->addColumn('WRITE', 'Write', 'TINYINT', false, null, 0);
-        $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
-        $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
-    } // initialize()
-
-    /**
-     * Build the RelationMap objects for this table relationships
-     */
-    public function buildRelations()
-    {
-        $this->addRelation('Group', '\\Thelia\\Model\\Group', RelationMap::MANY_TO_ONE, array('group_id' => 'id', ), 'CASCADE', 'RESTRICT');
-        $this->addRelation('Resource', '\\Thelia\\Model\\Resource', RelationMap::MANY_TO_ONE, array('resource_id' => 'id', ), 'CASCADE', 'RESTRICT');
-    } // buildRelations()
-
-    /**
-     *
-     * Gets the list of behaviors registered for this table
-     *
-     * @return array Associative array (name => parameters) of behaviors
-     */
-    public function getBehaviors()
-    {
-        return array(
-            'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
-        );
-    } // getBehaviors()
-
-    /**
-     * Adds an object to the instance pool.
-     *
-     * Propel keeps cached copies of objects in an instance pool when they are retrieved
-     * from the database. In some cases you may need to explicitly add objects
-     * to the cache in order to ensure that the same objects are always returned by find*()
-     * and findPk*() calls.
-     *
-     * @param \Thelia\Model\GroupResource $obj A \Thelia\Model\GroupResource object.
-     * @param string $key             (optional) key to use for instance map (for performance boost if key was already calculated externally).
-     */
-    public static function addInstanceToPool($obj, $key = null)
-    {
-        if (Propel::isInstancePoolingEnabled()) {
-            if (null === $key) {
-                $key = serialize(array((string) $obj->getId(), (string) $obj->getGroupId(), (string) $obj->getResourceId()));
-            } // if key === null
-            self::$instances[$key] = $obj;
-        }
-    }
-
-    /**
-     * Removes an object from the instance pool.
-     *
-     * Propel keeps cached copies of objects in an instance pool when they are retrieved
-     * from the database.  In some cases -- especially when you override doDelete
-     * methods in your stub classes -- you may need to explicitly remove objects
-     * from the cache in order to prevent returning objects that no longer exist.
-     *
-     * @param mixed $value A \Thelia\Model\GroupResource object or a primary key value.
-     */
-    public static function removeInstanceFromPool($value)
-    {
-        if (Propel::isInstancePoolingEnabled() && null !== $value) {
-            if (is_object($value) && $value instanceof \Thelia\Model\GroupResource) {
-                $key = serialize(array((string) $value->getId(), (string) $value->getGroupId(), (string) $value->getResourceId()));
-
-            } elseif (is_array($value) && count($value) === 3) {
-                // assume we've been passed a primary key";
-                $key = serialize(array((string) $value[0], (string) $value[1], (string) $value[2]));
-            } elseif ($value instanceof Criteria) {
-                self::$instances = [];
-
-                return;
-            } else {
-                $e = new PropelException("Invalid value passed to removeInstanceFromPool().  Expected primary key or \Thelia\Model\GroupResource object; got " . (is_object($value) ? get_class($value) . ' object.' : var_export($value, true)));
-                throw $e;
-            }
-
-            unset(self::$instances[$key]);
-        }
-    }
-
-    /**
-     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-     *
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, a serialize()d version of the primary key will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     */
-    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('GroupId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('ResourceId', TableMap::TYPE_PHPNAME, $indexType)] === null) {
-            return null;
-        }
-
-        return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('GroupId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('ResourceId', TableMap::TYPE_PHPNAME, $indexType)]));
-    }
-
-    /**
-     * Retrieves the primary key from the DB resultset row
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, an array of the primary key columns will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return mixed The primary key of the row
-     */
-    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-
-            return $pks;
-    }
-
-    /**
-     * The class that the tableMap will make instances of.
-     *
-     * If $withPrefix is true, the returned path
-     * uses a dot-path notation which is translated into a path
-     * relative to a location on the PHP include_path.
-     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
-     *
-     * @param boolean $withPrefix Whether or not to return the path with the class name
-     * @return string path.to.ClassName
-     */
-    public static function getOMClass($withPrefix = true)
-    {
-        return $withPrefix ? GroupResourceTableMap::CLASS_DEFAULT : GroupResourceTableMap::OM_CLASS;
-    }
-
-    /**
-     * Populates an object of the default type or an object that inherit from the default.
-     *
-     * @param array  $row       row returned by DataFetcher->fetch().
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
-                                 One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     * @return array (GroupResource object, last column rank)
-     */
-    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        $key = GroupResourceTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
-        if (null !== ($obj = GroupResourceTableMap::getInstanceFromPool($key))) {
-            // We no longer rehydrate the object, since this can cause data loss.
-            // See http://www.propelorm.org/ticket/509
-            // $obj->hydrate($row, $offset, true); // rehydrate
-            $col = $offset + GroupResourceTableMap::NUM_HYDRATE_COLUMNS;
-        } else {
-            $cls = GroupResourceTableMap::OM_CLASS;
-            $obj = new $cls();
-            $col = $obj->hydrate($row, $offset, false, $indexType);
-            GroupResourceTableMap::addInstanceToPool($obj, $key);
-        }
-
-        return array($obj, $col);
-    }
-
-    /**
-     * The returned array will contain objects of the default type or
-     * objects that inherit from the default.
-     *
-     * @param DataFetcherInterface $dataFetcher
-     * @return array
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function populateObjects(DataFetcherInterface $dataFetcher)
-    {
-        $results = array();
-
-        // set the class once to avoid overhead in the loop
-        $cls = static::getOMClass(false);
-        // populate the object(s)
-        while ($row = $dataFetcher->fetch()) {
-            $key = GroupResourceTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
-            if (null !== ($obj = GroupResourceTableMap::getInstanceFromPool($key))) {
-                // We no longer rehydrate the object, since this can cause data loss.
-                // See http://www.propelorm.org/ticket/509
-                // $obj->hydrate($row, 0, true); // rehydrate
-                $results[] = $obj;
-            } else {
-                $obj = new $cls();
-                $obj->hydrate($row);
-                $results[] = $obj;
-                GroupResourceTableMap::addInstanceToPool($obj, $key);
-            } // if key exists
-        }
-
-        return $results;
-    }
-    /**
-     * Add all the columns needed to create a new object.
-     *
-     * Note: any columns that were marked with lazyLoad="true" in the
-     * XML schema will not be added to the select list and only loaded
-     * on demand.
-     *
-     * @param Criteria $criteria object containing the columns to add.
-     * @param string   $alias    optional table alias
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function addSelectColumns(Criteria $criteria, $alias = null)
-    {
-        if (null === $alias) {
-            $criteria->addSelectColumn(GroupResourceTableMap::ID);
-            $criteria->addSelectColumn(GroupResourceTableMap::GROUP_ID);
-            $criteria->addSelectColumn(GroupResourceTableMap::RESOURCE_ID);
-            $criteria->addSelectColumn(GroupResourceTableMap::READ);
-            $criteria->addSelectColumn(GroupResourceTableMap::WRITE);
-            $criteria->addSelectColumn(GroupResourceTableMap::CREATED_AT);
-            $criteria->addSelectColumn(GroupResourceTableMap::UPDATED_AT);
-        } else {
-            $criteria->addSelectColumn($alias . '.ID');
-            $criteria->addSelectColumn($alias . '.GROUP_ID');
-            $criteria->addSelectColumn($alias . '.RESOURCE_ID');
-            $criteria->addSelectColumn($alias . '.READ');
-            $criteria->addSelectColumn($alias . '.WRITE');
-            $criteria->addSelectColumn($alias . '.CREATED_AT');
-            $criteria->addSelectColumn($alias . '.UPDATED_AT');
-        }
-    }
-
-    /**
-     * Returns the TableMap related to this object.
-     * This method is not needed for general use but a specific application could have a need.
-     * @return TableMap
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function getTableMap()
-    {
-        return Propel::getServiceContainer()->getDatabaseMap(GroupResourceTableMap::DATABASE_NAME)->getTable(GroupResourceTableMap::TABLE_NAME);
-    }
-
-    /**
-     * Add a TableMap instance to the database for this tableMap class.
-     */
-    public static function buildTableMap()
-    {
-      $dbMap = Propel::getServiceContainer()->getDatabaseMap(GroupResourceTableMap::DATABASE_NAME);
-      if (!$dbMap->hasTable(GroupResourceTableMap::TABLE_NAME)) {
-        $dbMap->addTableObject(new GroupResourceTableMap());
-      }
-    }
-
-    /**
-     * Performs a DELETE on the database, given a GroupResource or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or GroupResource object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-     public static function doDelete($values, ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupResourceTableMap::DATABASE_NAME);
-        }
-
-        if ($values instanceof Criteria) {
-            // rename for clarity
-            $criteria = $values;
-        } elseif ($values instanceof \Thelia\Model\GroupResource) { // it's a model object
-            // create criteria based on pk values
-            $criteria = $values->buildPkeyCriteria();
-        } else { // it's a primary key, or an array of pks
-            $criteria = new Criteria(GroupResourceTableMap::DATABASE_NAME);
-            // primary key is composite; we therefore, expect
-            // the primary key passed to be an array of pkey values
-            if (count($values) == count($values, COUNT_RECURSIVE)) {
-                // array is not multi-dimensional
-                $values = array($values);
-            }
-            foreach ($values as $value) {
-                $criterion = $criteria->getNewCriterion(GroupResourceTableMap::ID, $value[0]);
-                $criterion->addAnd($criteria->getNewCriterion(GroupResourceTableMap::GROUP_ID, $value[1]));
-                $criterion->addAnd($criteria->getNewCriterion(GroupResourceTableMap::RESOURCE_ID, $value[2]));
-                $criteria->addOr($criterion);
-            }
-        }
-
-        $query = GroupResourceQuery::create()->mergeWith($criteria);
-
-        if ($values instanceof Criteria) { GroupResourceTableMap::clearInstancePool();
-        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
-            foreach ((array) $values as $singleval) { GroupResourceTableMap::removeInstanceFromPool($singleval);
-            }
-        }
-
-        return $query->delete($con);
-    }
-
-    /**
-     * Deletes all rows from the group_resource table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public static function doDeleteAll(ConnectionInterface $con = null)
-    {
-        return GroupResourceQuery::create()->doDeleteAll($con);
-    }
-
-    /**
-     * Performs an INSERT on the database, given a GroupResource or Criteria object.
-     *
-     * @param mixed               $criteria Criteria or GroupResource object containing data that is used to create the INSERT statement.
-     * @param ConnectionInterface $con the ConnectionInterface connection to use
-     * @return mixed           The new primary key.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function doInsert($criteria, ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupResourceTableMap::DATABASE_NAME);
-        }
-
-        if ($criteria instanceof Criteria) {
-            $criteria = clone $criteria; // rename for clarity
-        } else {
-            $criteria = $criteria->buildCriteria(); // build Criteria from GroupResource object
-        }
-
-        if ($criteria->containsKey(GroupResourceTableMap::ID) && $criteria->keyContainsValue(GroupResourceTableMap::ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.GroupResourceTableMap::ID.')');
-        }
-
-
-        // Set the correct dbName
-        $query = GroupResourceQuery::create()->mergeWith($criteria);
-
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table (I guess, conceivably)
-            $con->beginTransaction();
-            $pk = $query->doInsert($con);
-            $con->commit();
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-
-        return $pk;
-    }
-
-} // GroupResourceTableMap
-// This is the static code needed to register the TableMap for this table with the main Propel class.
-//
-GroupResourceTableMap::buildTableMap();

core/lib/Thelia/Model/Map/GroupTableMap.php

@@ -1,466 +0,0 @@
-<?php
-
-namespace Thelia\Model\Map;
-
-use Propel\Runtime\Propel;
-use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\InstancePoolTrait;
-use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Exception\PropelException;
-use Propel\Runtime\Map\RelationMap;
-use Propel\Runtime\Map\TableMap;
-use Propel\Runtime\Map\TableMapTrait;
-use Thelia\Model\Group;
-use Thelia\Model\GroupQuery;
-
-
-/**
- * This class defines the structure of the 'group' table.
- *
- *
- *
- * This map class is used by Propel to do runtime db structure discovery.
- * For example, the createSelectSql() method checks the type of a given column used in an
- * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
- * (i.e. if it's a text column type).
- *
- */
-class GroupTableMap extends TableMap
-{
-    use InstancePoolTrait;
-    use TableMapTrait;
-    /**
-     * The (dot-path) name of this class
-     */
-    const CLASS_NAME = 'Thelia.Model.Map.GroupTableMap';
-
-    /**
-     * The default database name for this class
-     */
-    const DATABASE_NAME = 'thelia';
-
-    /**
-     * The table name for this class
-     */
-    const TABLE_NAME = 'group';
-
-    /**
-     * The related Propel class for this table
-     */
-    const OM_CLASS = '\\Thelia\\Model\\Group';
-
-    /**
-     * A class that can be returned by this tableMap
-     */
-    const CLASS_DEFAULT = 'Thelia.Model.Group';
-
-    /**
-     * The total number of columns
-     */
-    const NUM_COLUMNS = 4;
-
-    /**
-     * The number of lazy-loaded columns
-     */
-    const NUM_LAZY_LOAD_COLUMNS = 0;
-
-    /**
-     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
-     */
-    const NUM_HYDRATE_COLUMNS = 4;
-
-    /**
-     * the column name for the ID field
-     */
-    const ID = 'group.ID';
-
-    /**
-     * the column name for the CODE field
-     */
-    const CODE = 'group.CODE';
-
-    /**
-     * the column name for the CREATED_AT field
-     */
-    const CREATED_AT = 'group.CREATED_AT';
-
-    /**
-     * the column name for the UPDATED_AT field
-     */
-    const UPDATED_AT = 'group.UPDATED_AT';
-
-    /**
-     * The default string format for model objects of the related table
-     */
-    const DEFAULT_STRING_FORMAT = 'YAML';
-
-    // i18n behavior
-
-    /**
-     * The default locale to use for translations.
-     *
-     * @var string
-     */
-    const DEFAULT_LOCALE = 'en_US';
-
-    /**
-     * holds an array of fieldnames
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
-     */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'Code', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'code', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(GroupTableMap::ID, GroupTableMap::CODE, GroupTableMap::CREATED_AT, GroupTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'CODE', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'code', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, )
-    );
-
-    /**
-     * holds an array of keys for quick access to the fieldnames array
-     *
-     * first dimension keys are the type constants
-     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
-     */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'Code' => 1, 'CreatedAt' => 2, 'UpdatedAt' => 3, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'createdAt' => 2, 'updatedAt' => 3, ),
-        self::TYPE_COLNAME       => array(GroupTableMap::ID => 0, GroupTableMap::CODE => 1, GroupTableMap::CREATED_AT => 2, GroupTableMap::UPDATED_AT => 3, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'CODE' => 1, 'CREATED_AT' => 2, 'UPDATED_AT' => 3, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'code' => 1, 'created_at' => 2, 'updated_at' => 3, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, )
-    );
-
-    /**
-     * Initialize the table attributes and columns
-     * Relations are not initialized by this method since they are lazy loaded
-     *
-     * @return void
-     * @throws PropelException
-     */
-    public function initialize()
-    {
-        // attributes
-        $this->setName('group');
-        $this->setPhpName('Group');
-        $this->setClassName('\\Thelia\\Model\\Group');
-        $this->setPackage('Thelia.Model');
-        $this->setUseIdGenerator(true);
-        // columns
-        $this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
-        $this->addColumn('CODE', 'Code', 'VARCHAR', true, 30, null);
-        $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
-        $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
-    } // initialize()
-
-    /**
-     * Build the RelationMap objects for this table relationships
-     */
-    public function buildRelations()
-    {
-        $this->addRelation('AdminGroup', '\\Thelia\\Model\\AdminGroup', RelationMap::ONE_TO_MANY, array('id' => 'group_id', ), 'CASCADE', 'RESTRICT', 'AdminGroups');
-        $this->addRelation('GroupResource', '\\Thelia\\Model\\GroupResource', RelationMap::ONE_TO_MANY, array('id' => 'group_id', ), 'CASCADE', 'RESTRICT', 'GroupResources');
-        $this->addRelation('GroupModule', '\\Thelia\\Model\\GroupModule', RelationMap::ONE_TO_MANY, array('id' => 'group_id', ), 'CASCADE', 'CASCADE', 'GroupModules');
-        $this->addRelation('GroupI18n', '\\Thelia\\Model\\GroupI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'GroupI18ns');
-        $this->addRelation('Admin', '\\Thelia\\Model\\Admin', RelationMap::MANY_TO_MANY, array(), 'CASCADE', 'RESTRICT', 'Admins');
-        $this->addRelation('Resource', '\\Thelia\\Model\\Resource', RelationMap::MANY_TO_MANY, array(), 'CASCADE', 'RESTRICT', 'Resources');
-    } // buildRelations()
-
-    /**
-     *
-     * Gets the list of behaviors registered for this table
-     *
-     * @return array Associative array (name => parameters) of behaviors
-     */
-    public function getBehaviors()
-    {
-        return array(
-            'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
-            'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => 'title, description, chapo, postscriptum', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ),
-        );
-    } // getBehaviors()
-    /**
-     * Method to invalidate the instance pool of all tables related to group     * by a foreign key with ON DELETE CASCADE
-     */
-    public static function clearRelatedInstancePool()
-    {
-        // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool,
-        // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
-                AdminGroupTableMap::clearInstancePool();
-                GroupResourceTableMap::clearInstancePool();
-                GroupModuleTableMap::clearInstancePool();
-                GroupI18nTableMap::clearInstancePool();
-            }
-
-    /**
-     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-     *
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, a serialize()d version of the primary key will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     */
-    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        // If the PK cannot be derived from the row, return NULL.
-        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
-            return null;
-        }
-
-        return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
-    }
-
-    /**
-     * Retrieves the primary key from the DB resultset row
-     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-     * a multi-column primary key, an array of the primary key columns will be returned.
-     *
-     * @param array  $row       resultset row.
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
-     *
-     * @return mixed The primary key of the row
-     */
-    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-
-            return (int) $row[
-                            $indexType == TableMap::TYPE_NUM
-                            ? 0 + $offset
-                            : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
-                        ];
-    }
-
-    /**
-     * The class that the tableMap will make instances of.
-     *
-     * If $withPrefix is true, the returned path
-     * uses a dot-path notation which is translated into a path
-     * relative to a location on the PHP include_path.
-     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
-     *
-     * @param boolean $withPrefix Whether or not to return the path with the class name
-     * @return string path.to.ClassName
-     */
-    public static function getOMClass($withPrefix = true)
-    {
-        return $withPrefix ? GroupTableMap::CLASS_DEFAULT : GroupTableMap::OM_CLASS;
-    }
-
-    /**
-     * Populates an object of the default type or an object that inherit from the default.
-     *
-     * @param array  $row       row returned by DataFetcher->fetch().
-     * @param int    $offset    The 0-based offset for reading from the resultset row.
-     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
-                                 One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     * @return array (Group object, last column rank)
-     */
-    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
-    {
-        $key = GroupTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
-        if (null !== ($obj = GroupTableMap::getInstanceFromPool($key))) {
-            // We no longer rehydrate the object, since this can cause data loss.
-            // See http://www.propelorm.org/ticket/509
-            // $obj->hydrate($row, $offset, true); // rehydrate
-            $col = $offset + GroupTableMap::NUM_HYDRATE_COLUMNS;
-        } else {
-            $cls = GroupTableMap::OM_CLASS;
-            $obj = new $cls();
-            $col = $obj->hydrate($row, $offset, false, $indexType);
-            GroupTableMap::addInstanceToPool($obj, $key);
-        }
-
-        return array($obj, $col);
-    }
-
-    /**
-     * The returned array will contain objects of the default type or
-     * objects that inherit from the default.
-     *
-     * @param DataFetcherInterface $dataFetcher
-     * @return array
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function populateObjects(DataFetcherInterface $dataFetcher)
-    {
-        $results = array();
-
-        // set the class once to avoid overhead in the loop
-        $cls = static::getOMClass(false);
-        // populate the object(s)
-        while ($row = $dataFetcher->fetch()) {
-            $key = GroupTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
-            if (null !== ($obj = GroupTableMap::getInstanceFromPool($key))) {
-                // We no longer rehydrate the object, since this can cause data loss.
-                // See http://www.propelorm.org/ticket/509
-                // $obj->hydrate($row, 0, true); // rehydrate
-                $results[] = $obj;
-            } else {
-                $obj = new $cls();
-                $obj->hydrate($row);
-                $results[] = $obj;
-                GroupTableMap::addInstanceToPool($obj, $key);
-            } // if key exists
-        }
-
-        return $results;
-    }
-    /**
-     * Add all the columns needed to create a new object.
-     *
-     * Note: any columns that were marked with lazyLoad="true" in the
-     * XML schema will not be added to the select list and only loaded
-     * on demand.
-     *
-     * @param Criteria $criteria object containing the columns to add.
-     * @param string   $alias    optional table alias
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function addSelectColumns(Criteria $criteria, $alias = null)
-    {
-        if (null === $alias) {
-            $criteria->addSelectColumn(GroupTableMap::ID);
-            $criteria->addSelectColumn(GroupTableMap::CODE);
-            $criteria->addSelectColumn(GroupTableMap::CREATED_AT);
-            $criteria->addSelectColumn(GroupTableMap::UPDATED_AT);
-        } else {
-            $criteria->addSelectColumn($alias . '.ID');
-            $criteria->addSelectColumn($alias . '.CODE');
-            $criteria->addSelectColumn($alias . '.CREATED_AT');
-            $criteria->addSelectColumn($alias . '.UPDATED_AT');
-        }
-    }
-
-    /**
-     * Returns the TableMap related to this object.
-     * This method is not needed for general use but a specific application could have a need.
-     * @return TableMap
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function getTableMap()
-    {
-        return Propel::getServiceContainer()->getDatabaseMap(GroupTableMap::DATABASE_NAME)->getTable(GroupTableMap::TABLE_NAME);
-    }
-
-    /**
-     * Add a TableMap instance to the database for this tableMap class.
-     */
-    public static function buildTableMap()
-    {
-      $dbMap = Propel::getServiceContainer()->getDatabaseMap(GroupTableMap::DATABASE_NAME);
-      if (!$dbMap->hasTable(GroupTableMap::TABLE_NAME)) {
-        $dbMap->addTableObject(new GroupTableMap());
-      }
-    }
-
-    /**
-     * Performs a DELETE on the database, given a Group or Criteria object OR a primary key value.
-     *
-     * @param mixed               $values Criteria or Group object or primary key or array of primary keys
-     *              which is used to create the DELETE statement
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-     public static function doDelete($values, ConnectionInterface $con = null)
-     {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupTableMap::DATABASE_NAME);
-        }
-
-        if ($values instanceof Criteria) {
-            // rename for clarity
-            $criteria = $values;
-        } elseif ($values instanceof \Thelia\Model\Group) { // it's a model object
-            // create criteria based on pk values
-            $criteria = $values->buildPkeyCriteria();
-        } else { // it's a primary key, or an array of pks
-            $criteria = new Criteria(GroupTableMap::DATABASE_NAME);
-            $criteria->add(GroupTableMap::ID, (array) $values, Criteria::IN);
-        }
-
-        $query = GroupQuery::create()->mergeWith($criteria);
-
-        if ($values instanceof Criteria) { GroupTableMap::clearInstancePool();
-        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
-            foreach ((array) $values as $singleval) { GroupTableMap::removeInstanceFromPool($singleval);
-            }
-        }
-
-        return $query->delete($con);
-    }
-
-    /**
-     * Deletes all rows from the group table.
-     *
-     * @param ConnectionInterface $con the connection to use
-     * @return int The number of affected rows (if supported by underlying database driver).
-     */
-    public static function doDeleteAll(ConnectionInterface $con = null)
-    {
-        return GroupQuery::create()->doDeleteAll($con);
-    }
-
-    /**
-     * Performs an INSERT on the database, given a Group or Criteria object.
-     *
-     * @param mixed               $criteria Criteria or Group object containing data that is used to create the INSERT statement.
-     * @param ConnectionInterface $con the ConnectionInterface connection to use
-     * @return mixed           The new primary key.
-     * @throws PropelException Any exceptions caught during processing will be
-     *         rethrown wrapped into a PropelException.
-     */
-    public static function doInsert($criteria, ConnectionInterface $con = null)
-    {
-        if (null === $con) {
-            $con = Propel::getServiceContainer()->getWriteConnection(GroupTableMap::DATABASE_NAME);
-        }
-
-        if ($criteria instanceof Criteria) {
-            $criteria = clone $criteria; // rename for clarity
-        } else {
-            $criteria = $criteria->buildCriteria(); // build Criteria from Group object
-        }
-
-        if ($criteria->containsKey(GroupTableMap::ID) && $criteria->keyContainsValue(GroupTableMap::ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.GroupTableMap::ID.')');
-        }
-
-
-        // Set the correct dbName
-        $query = GroupQuery::create()->mergeWith($criteria);
-
-        try {
-            // use transaction because $criteria could contain info
-            // for more than one table (I guess, conceivably)
-            $con->beginTransaction();
-            $pk = $query->doInsert($con);
-            $con->commit();
-        } catch (PropelException $e) {
-            $con->rollBack();
-            throw $e;
-        }
-
-        return $pk;
-    }
-
-} // GroupTableMap
-// This is the static code needed to register the TableMap for this table with the main Propel class.
-//
-GroupTableMap::buildTableMap();

core/lib/Thelia/Model/Map/ModuleTableMap.php

@@ -187,7 +187,7 @@ class ModuleTableMap extends TableMap
         $this->addRelation('OrderRelatedByPaymentModuleId', '\\Thelia\\Model\\Order', RelationMap::ONE_TO_MANY, array('id' => 'payment_module_id', ), 'RESTRICT', 'RESTRICT', 'OrdersRelatedByPaymentModuleId');
         $this->addRelation('OrderRelatedByDeliveryModuleId', '\\Thelia\\Model\\Order', RelationMap::ONE_TO_MANY, array('id' => 'delivery_module_id', ), 'RESTRICT', 'RESTRICT', 'OrdersRelatedByDeliveryModuleId');
         $this->addRelation('AreaDeliveryModule', '\\Thelia\\Model\\AreaDeliveryModule', RelationMap::ONE_TO_MANY, array('id' => 'delivery_module_id', ), 'CASCADE', 'RESTRICT', 'AreaDeliveryModules');
-        $this->addRelation('GroupModule', '\\Thelia\\Model\\GroupModule', RelationMap::ONE_TO_MANY, array('id' => 'module_id', ), 'CASCADE', 'RESTRICT', 'GroupModules');
+        $this->addRelation('ProfileModule', '\\Thelia\\Model\\ProfileModule', RelationMap::ONE_TO_MANY, array('id' => 'module_id', ), 'CASCADE', 'RESTRICT', 'ProfileModules');
         $this->addRelation('ModuleImage', '\\Thelia\\Model\\ModuleImage', RelationMap::ONE_TO_MANY, array('id' => 'module_id', ), 'CASCADE', 'RESTRICT', 'ModuleImages');
         $this->addRelation('ModuleI18n', '\\Thelia\\Model\\ModuleI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'ModuleI18ns');
     } // buildRelations()
@@ -213,7 +213,7 @@ class ModuleTableMap extends TableMap
         // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool,
         // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
                 AreaDeliveryModuleTableMap::clearInstancePool();
-                GroupModuleTableMap::clearInstancePool();
+                ProfileModuleTableMap::clearInstancePool();
                 ModuleImageTableMap::clearInstancePool();
                 ModuleI18nTableMap::clearInstancePool();
             }

core/lib/Thelia/Model/Map/OrderProductTableMap.php

@@ -57,7 +57,7 @@ class OrderProductTableMap extends TableMap
     /**
      * The total number of columns
      */
-    const NUM_COLUMNS = 19;
+    const NUM_COLUMNS = 20;
 
     /**
      * The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class OrderProductTableMap extends TableMap
     /**
      * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
      */
-    const NUM_HYDRATE_COLUMNS = 19;
+    const NUM_HYDRATE_COLUMNS = 20;
 
     /**
      * the column name for the ID field
@@ -139,6 +139,11 @@ class OrderProductTableMap extends TableMap
      */
     const WEIGHT = 'order_product.WEIGHT';
 
+    /**
+     * the column name for the EAN_CODE field
+     */
+    const EAN_CODE = 'order_product.EAN_CODE';
+
     /**
      * the column name for the TAX_RULE_TITLE field
      */
@@ -176,12 +181,12 @@ class OrderProductTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'OrderId', 'ProductRef', 'ProductSaleElementsRef', 'Title', 'Chapo', 'Description', 'Postscriptum', 'Quantity', 'Price', 'PromoPrice', 'WasNew', 'WasInPromo', 'Weight', 'TaxRuleTitle', 'TaxRuleDescription', 'Parent', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'orderId', 'productRef', 'productSaleElementsRef', 'title', 'chapo', 'description', 'postscriptum', 'quantity', 'price', 'promoPrice', 'wasNew', 'wasInPromo', 'weight', 'taxRuleTitle', 'taxRuleDescription', 'parent', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(OrderProductTableMap::ID, OrderProductTableMap::ORDER_ID, OrderProductTableMap::PRODUCT_REF, OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF, OrderProductTableMap::TITLE, OrderProductTableMap::CHAPO, OrderProductTableMap::DESCRIPTION, OrderProductTableMap::POSTSCRIPTUM, OrderProductTableMap::QUANTITY, OrderProductTableMap::PRICE, OrderProductTableMap::PROMO_PRICE, OrderProductTableMap::WAS_NEW, OrderProductTableMap::WAS_IN_PROMO, OrderProductTableMap::WEIGHT, OrderProductTableMap::TAX_RULE_TITLE, OrderProductTableMap::TAX_RULE_DESCRIPTION, OrderProductTableMap::PARENT, OrderProductTableMap::CREATED_AT, OrderProductTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'ORDER_ID', 'PRODUCT_REF', 'PRODUCT_SALE_ELEMENTS_REF', 'TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM', 'QUANTITY', 'PRICE', 'PROMO_PRICE', 'WAS_NEW', 'WAS_IN_PROMO', 'WEIGHT', 'TAX_RULE_TITLE', 'TAX_RULE_DESCRIPTION', 'PARENT', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'order_id', 'product_ref', 'product_sale_elements_ref', 'title', 'chapo', 'description', 'postscriptum', 'quantity', 'price', 'promo_price', 'was_new', 'was_in_promo', 'weight', 'tax_rule_title', 'tax_rule_description', 'parent', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
+        self::TYPE_PHPNAME       => array('Id', 'OrderId', 'ProductRef', 'ProductSaleElementsRef', 'Title', 'Chapo', 'Description', 'Postscriptum', 'Quantity', 'Price', 'PromoPrice', 'WasNew', 'WasInPromo', 'Weight', 'EanCode', 'TaxRuleTitle', 'TaxRuleDescription', 'Parent', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'orderId', 'productRef', 'productSaleElementsRef', 'title', 'chapo', 'description', 'postscriptum', 'quantity', 'price', 'promoPrice', 'wasNew', 'wasInPromo', 'weight', 'eanCode', 'taxRuleTitle', 'taxRuleDescription', 'parent', 'createdAt', 'updatedAt', ),
+        self::TYPE_COLNAME       => array(OrderProductTableMap::ID, OrderProductTableMap::ORDER_ID, OrderProductTableMap::PRODUCT_REF, OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF, OrderProductTableMap::TITLE, OrderProductTableMap::CHAPO, OrderProductTableMap::DESCRIPTION, OrderProductTableMap::POSTSCRIPTUM, OrderProductTableMap::QUANTITY, OrderProductTableMap::PRICE, OrderProductTableMap::PROMO_PRICE, OrderProductTableMap::WAS_NEW, OrderProductTableMap::WAS_IN_PROMO, OrderProductTableMap::WEIGHT, OrderProductTableMap::EAN_CODE, OrderProductTableMap::TAX_RULE_TITLE, OrderProductTableMap::TAX_RULE_DESCRIPTION, OrderProductTableMap::PARENT, OrderProductTableMap::CREATED_AT, OrderProductTableMap::UPDATED_AT, ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'ORDER_ID', 'PRODUCT_REF', 'PRODUCT_SALE_ELEMENTS_REF', 'TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM', 'QUANTITY', 'PRICE', 'PROMO_PRICE', 'WAS_NEW', 'WAS_IN_PROMO', 'WEIGHT', 'EAN_CODE', 'TAX_RULE_TITLE', 'TAX_RULE_DESCRIPTION', 'PARENT', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_FIELDNAME     => array('id', 'order_id', 'product_ref', 'product_sale_elements_ref', 'title', 'chapo', 'description', 'postscriptum', 'quantity', 'price', 'promo_price', 'was_new', 'was_in_promo', 'weight', 'ean_code', 'tax_rule_title', 'tax_rule_description', 'parent', 'created_at', 'updated_at', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, )
     );
 
     /**
@@ -191,12 +196,12 @@ class OrderProductTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'OrderId' => 1, 'ProductRef' => 2, 'ProductSaleElementsRef' => 3, 'Title' => 4, 'Chapo' => 5, 'Description' => 6, 'Postscriptum' => 7, 'Quantity' => 8, 'Price' => 9, 'PromoPrice' => 10, 'WasNew' => 11, 'WasInPromo' => 12, 'Weight' => 13, 'TaxRuleTitle' => 14, 'TaxRuleDescription' => 15, 'Parent' => 16, 'CreatedAt' => 17, 'UpdatedAt' => 18, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderId' => 1, 'productRef' => 2, 'productSaleElementsRef' => 3, 'title' => 4, 'chapo' => 5, 'description' => 6, 'postscriptum' => 7, 'quantity' => 8, 'price' => 9, 'promoPrice' => 10, 'wasNew' => 11, 'wasInPromo' => 12, 'weight' => 13, 'taxRuleTitle' => 14, 'taxRuleDescription' => 15, 'parent' => 16, 'createdAt' => 17, 'updatedAt' => 18, ),
-        self::TYPE_COLNAME       => array(OrderProductTableMap::ID => 0, OrderProductTableMap::ORDER_ID => 1, OrderProductTableMap::PRODUCT_REF => 2, OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF => 3, OrderProductTableMap::TITLE => 4, OrderProductTableMap::CHAPO => 5, OrderProductTableMap::DESCRIPTION => 6, OrderProductTableMap::POSTSCRIPTUM => 7, OrderProductTableMap::QUANTITY => 8, OrderProductTableMap::PRICE => 9, OrderProductTableMap::PROMO_PRICE => 10, OrderProductTableMap::WAS_NEW => 11, OrderProductTableMap::WAS_IN_PROMO => 12, OrderProductTableMap::WEIGHT => 13, OrderProductTableMap::TAX_RULE_TITLE => 14, OrderProductTableMap::TAX_RULE_DESCRIPTION => 15, OrderProductTableMap::PARENT => 16, OrderProductTableMap::CREATED_AT => 17, OrderProductTableMap::UPDATED_AT => 18, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'ORDER_ID' => 1, 'PRODUCT_REF' => 2, 'PRODUCT_SALE_ELEMENTS_REF' => 3, 'TITLE' => 4, 'CHAPO' => 5, 'DESCRIPTION' => 6, 'POSTSCRIPTUM' => 7, 'QUANTITY' => 8, 'PRICE' => 9, 'PROMO_PRICE' => 10, 'WAS_NEW' => 11, 'WAS_IN_PROMO' => 12, 'WEIGHT' => 13, 'TAX_RULE_TITLE' => 14, 'TAX_RULE_DESCRIPTION' => 15, 'PARENT' => 16, 'CREATED_AT' => 17, 'UPDATED_AT' => 18, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'order_id' => 1, 'product_ref' => 2, 'product_sale_elements_ref' => 3, 'title' => 4, 'chapo' => 5, 'description' => 6, 'postscriptum' => 7, 'quantity' => 8, 'price' => 9, 'promo_price' => 10, 'was_new' => 11, 'was_in_promo' => 12, 'weight' => 13, 'tax_rule_title' => 14, 'tax_rule_description' => 15, 'parent' => 16, 'created_at' => 17, 'updated_at' => 18, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
+        self::TYPE_PHPNAME       => array('Id' => 0, 'OrderId' => 1, 'ProductRef' => 2, 'ProductSaleElementsRef' => 3, 'Title' => 4, 'Chapo' => 5, 'Description' => 6, 'Postscriptum' => 7, 'Quantity' => 8, 'Price' => 9, 'PromoPrice' => 10, 'WasNew' => 11, 'WasInPromo' => 12, 'Weight' => 13, 'EanCode' => 14, 'TaxRuleTitle' => 15, 'TaxRuleDescription' => 16, 'Parent' => 17, 'CreatedAt' => 18, 'UpdatedAt' => 19, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'orderId' => 1, 'productRef' => 2, 'productSaleElementsRef' => 3, 'title' => 4, 'chapo' => 5, 'description' => 6, 'postscriptum' => 7, 'quantity' => 8, 'price' => 9, 'promoPrice' => 10, 'wasNew' => 11, 'wasInPromo' => 12, 'weight' => 13, 'eanCode' => 14, 'taxRuleTitle' => 15, 'taxRuleDescription' => 16, 'parent' => 17, 'createdAt' => 18, 'updatedAt' => 19, ),
+        self::TYPE_COLNAME       => array(OrderProductTableMap::ID => 0, OrderProductTableMap::ORDER_ID => 1, OrderProductTableMap::PRODUCT_REF => 2, OrderProductTableMap::PRODUCT_SALE_ELEMENTS_REF => 3, OrderProductTableMap::TITLE => 4, OrderProductTableMap::CHAPO => 5, OrderProductTableMap::DESCRIPTION => 6, OrderProductTableMap::POSTSCRIPTUM => 7, OrderProductTableMap::QUANTITY => 8, OrderProductTableMap::PRICE => 9, OrderProductTableMap::PROMO_PRICE => 10, OrderProductTableMap::WAS_NEW => 11, OrderProductTableMap::WAS_IN_PROMO => 12, OrderProductTableMap::WEIGHT => 13, OrderProductTableMap::EAN_CODE => 14, OrderProductTableMap::TAX_RULE_TITLE => 15, OrderProductTableMap::TAX_RULE_DESCRIPTION => 16, OrderProductTableMap::PARENT => 17, OrderProductTableMap::CREATED_AT => 18, OrderProductTableMap::UPDATED_AT => 19, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'ORDER_ID' => 1, 'PRODUCT_REF' => 2, 'PRODUCT_SALE_ELEMENTS_REF' => 3, 'TITLE' => 4, 'CHAPO' => 5, 'DESCRIPTION' => 6, 'POSTSCRIPTUM' => 7, 'QUANTITY' => 8, 'PRICE' => 9, 'PROMO_PRICE' => 10, 'WAS_NEW' => 11, 'WAS_IN_PROMO' => 12, 'WEIGHT' => 13, 'EAN_CODE' => 14, 'TAX_RULE_TITLE' => 15, 'TAX_RULE_DESCRIPTION' => 16, 'PARENT' => 17, 'CREATED_AT' => 18, 'UPDATED_AT' => 19, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'order_id' => 1, 'product_ref' => 2, 'product_sale_elements_ref' => 3, 'title' => 4, 'chapo' => 5, 'description' => 6, 'postscriptum' => 7, 'quantity' => 8, 'price' => 9, 'promo_price' => 10, 'was_new' => 11, 'was_in_promo' => 12, 'weight' => 13, 'ean_code' => 14, 'tax_rule_title' => 15, 'tax_rule_description' => 16, 'parent' => 17, 'created_at' => 18, 'updated_at' => 19, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, )
     );
 
     /**
@@ -229,6 +234,7 @@ class OrderProductTableMap extends TableMap
         $this->addColumn('WAS_NEW', 'WasNew', 'TINYINT', true, null, null);
         $this->addColumn('WAS_IN_PROMO', 'WasInPromo', 'TINYINT', true, null, null);
         $this->addColumn('WEIGHT', 'Weight', 'VARCHAR', false, 45, null);
+        $this->addColumn('EAN_CODE', 'EanCode', 'VARCHAR', false, 255, null);
         $this->addColumn('TAX_RULE_TITLE', 'TaxRuleTitle', 'VARCHAR', false, 255, null);
         $this->addColumn('TAX_RULE_DESCRIPTION', 'TaxRuleDescription', 'CLOB', false, null, null);
         $this->addColumn('PARENT', 'Parent', 'INTEGER', false, null, null);
@@ -421,6 +427,7 @@ class OrderProductTableMap extends TableMap
             $criteria->addSelectColumn(OrderProductTableMap::WAS_NEW);
             $criteria->addSelectColumn(OrderProductTableMap::WAS_IN_PROMO);
             $criteria->addSelectColumn(OrderProductTableMap::WEIGHT);
+            $criteria->addSelectColumn(OrderProductTableMap::EAN_CODE);
             $criteria->addSelectColumn(OrderProductTableMap::TAX_RULE_TITLE);
             $criteria->addSelectColumn(OrderProductTableMap::TAX_RULE_DESCRIPTION);
             $criteria->addSelectColumn(OrderProductTableMap::PARENT);
@@ -441,6 +448,7 @@ class OrderProductTableMap extends TableMap
             $criteria->addSelectColumn($alias . '.WAS_NEW');
             $criteria->addSelectColumn($alias . '.WAS_IN_PROMO');
             $criteria->addSelectColumn($alias . '.WEIGHT');
+            $criteria->addSelectColumn($alias . '.EAN_CODE');
             $criteria->addSelectColumn($alias . '.TAX_RULE_TITLE');
             $criteria->addSelectColumn($alias . '.TAX_RULE_DESCRIPTION');
             $criteria->addSelectColumn($alias . '.PARENT');

core/lib/Thelia/Model/Map/ProductSaleElementsTableMap.php

@@ -57,7 +57,7 @@ class ProductSaleElementsTableMap extends TableMap
     /**
      * The total number of columns
      */
-    const NUM_COLUMNS = 10;
+    const NUM_COLUMNS = 11;
 
     /**
      * The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class ProductSaleElementsTableMap extends TableMap
     /**
      * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
      */
-    const NUM_HYDRATE_COLUMNS = 10;
+    const NUM_HYDRATE_COLUMNS = 11;
 
     /**
      * the column name for the ID field
@@ -109,6 +109,11 @@ class ProductSaleElementsTableMap extends TableMap
      */
     const IS_DEFAULT = 'product_sale_elements.IS_DEFAULT';
 
+    /**
+     * the column name for the EAN_CODE field
+     */
+    const EAN_CODE = 'product_sale_elements.EAN_CODE';
+
     /**
      * the column name for the CREATED_AT field
      */
@@ -131,12 +136,12 @@ class ProductSaleElementsTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'ProductId', 'Ref', 'Quantity', 'Promo', 'Newness', 'Weight', 'IsDefault', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_STUDLYPHPNAME => array('id', 'productId', 'ref', 'quantity', 'promo', 'newness', 'weight', 'isDefault', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(ProductSaleElementsTableMap::ID, ProductSaleElementsTableMap::PRODUCT_ID, ProductSaleElementsTableMap::REF, ProductSaleElementsTableMap::QUANTITY, ProductSaleElementsTableMap::PROMO, ProductSaleElementsTableMap::NEWNESS, ProductSaleElementsTableMap::WEIGHT, ProductSaleElementsTableMap::IS_DEFAULT, ProductSaleElementsTableMap::CREATED_AT, ProductSaleElementsTableMap::UPDATED_AT, ),
-        self::TYPE_RAW_COLNAME   => array('ID', 'PRODUCT_ID', 'REF', 'QUANTITY', 'PROMO', 'NEWNESS', 'WEIGHT', 'IS_DEFAULT', 'CREATED_AT', 'UPDATED_AT', ),
-        self::TYPE_FIELDNAME     => array('id', 'product_id', 'ref', 'quantity', 'promo', 'newness', 'weight', 'is_default', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
+        self::TYPE_PHPNAME       => array('Id', 'ProductId', 'Ref', 'Quantity', 'Promo', 'Newness', 'Weight', 'IsDefault', 'EanCode', 'CreatedAt', 'UpdatedAt', ),
+        self::TYPE_STUDLYPHPNAME => array('id', 'productId', 'ref', 'quantity', 'promo', 'newness', 'weight', 'isDefault', 'eanCode', 'createdAt', 'updatedAt', ),
+        self::TYPE_COLNAME       => array(ProductSaleElementsTableMap::ID, ProductSaleElementsTableMap::PRODUCT_ID, ProductSaleElementsTableMap::REF, ProductSaleElementsTableMap::QUANTITY, ProductSaleElementsTableMap::PROMO, ProductSaleElementsTableMap::NEWNESS, ProductSaleElementsTableMap::WEIGHT, ProductSaleElementsTableMap::IS_DEFAULT, ProductSaleElementsTableMap::EAN_CODE, ProductSaleElementsTableMap::CREATED_AT, ProductSaleElementsTableMap::UPDATED_AT, ),
+        self::TYPE_RAW_COLNAME   => array('ID', 'PRODUCT_ID', 'REF', 'QUANTITY', 'PROMO', 'NEWNESS', 'WEIGHT', 'IS_DEFAULT', 'EAN_CODE', 'CREATED_AT', 'UPDATED_AT', ),
+        self::TYPE_FIELDNAME     => array('id', 'product_id', 'ref', 'quantity', 'promo', 'newness', 'weight', 'is_default', 'ean_code', 'created_at', 'updated_at', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, )
     );
 
     /**
@@ -146,12 +151,12 @@ class ProductSaleElementsTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'ProductId' => 1, 'Ref' => 2, 'Quantity' => 3, 'Promo' => 4, 'Newness' => 5, 'Weight' => 6, 'IsDefault' => 7, 'CreatedAt' => 8, 'UpdatedAt' => 9, ),
-        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'productId' => 1, 'ref' => 2, 'quantity' => 3, 'promo' => 4, 'newness' => 5, 'weight' => 6, 'isDefault' => 7, 'createdAt' => 8, 'updatedAt' => 9, ),
-        self::TYPE_COLNAME       => array(ProductSaleElementsTableMap::ID => 0, ProductSaleElementsTableMap::PRODUCT_ID => 1, ProductSaleElementsTableMap::REF => 2, ProductSaleElementsTableMap::QUANTITY => 3, ProductSaleElementsTableMap::PROMO => 4, ProductSaleElementsTableMap::NEWNESS => 5, ProductSaleElementsTableMap::WEIGHT => 6, ProductSaleElementsTableMap::IS_DEFAULT => 7, ProductSaleElementsTableMap::CREATED_AT => 8, ProductSaleElementsTableMap::UPDATED_AT => 9, ),
-        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'PRODUCT_ID' => 1, 'REF' => 2, 'QUANTITY' => 3, 'PROMO' => 4, 'NEWNESS' => 5, 'WEIGHT' => 6, 'IS_DEFAULT' => 7, 'CREATED_AT' => 8, 'UPDATED_AT' => 9, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'product_id' => 1, 'ref' => 2, 'quantity' => 3, 'promo' => 4, 'newness' => 5, 'weight' => 6, 'is_default' => 7, 'created_at' => 8, 'updated_at' => 9, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, )
+        self::TYPE_PHPNAME       => array('Id' => 0, 'ProductId' => 1, 'Ref' => 2, 'Quantity' => 3, 'Promo' => 4, 'Newness' => 5, 'Weight' => 6, 'IsDefault' => 7, 'EanCode' => 8, 'CreatedAt' => 9, 'UpdatedAt' => 10, ),
+        self::TYPE_STUDLYPHPNAME => array('id' => 0, 'productId' => 1, 'ref' => 2, 'quantity' => 3, 'promo' => 4, 'newness' => 5, 'weight' => 6, 'isDefault' => 7, 'eanCode' => 8, 'createdAt' => 9, 'updatedAt' => 10, ),
+        self::TYPE_COLNAME       => array(ProductSaleElementsTableMap::ID => 0, ProductSaleElementsTableMap::PRODUCT_ID => 1, ProductSaleElementsTableMap::REF => 2, ProductSaleElementsTableMap::QUANTITY => 3, ProductSaleElementsTableMap::PROMO => 4, ProductSaleElementsTableMap::NEWNESS => 5, ProductSaleElementsTableMap::WEIGHT => 6, ProductSaleElementsTableMap::IS_DEFAULT => 7, ProductSaleElementsTableMap::EAN_CODE => 8, ProductSaleElementsTableMap::CREATED_AT => 9, ProductSaleElementsTableMap::UPDATED_AT => 10, ),
+        self::TYPE_RAW_COLNAME   => array('ID' => 0, 'PRODUCT_ID' => 1, 'REF' => 2, 'QUANTITY' => 3, 'PROMO' => 4, 'NEWNESS' => 5, 'WEIGHT' => 6, 'IS_DEFAULT' => 7, 'EAN_CODE' => 8, 'CREATED_AT' => 9, 'UPDATED_AT' => 10, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'product_id' => 1, 'ref' => 2, 'quantity' => 3, 'promo' => 4, 'newness' => 5, 'weight' => 6, 'is_default' => 7, 'ean_code' => 8, 'created_at' => 9, 'updated_at' => 10, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, )
     );
 
     /**
@@ -178,6 +183,7 @@ class ProductSaleElementsTableMap extends TableMap
         $this->addColumn('NEWNESS', 'Newness', 'TINYINT', false, null, 0);
         $this->addColumn('WEIGHT', 'Weight', 'FLOAT', false, null, 0);
         $this->addColumn('IS_DEFAULT', 'IsDefault', 'BOOLEAN', false, 1, false);
+        $this->addColumn('EAN_CODE', 'EanCode', 'VARCHAR', false, 255, null);
         $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
         $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
     } // initialize()
@@ -362,6 +368,7 @@ class ProductSaleElementsTableMap extends TableMap
             $criteria->addSelectColumn(ProductSaleElementsTableMap::NEWNESS);
             $criteria->addSelectColumn(ProductSaleElementsTableMap::WEIGHT);
             $criteria->addSelectColumn(ProductSaleElementsTableMap::IS_DEFAULT);
+            $criteria->addSelectColumn(ProductSaleElementsTableMap::EAN_CODE);
             $criteria->addSelectColumn(ProductSaleElementsTableMap::CREATED_AT);
             $criteria->addSelectColumn(ProductSaleElementsTableMap::UPDATED_AT);
         } else {
@@ -373,6 +380,7 @@ class ProductSaleElementsTableMap extends TableMap
             $criteria->addSelectColumn($alias . '.NEWNESS');
             $criteria->addSelectColumn($alias . '.WEIGHT');
             $criteria->addSelectColumn($alias . '.IS_DEFAULT');
+            $criteria->addSelectColumn($alias . '.EAN_CODE');
             $criteria->addSelectColumn($alias . '.CREATED_AT');
             $criteria->addSelectColumn($alias . '.UPDATED_AT');
         }

core/lib/Thelia/Model/Map/ResourceTableMap.php

@@ -160,9 +160,9 @@ class ResourceTableMap extends TableMap
      */
     public function buildRelations()
     {
-        $this->addRelation('GroupResource', '\\Thelia\\Model\\GroupResource', RelationMap::ONE_TO_MANY, array('id' => 'resource_id', ), 'CASCADE', 'RESTRICT', 'GroupResources');
+        $this->addRelation('ProfileResource', '\\Thelia\\Model\\ProfileResource', RelationMap::ONE_TO_MANY, array('id' => 'resource_id', ), 'CASCADE', 'RESTRICT', 'ProfileResources');
         $this->addRelation('ResourceI18n', '\\Thelia\\Model\\ResourceI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'ResourceI18ns');
-        $this->addRelation('Group', '\\Thelia\\Model\\Group', RelationMap::MANY_TO_MANY, array(), 'CASCADE', 'RESTRICT', 'Groups');
+        $this->addRelation('Profile', '\\Thelia\\Model\\Profile', RelationMap::MANY_TO_MANY, array(), 'CASCADE', 'RESTRICT', 'Profiles');
     } // buildRelations()
 
     /**
@@ -185,7 +185,7 @@ class ResourceTableMap extends TableMap
     {
         // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool,
         // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
-                GroupResourceTableMap::clearInstancePool();
+                ProfileResourceTableMap::clearInstancePool();
                 ResourceI18nTableMap::clearInstancePool();
             }
 

install/thelia.sql

@@ -365,11 +365,12 @@ CREATE TABLE `product_sale_elements`
     `newness` TINYINT DEFAULT 0,
     `weight` FLOAT DEFAULT 0,
     `is_default` TINYINT(1) DEFAULT 0,
+    `ean_code` VARCHAR(255),
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
-    UNIQUE INDEX `ref_UNIQUE` (`ref`),
     INDEX `idx_product_sale_element_product_id` (`product_id`),
+    INDEX `ref` (`ref`),
     CONSTRAINT `fk_product_sale_element_product_id`
         FOREIGN KEY (`product_id`)
         REFERENCES `product` (`id`)
@@ -775,6 +776,7 @@ CREATE TABLE `order_product`
     `was_new` TINYINT NOT NULL,
     `was_in_promo` TINYINT NOT NULL,
     `weight` VARCHAR(45),
+    `ean_code` VARCHAR(255),
     `tax_rule_title` VARCHAR(255),
     `tax_rule_description` LONGTEXT,
     `parent` INTEGER COMMENT 'not managed yet',
@@ -929,12 +931,12 @@ CREATE TABLE `area_delivery_module`
 ) ENGINE=InnoDB;
 
 -- ---------------------------------------------------------------------
--- group
+-- profile
 -- ---------------------------------------------------------------------
 
-DROP TABLE IF EXISTS `group`;
+DROP TABLE IF EXISTS `profile`;
 
-CREATE TABLE `group`
+CREATE TABLE `profile`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
     `code` VARCHAR(30) NOT NULL,
@@ -983,27 +985,27 @@ CREATE TABLE `admin`
 ) ENGINE=InnoDB;
 
 -- ---------------------------------------------------------------------
--- admin_group
+-- admin_profile
 -- ---------------------------------------------------------------------
 
-DROP TABLE IF EXISTS `admin_group`;
+DROP TABLE IF EXISTS `admin_profile`;
 
-CREATE TABLE `admin_group`
+CREATE TABLE `admin_profile`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
-    `group_id` INTEGER NOT NULL,
+    `profile_id` INTEGER NOT NULL,
     `admin_id` INTEGER NOT NULL,
     `created_at` DATETIME,
     `updated_at` DATETIME,
-    PRIMARY KEY (`id`,`group_id`,`admin_id`),
-    INDEX `idx_admin_group_group_id` (`group_id`),
-    INDEX `idx_admin_group_admin_id` (`admin_id`),
-    CONSTRAINT `fk_admin_group_group_id`
-        FOREIGN KEY (`group_id`)
-        REFERENCES `group` (`id`)
+    PRIMARY KEY (`id`,`profile_id`,`admin_id`),
+    INDEX `idx_admin_profile_profile_id` (`profile_id`),
+    INDEX `idx_admin_profile_admin_id` (`admin_id`),
+    CONSTRAINT `fk_admin_profile_profile_id`
+        FOREIGN KEY (`profile_id`)
+        REFERENCES `profile` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE,
-    CONSTRAINT `fk_admin_group_admin_id`
+    CONSTRAINT `fk_admin_profile_admin_id`
         FOREIGN KEY (`admin_id`)
         REFERENCES `admin` (`id`)
         ON UPDATE RESTRICT
@@ -1011,29 +1013,29 @@ CREATE TABLE `admin_group`
 ) ENGINE=InnoDB;
 
 -- ---------------------------------------------------------------------
--- group_resource
+-- profile_resource
 -- ---------------------------------------------------------------------
 
-DROP TABLE IF EXISTS `group_resource`;
+DROP TABLE IF EXISTS `profile_resource`;
 
-CREATE TABLE `group_resource`
+CREATE TABLE `profile_resource`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
-    `group_id` INTEGER NOT NULL,
+    `profile_id` INTEGER NOT NULL,
     `resource_id` INTEGER NOT NULL,
     `read` TINYINT DEFAULT 0,
     `write` TINYINT DEFAULT 0,
     `created_at` DATETIME,
     `updated_at` DATETIME,
-    PRIMARY KEY (`id`,`group_id`,`resource_id`),
-    INDEX `id_group_resource_group_id` (`group_id`),
-    INDEX `idx_group_resource_resource_id` (`resource_id`),
-    CONSTRAINT `fk_group_resource_group_id`
-        FOREIGN KEY (`group_id`)
-        REFERENCES `group` (`id`)
+    PRIMARY KEY (`id`,`profile_id`,`resource_id`),
+    INDEX `id_profile_resource_profile_id` (`profile_id`),
+    INDEX `idx_profile_resource_resource_id` (`resource_id`),
+    CONSTRAINT `fk_profile_resource_profile_id`
+        FOREIGN KEY (`profile_id`)
+        REFERENCES `profile` (`id`)
         ON UPDATE RESTRICT
         ON DELETE CASCADE,
-    CONSTRAINT `fk_group_resource_resource_id`
+    CONSTRAINT `fk_profile_resource_resource_id`
         FOREIGN KEY (`resource_id`)
         REFERENCES `resource` (`id`)
         ON UPDATE RESTRICT
@@ -1041,28 +1043,28 @@ CREATE TABLE `group_resource`
 ) ENGINE=InnoDB;
 
 -- ---------------------------------------------------------------------
--- group_module
+-- profile_module
 -- ---------------------------------------------------------------------
 
-DROP TABLE IF EXISTS `group_module`;
+DROP TABLE IF EXISTS `profile_module`;
 
-CREATE TABLE `group_module`
+CREATE TABLE `profile_module`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
-    `group_id` INTEGER NOT NULL,
+    `profile_id` INTEGER NOT NULL,
     `module_id` INTEGER,
     `access` TINYINT DEFAULT 0,
     `created_at` DATETIME,
     `updated_at` DATETIME,
     PRIMARY KEY (`id`),
-    INDEX `idx_group_module_group_id` (`group_id`),
-    INDEX `idx_group_module_module_id` (`module_id`),
-    CONSTRAINT `fk_group_module_group_id`
-        FOREIGN KEY (`group_id`)
-        REFERENCES `group` (`id`)
+    INDEX `idx_profile_module_profile_id` (`profile_id`),
+    INDEX `idx_profile_module_module_id` (`module_id`),
+    CONSTRAINT `fk_profile_module_profile_id`
+        FOREIGN KEY (`profile_id`)
+        REFERENCES `profile` (`id`)
         ON UPDATE CASCADE
         ON DELETE CASCADE,
-    CONSTRAINT `fk_group_module_module_id`
+    CONSTRAINT `fk_profile_module_module_id`
         FOREIGN KEY (`module_id`)
         REFERENCES `module` (`id`)
         ON UPDATE RESTRICT
@@ -1971,12 +1973,12 @@ CREATE TABLE `module_i18n`
 ) ENGINE=InnoDB;
 
 -- ---------------------------------------------------------------------
--- group_i18n
+-- profile_i18n
 -- ---------------------------------------------------------------------
 
-DROP TABLE IF EXISTS `group_i18n`;
+DROP TABLE IF EXISTS `profile_i18n`;
 
-CREATE TABLE `group_i18n`
+CREATE TABLE `profile_i18n`
 (
     `id` INTEGER NOT NULL,
     `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
@@ -1985,9 +1987,9 @@ CREATE TABLE `group_i18n`
     `chapo` TEXT,
     `postscriptum` TEXT,
     PRIMARY KEY (`id`,`locale`),
-    CONSTRAINT `group_i18n_FK_1`
+    CONSTRAINT `profile_i18n_FK_1`
         FOREIGN KEY (`id`)
-        REFERENCES `group` (`id`)
+        REFERENCES `profile` (`id`)
         ON DELETE CASCADE
 ) ENGINE=InnoDB;
 

local/config/schema.xml

@@ -284,15 +284,16 @@
     <column defaultValue="0" name="newness" type="TINYINT" />
     <column defaultValue="0" name="weight" type="FLOAT" />
     <column defaultValue="0" name="is_default" type="BOOLEAN" />
+    <column name="ean_code" size="255" type="VARCHAR" />
     <foreign-key foreignTable="product" name="fk_product_sale_element_product_id" onDelete="CASCADE" onUpdate="RESTRICT">
       <reference foreign="id" local="product_id" />
     </foreign-key>
     <index name="idx_product_sale_element_product_id">
       <index-column name="product_id" />
     </index>
-    <unique name="ref_UNIQUE">
-      <unique-column name="ref" />
-    </unique>
+    <index name="ref">
+      <index-column name="ref" />
+    </index>
     <behavior name="timestampable" />
   </table>
   <table isCrossRef="true" name="attribute_template" namespace="Thelia\Model">
@@ -610,6 +611,7 @@
     <column name="was_new" required="true" type="TINYINT" />
     <column name="was_in_promo" required="true" type="TINYINT" />
     <column name="weight" size="45" type="VARCHAR" />
+    <column name="ean_code" size="255" type="VARCHAR" />
     <column name="tax_rule_title" size="255" type="VARCHAR" />
     <column name="tax_rule_description" type="CLOB" />
     <column description="not managed yet" name="parent" type="INTEGER" />
@@ -721,7 +723,7 @@
     </unique>
     <behavior name="timestampable" />
   </table>
-  <table name="group" namespace="Thelia\Model">
+  <table name="profile" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
     <column name="code" required="true" size="30" type="VARCHAR" />
     <column name="title" size="255" type="VARCHAR" />
@@ -763,59 +765,59 @@
     <column name="remember_me_serial" size="255" type="VARCHAR" />
     <behavior name="timestampable" />
   </table>
-  <table isCrossRef="true" name="admin_group" namespace="Thelia\Model">
+  <table isCrossRef="true" name="admin_profile" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="group_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="profile_id" primaryKey="true" required="true" type="INTEGER" />
     <column name="admin_id" primaryKey="true" required="true" type="INTEGER" />
-    <foreign-key foreignTable="group" name="fk_admin_group_group_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="group_id" />
+    <foreign-key foreignTable="profile" name="fk_admin_profile_profile_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="profile_id" />
     </foreign-key>
-    <foreign-key foreignTable="admin" name="fk_admin_group_admin_id" onDelete="CASCADE" onUpdate="RESTRICT">
+    <foreign-key foreignTable="admin" name="fk_admin_profile_admin_id" onDelete="CASCADE" onUpdate="RESTRICT">
       <reference foreign="id" local="admin_id" />
     </foreign-key>
-    <index name="idx_admin_group_group_id">
-      <index-column name="group_id" />
+    <index name="idx_admin_profile_profile_id">
+      <index-column name="profile_id" />
     </index>
-    <index name="idx_admin_group_admin_id">
+    <index name="idx_admin_profile_admin_id">
       <index-column name="admin_id" />
     </index>
     <behavior name="timestampable" />
   </table>
-  <table isCrossRef="true" name="group_resource" namespace="Thelia\Model">
+  <table isCrossRef="true" name="profile_resource" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="group_id" primaryKey="true" required="true" type="INTEGER" />
+    <column name="profile_id" primaryKey="true" required="true" type="INTEGER" />
     <column name="resource_id" primaryKey="true" required="true" type="INTEGER" />
     <column defaultValue="0" name="read" type="TINYINT" />
     <column defaultValue="0" name="write" type="TINYINT" />
-    <foreign-key foreignTable="group" name="fk_group_resource_group_id" onDelete="CASCADE" onUpdate="RESTRICT">
-      <reference foreign="id" local="group_id" />
+    <foreign-key foreignTable="profile" name="fk_profile_resource_profile_id" onDelete="CASCADE" onUpdate="RESTRICT">
+      <reference foreign="id" local="profile_id" />
     </foreign-key>
-    <foreign-key foreignTable="resource" name="fk_group_resource_resource_id" onDelete="CASCADE" onUpdate="RESTRICT">
+    <foreign-key foreignTable="resource" name="fk_profile_resource_resource_id" onDelete="CASCADE" onUpdate="RESTRICT">
       <reference foreign="id" local="resource_id" />
     </foreign-key>
-    <index name="id_group_resource_group_id">
-      <index-column name="group_id" />
+    <index name="id_profile_resource_profile_id">
+      <index-column name="profile_id" />
     </index>
-    <index name="idx_group_resource_resource_id">
+    <index name="idx_profile_resource_resource_id">
       <index-column name="resource_id" />
     </index>
     <behavior name="timestampable" />
   </table>
-  <table name="group_module" namespace="Thelia\Model">
+  <table name="profile_module" namespace="Thelia\Model">
     <column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
-    <column name="group_id" required="true" type="INTEGER" />
+    <column name="profile_id" required="true" type="INTEGER" />
     <column name="module_id" type="INTEGER" />
     <column defaultValue="0" name="access" type="TINYINT" />
-    <foreign-key foreignTable="group" name="fk_group_module_group_id" onDelete="CASCADE" onUpdate="CASCADE">
-      <reference foreign="id" local="group_id" />
+    <foreign-key foreignTable="profile" name="fk_profile_module_profile_id" onDelete="CASCADE" onUpdate="CASCADE">
+      <reference foreign="id" local="profile_id" />
     </foreign-key>
-    <foreign-key foreignTable="module" name="fk_group_module_module_id" onDelete="CASCADE" onUpdate="RESTRICT">
+    <foreign-key foreignTable="module" name="fk_profile_module_module_id" onDelete="CASCADE" onUpdate="RESTRICT">
       <reference foreign="id" local="module_id" />
     </foreign-key>
-    <index name="idx_group_module_group_id">
-      <index-column name="group_id" />
+    <index name="idx_profile_module_profile_id">
+      <index-column name="profile_id" />
     </index>
-    <index name="idx_group_module_module_id">
+    <index name="idx_profile_module_module_id">
       <index-column name="module_id" />
     </index>
     <behavior name="timestampable" />

templates/admin/default/configuration.html

@@ -129,10 +129,10 @@
 		                    </tr>
 	                        {/loop}
 
-	                        {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.admin_profiles"}
+	                        {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.profiles"}
 		                    <tr>
-		                        <td><a href="{url path='/admin/configuration/admin_profiles'}">{intl l='Back-office profiles'}</a></td>
-		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/admin_profiles'}"><i class="glyphicon glyphicon-edit"></i></a></td>
+		                        <td><a href="{url path='/admin/configuration/profiles'}">{intl l='Back-office profiles'}</a></td>
+		                        <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/profiles'}"><i class="glyphicon glyphicon-edit"></i></a></td>
 		                    </tr>
 	                        {/loop}
 

templates/admin/default/profiles.html

@@ -0,0 +1,310 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Taxes rules'}{/block}
+
+{block name="check-permissions"}admin.taxes-rules.view{/block}
+
+{block name="main-content"}
+<div class="taxes-rules">
+
+    <div id="wrapper" class="container">
+        
+        <div class="clearfix">
+            <ul class="breadcrumb">
+                <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
+                <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
+                <li><a href="{url path='/admin/configuration/taxes_rules'}">{intl l="Taxes rules"}</a></li>
+            </ul>
+        </div>
+
+        {module_include location='taxes_rules_top'}
+
+        <div class="row">
+            <div class="col-md-12">
+
+                <div class="general-block-decorator">
+                    <div class="table-responsive">
+                        <table class="table table-striped table-condensed table-left-aligned">
+                            <caption class="clearfix">
+                                {intl l="Taxes"}
+                                {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.taxes.create"}
+                                    <a class="btn btn-default btn-primary pull-right" title="{intl l='Create a new tax'}" href="#tax_create_dialog" data-toggle="modal">
+                                        <span class="glyphicon glyphicon-plus"></span>
+                                    </a>
+                                {/loop}
+                            </caption>
+                            <thead>
+                                <tr>
+                                    <th class="col-md-3">{intl l="Name"}</th>
+                                    <th class="col-md-5">{intl l="Description"}</th>
+                                    <th class="col-md-1">{intl l="Actions"}</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+
+                                {loop type="tax" name="taxes" backend_context="1"}
+
+                                <tr>
+                                    <td>{$TITLE}</td>
+                                    <td>{$DESCRIPTION}</td>
+                                    <td>
+                                        <div class="btn-group">
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.taxes.change"}
+                                                <a class="btn btn-default btn-xs" title="{intl l='Change this tax'}" href="{url path="/admin/configuration/taxes/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+                                            {/loop}
+
+                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.taxes.change"}
+                                                <a class="btn btn-default btn-xs js-delete-tax" title="{intl l='Delete this tax'}" href="#tax_delete_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                                            {/loop}
+                                        </div>
+                                    </td>
+                                </tr>
+
+                                {/loop}
+
+                            </tbody>                            
+                        </table>
+                    </div>
+                </div>
+
+
+            </div>
+        </div>
+
+        {module_include location='taxes_rules_bottom'}
+
+    </div>
+</div>
+
+{* -- Add tax confirmation dialog ----------------------------------- *}
+{form name="thelia.admin.tax.add"}
+
+{if $form_error_message}
+    {$taxCreateError = true}
+{else}
+    {$taxCreateError = false}
+{/if}
+
+{* Capture the dialog body, to pass it to the generic dialog *}
+{capture "tax_create_dialog"}
+
+    {form_hidden_fields form=$form}
+
+    {form_field form=$form field='locale'}
+        <input type="hidden" name="{$name}" value="{$edit_language_locale}" />
+    {/form_field}
+
+    {form_field form=$form field='title'}
+        <div class="form-group {if $error}has-error{/if}">
+            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Title'}" placeholder="{intl l='Title'}" class="form-control" value="{if $form_error}{$value}{else}{if $IS_TRANSLATED == 1}{$TITLE}{/if}{/if}">
+        </div>
+    {/form_field}
+
+    {form_field form=$form field='description'}
+        <div class="form-group {if $error}has-error{/if}">
+            <label for="{$label_attr.for}" class="control-label">
+                {intl l=$label} :
+                <span class="label-help-block">{intl l="The detailed description."}</span>
+            </label>
+
+            <textarea name="{$name}" id="{$label_attr.for}" rows="10" class="form-control wysiwyg">{if $form_error}{$value}{else}{if $IS_TRANSLATED == 1}{$DESCRIPTION}{/if}{/if}</textarea>
+        </div>
+    {/form_field}
+
+    {form_field form=$form field='type'}
+        <div class="form-group {if $error}has-error{/if}">
+            <label for="{$label_attr.for}" class="control-label">
+                {intl l=$label} :
+            </label>
+
+            <div class="form-group">
+                <select name="{$name}" class="js-change-tax-type" data-toggle="selectpicker">
+                    {$typeValueWithError = $value}
+                    {foreach from=$choices key=key item=choice}
+                        {if $key == 0}
+                            {$typeValue = $choice->value}
+                        {/if}
+                        <option value="{$choice->value}" {if $form_error && $choice->value == $value || !$form_error && $key == 0}selected="selected" {/if}>{$choice->label}</option>
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+    {/form_field}
+
+    {form_tagged_fields form=$form tag='requirements'}
+        <div class="form-group {if $error}has-error{/if} js-tax-requirements" data-tax-type="{$attr_list.tax_type}" {if !$form_error && $attr_list.tax_type != $typeValue || $form_error && $attr_list.tax_type != $typeValueWithError}style="display: none"{/if}>
+            <label for="{$label_attr.for}" class="control-label">
+                {intl l=$label}
+            </label>
+            {if $formType == 'choice'}
+                <select name="{$name}" data-toggle="selectpicker" {if !$form_error && $attr_list.tax_type != $typeValue || $form_error && $attr_list.tax_type != $typeValueWithError}disabled="disabled"{/if}>
+                    {foreach $choices as $choice}
+                        <option value="{$choice->value}" {if !$form_error && $REQUIREMENTS.$label == $choice->value || $form_error && $value == $choice->value}selected="selected" {/if}>{$choice->label}</option>
+                    {/foreach}
+                </select>
+            {/if}
+            {if $formType == 'text'}
+                <input type="text" {if !$form_error && $attr_list.tax_type != $typeValue || $form_error && $attr_list.tax_type != $typeValueWithError}disabled="disabled"{/if} id="{$label_attr.for}" name="{$name}" required="required" class="form-control" value="{if $form_error}{$value}{else}{$REQUIREMENTS.$label}{/if}">
+            {/if}
+        </div>
+    {/form_tagged_fields}
+
+{/capture}
+
+    {include
+        file = "includes/generic-create-dialog.html"
+
+        dialog_id    = "tax_create_dialog"
+        dialog_title = {intl l="Create a new tax"}
+        dialog_body  = {$smarty.capture.tax_create_dialog nofilter}
+
+        dialog_ok_label     = {intl l="Create"}
+        dialog_cancel_label = {intl l="Cancel"}
+
+        form_action        = {url path="/admin/configuration/taxes/add"}
+        form_enctype       = {form_enctype form=$form}
+        form_error_message = $form_error_message
+    }
+
+{/form}
+
+{* -- Delete tax confirmation dialog ----------------------------------- *}
+
+{capture "tax_delete_dialog"}
+    <input type="hidden" name="tax_id" id="tax_delete_id" value="" />
+
+    {module_include location='tax_delete_form'}
+
+{/capture}
+
+{include
+    file = "includes/generic-confirm-dialog.html"
+
+    dialog_id       = "tax_delete_dialog"
+    dialog_title    = {intl l="Delete tax"}
+    dialog_message  = {intl l="Do you really want to delete this tax ?"}
+
+    form_action         = {url path='/admin/configuration/taxes/delete'}
+    form_content        = {$smarty.capture.tax_delete_dialog nofilter}
+}
+
+{* -- Add tax rule confirmation dialog ----------------------------------- *}
+{form name="thelia.admin.taxrule.add"}
+
+{if $form_error_message}
+    {$taxRuleCreateError = true}
+{else}
+    {$taxRuleCreateError = false}
+{/if}
+
+{* Capture the dialog body, to pass it to the generic dialog *}
+{capture "tax_rule_create_dialog"}
+
+    {form_hidden_fields form=$form}
+
+    {form_field form=$form field='locale'}
+        <input type="hidden" name="{$name}" value="{$edit_language_locale}" />
+    {/form_field}
+
+    {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
+
+    {form_field form=$form field='title'}
+        <div class="form-group {if $error}has-error{/if}">
+            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Title'}" placeholder="{intl l='Title'}" class="form-control" value="{if $error}{$value}{else}{if $IS_TRANSLATED == 1}{$TITLE}{/if}{/if}">
+        </div>
+    {/form_field}
+
+    {form_field form=$form field='description'}
+        <div class="form-group {if $error}has-error{/if}">
+            <label for="{$label_attr.for}" class="control-label">
+                {intl l=$label} :
+                <span class="label-help-block">{intl l="The detailed description."}</span>
+            </label>
+
+            <textarea name="{$name}" id="{$label_attr.for}" rows="10" class="form-control wysiwyg">{if $error}{$value}{else}{if $IS_TRANSLATED == 1}{$DESCRIPTION}{/if}{/if}</textarea>
+        </div>
+    {/form_field}
+
+{/capture}
+
+    {include
+        file = "includes/generic-create-dialog.html"
+
+        dialog_id    = "tax_rule_create_dialog"
+        dialog_title = {intl l="Create a new tax rule"}
+        dialog_body  = {$smarty.capture.tax_rule_create_dialog nofilter}
+
+        dialog_ok_label     = {intl l="Create"}
+        dialog_cancel_label = {intl l="Cancel"}
+
+        form_action        = {url path="/admin/configuration/taxes_rules/add"}
+        form_enctype       = {form_enctype form=$form}
+        form_error_message = $form_error_message
+    }
+
+{/form}
+
+{* -- Delete tax rule confirmation dialog ----------------------------------- *}
+
+{capture "tax_rule_delete_dialog"}
+    <input type="hidden" name="tax_rule_id" id="tax_rule_delete_id" value="" />
+
+    {module_include location='tax_rule_delete_form'}
+
+{/capture}
+
+{include
+    file = "includes/generic-confirm-dialog.html"
+
+    dialog_id       = "tax_rule_delete_dialog"
+    dialog_title    = {intl l="Delete tax rule"}
+    dialog_message  = {intl l="Do you really want to delete this tax rule ?"}
+
+    form_action         = {url path='/admin/configuration/taxes_rules/delete'}
+    form_content        = {$smarty.capture.tax_rule_delete_dialog nofilter}
+}
+
+{/block}
+
+{block name="javascript-initialization"}
+
+{javascripts file='assets/js/bootstrap-select/bootstrap-select.js'}
+    <script src='{$asset_url}'></script>
+{/javascripts}
+
+{javascripts file='assets/js/main.js'}
+    <script src='{$asset_url}'></script>
+{/javascripts}
+
+<script type="text/javascript">
+jQuery(function($) {
+
+{if $taxRuleCreateError == true}
+    $('#tax_rule_create_dialog').modal();
+{/if}
+
+{if $taxCreateError == true}
+    $('#tax_create_dialog').modal();
+{/if}
+
+    $(".js-delete-tax-rule").click(function(e){
+        $('#tax_rule_delete_id').val($(this).data('id'))
+    });
+
+    $(".js-delete-tax").click(function(e){
+        $('#tax_delete_id').val($(this).data('id'))
+    });
+
+    $('.js-change-tax-type').change(function(e){
+        $('.js-tax-requirements').children('select, input').attr('disabled', true);
+        $('.js-tax-requirements').hide();
+        $('.js-tax-requirements[data-tax-type="' + $(this).val() + '"]').children('select, input').attr('disabled', false);
+        $('.js-tax-requirements[data-tax-type="' + $(this).val() + '"]').children('select').selectpicker("refresh");
+        $('.js-tax-requirements[data-tax-type="' + $(this).val() + '"]').show();
+    });
+})
+</script>
+
+{/block}