Merge pull request #2535 from wallabag/default-sort-2.2

Use created_at as default sort
This commit is contained in:
Jeremy Benoist 2016-11-04 09:38:03 +01:00 committed by GitHub
commit 4775fed6a7
3 changed files with 59 additions and 2 deletions

View file

@ -0,0 +1,53 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
class Version20161104073720 extends AbstractMigration implements ContainerAwareInterface
{
/**
* @var ContainerInterface
*/
private $container;
public function setContainer(ContainerInterface $container = null)
{
$this->container = $container;
}
private function getTable($tableName)
{
return $this->container->getParameter('database_table_prefix') . $tableName;
}
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'sqlite':
$this->addSql('CREATE INDEX `created_at` ON `'.$this->getTable('entry').'` (`created_at` DESC)');
break;
case 'mysql':
$this->addSql('ALTER TABLE '.$this->getTable('entry').' ADD INDEX created_at (created_at);');
break;
case 'postgresql':
$this->addSql('CREATE INDEX created_at ON '.$this->getTable('entry').' (created_at DESC)');
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
}
}

View file

@ -19,7 +19,11 @@ use Wallabag\AnnotationBundle\Entity\Annotation;
*
* @XmlRoot("entry")
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntryRepository")
* @ORM\Table(name="`entry`", options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"})
* @ORM\Table(
* name="`entry`",
* options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"},
* indexes={@ORM\Index(name="created_at", columns={"created_at"})}
* )
* @ORM\HasLifecycleCallbacks()
* @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())")
*/

View file

@ -22,7 +22,7 @@ class EntryRepository extends EntityRepository
return $this->createQueryBuilder('e')
->leftJoin('e.user', 'u')
->andWhere('u.id = :userId')->setParameter('userId', $userId)
->orderBy('e.id', 'desc')
->orderBy('e.createdAt', 'desc')
;
}