Skip to content

Commit

Permalink
Refactored : replaced legacy db handler with DBAL
Browse files Browse the repository at this point in the history
  • Loading branch information
@vidarl
vidarl committed Apr 30, 2018
1 parent 9ffe1e7 commit 916cde2
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 122 deletions.
205 changes: 92 additions & 113 deletions bundle/Command/ConvertXmlTextToRichTextCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
namespace EzSystems\EzPlatformXmlTextFieldTypeBundle\Command;

use DOMDocument;
use eZ\Publish\Core\Persistence\Database\DatabaseHandler;
use PDO;
use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
Expand All @@ -14,24 +13,25 @@
use Symfony\Component\Console\Output\OutputInterface;
use eZ\Publish\Core\FieldType\XmlText\Value;
use eZ\Publish\Core\FieldType\XmlText\Converter\RichText as RichTextConverter;
use Doctrine\DBAL\Connection;

class ConvertXmlTextToRichTextCommand extends ContainerAwareCommand
{
/**
* @var \eZ\Publish\Core\Persistence\Database\DatabaseHandler
* @var \Doctrine\DBAL\Connection
*/
private $db;
private $dbal;

/**
* @var \Psr\Log\LoggerInterface
*/
private $logger;

public function __construct(DatabaseHandler $db, LoggerInterface $logger = null)
public function __construct(Connection $dbal, LoggerInterface $logger = null)
{
parent::__construct();

$this->db = $db;
$this->dbal = $dbal;
$this->logger = $logger;
}

Expand Down Expand Up @@ -87,55 +87,41 @@ protected function execute(InputInterface $input, OutputInterface $output)

protected function convertFieldDefinitions($dryRun, OutputInterface $output)
{
$query = $this->db->createSelectQuery();
$query->select($query->expr->count('*'));
$query->from('ezcontentclass_attribute');
$query->where(
$query->expr->eq(
$this->db->quoteIdentifier('data_type_string'),
$query->bindValue('ezxmltext', null, PDO::PARAM_STR)
$query = $this->dbal->createQueryBuilder();
$query->select('count(a.id)')
->from('ezcontentclass_attribute', 'a')
->where(
$query->expr()->eq(
'a.data_type_string',
':datatypestring'
)
)
);
->setParameter(':datatypestring','ezxmltext');

$statement = $query->prepare();
$statement->execute();
$count = $statement->fetchColumn();
$statement = $query->execute();
$count = (int) $statement->fetchColumn();

$output->writeln("Found $count field definiton to convert.");

$query = $this->db->createSelectQuery();
$query->select('*');
$query->from('ezcontentclass_attribute');
$query->where(
$query->expr->eq(
$this->db->quoteIdentifier('data_type_string'),
$query->bindValue('ezxmltext', null, PDO::PARAM_STR)
)
);

$statement = $query->prepare();
$statement->execute();

$updateQuery = $this->db->createUpdateQuery();
$updateQuery->update($this->db->quoteIdentifier('ezcontentclass_attribute'));
$updateQuery->set(
$this->db->quoteIdentifier('data_type_string'),
$updateQuery->bindValue('ezrichtext', null, PDO::PARAM_STR)
);
// was tagPreset in ezxmltext, unused in RichText
$updateQuery->set(
$this->db->quoteIdentifier('data_text2'),
$updateQuery->bindValue(null, null, PDO::PARAM_STR)
);
$updateQuery->where(
$updateQuery->expr->eq(
$this->db->quoteIdentifier('data_type_string'),
$updateQuery->bindValue('ezxmltext', null, PDO::PARAM_STR)
$updateQuery = $this->dbal->createQueryBuilder();
$updateQuery->update('ezcontentclass_attribute', 'a')
->set('a.data_type_string', ':newdatatypestring')
// was tagPreset in ezxmltext, unused in RichText
->set('a.data_text2', ':datatext2')
->where(
$updateQuery->expr()->eq(
'a.data_type_string',
':olddatatypestring'
)
)
);
->setParameters([
':newdatatypestring' => 'ezrichtext',
':datatext2' => null,
':olddatatypestring' => 'ezxmltext'
]);

if (!$dryRun) {
$updateQuery->prepare()->execute();
$updateQuery->execute();
}

$output->writeln("Converted $count ezxmltext field definitions to ezrichtext");
Expand All @@ -144,60 +130,53 @@ protected function convertFieldDefinitions($dryRun, OutputInterface $output)
protected function convertFields($dryRun, $contentObjectId, $checkDuplicateIds, OutputInterface $output)
{
$converter = new RichTextConverter($this->logger);
$query = $this->db->createSelectQuery();
$query->select($query->expr->count('*'));
$query->from('ezcontentobject_attribute');
if ($contentObjectId === null) {
$query->where(
$query->expr->eq(
$this->db->quoteIdentifier('data_type_string'),
$query->bindValue('ezxmltext', null, PDO::PARAM_STR)
$query = $this->dbal->createQueryBuilder();
$query->select('count(a.id)')
->from('ezcontentobject_attribute', 'a')
->where(
$query->expr()->eq(
'a.data_type_string',
':datatypestring'
)
);
} else {
$query->where(
$query->expr->eq(
$this->db->quoteIdentifier('contentobject_id'),
$query->bindValue($contentObjectId, null, PDO::PARAM_STR)
),
$query->expr->eq(
$this->db->quoteIdentifier('data_type_string'),
$query->bindValue('ezxmltext', null, PDO::PARAM_STR)
)
->setParameter(':datatypestring','ezxmltext');

if ($contentObjectId !== null) {
$query->andWhere(
$query->expr()->eq(
'a.contentobject_id',
':contentobjectid'
)
);
)
->setParameter(':contentobjectid', $contentObjectId);
}

$statement = $query->prepare();
$statement->execute();
$count = $statement->fetchColumn();
$statement = $query->execute();
$count = (int) $statement->fetchColumn();

$output->writeln("Found $count field rows to convert.");

$query = $this->db->createSelectQuery();
$query->select('*');
$query->from('ezcontentobject_attribute');
if ($contentObjectId === null) {
$query->where(
$query->expr->eq(
$this->db->quoteIdentifier('data_type_string'),
$query->bindValue('ezxmltext', null, PDO::PARAM_STR)
$query = $this->dbal->createQueryBuilder();
$query->select('a.*')
->from('ezcontentobject_attribute', 'a')
->where(
$query->expr()->eq(
'a.data_type_string',
':datatypestring'
)
);
} else {
$query->where(
$query->expr->eq(
$this->db->quoteIdentifier('contentobject_id'),
$query->bindValue($contentObjectId, null, PDO::PARAM_STR)
),
$query->expr->eq(
$this->db->quoteIdentifier('data_type_string'),
$query->bindValue('ezxmltext', null, PDO::PARAM_STR)
)
->setParameter(':datatypestring','ezxmltext');

if ($contentObjectId !== null) {
$query->andWhere(
$query->expr()->eq(
'a.contentobject_id',
':contentobjectid'
)
);
)
->setParameter(':contentobjectid', $contentObjectId);
}

$statement = $query->prepare();
$statement->execute();
$statement = $query->execute();

while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
if (empty($row['data_text'])) {
Expand All @@ -208,30 +187,31 @@ protected function convertFields($dryRun, $contentObjectId, $checkDuplicateIds,

$converted = $converter->convert($this->createDocument($inputValue), $checkDuplicateIds, $row['id']);

$updateQuery = $this->db->createUpdateQuery();
$updateQuery->update($this->db->quoteIdentifier('ezcontentobject_attribute'));
$updateQuery->set(
$this->db->quoteIdentifier('data_type_string'),
$updateQuery->bindValue('ezrichtext', null, PDO::PARAM_STR)
);
$updateQuery->set(
$this->db->quoteIdentifier('data_text'),
$updateQuery->bindValue($converted, null, PDO::PARAM_STR)
);
$updateQuery->where(
$updateQuery->expr->lAnd(
$updateQuery->expr->eq(
$this->db->quoteIdentifier('id'),
$updateQuery->bindValue($row['id'], null, PDO::PARAM_INT)
),
$updateQuery->expr->eq(
$this->db->quoteIdentifier('version'),
$updateQuery->bindValue($row['version'], null, PDO::PARAM_INT)
$updateQuery = $this->dbal->createQueryBuilder();
$updateQuery->update('ezcontentobject_attribute', 'a')
->set('a.data_type_string', ':datatypestring')
->set('a.data_text', ':datatext')
->where(
$updateQuery->expr()->eq(
'a.id',
':id'
)
)
);
->andWhere(
$updateQuery->expr()->eq(
'a.version',
':version'
)
)
->setParameters([
':datatypestring' => 'ezrichtext',
':datatext' => $converted,
':id' => $row['id'],
':version' => $row['version']
]);

if (!$dryRun) {
$updateQuery->prepare()->execute();
$updateQuery->execute();
}

$this->logger->info(
Expand All @@ -243,7 +223,6 @@ protected function convertFields($dryRun, $contentObjectId, $checkDuplicateIds,
);
}


$output->writeln("Converted $count ezxmltext fields to richtext");
}

Expand Down
2 changes: 1 addition & 1 deletion bundle/Resources/config/services.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
ezxmltext.command.convert_to_richtexst:
class: EzSystems\EzPlatformXmlTextFieldTypeBundle\Command\ConvertXmlTextToRichTextCommand
arguments:
- "@ezpublish.api.storage_engine.legacy.dbhandler"
- "@ezpublish.persistence.connection"
- "@?logger"
tags:
- { name: console.command }
16 changes: 8 additions & 8 deletions lib/FieldType/XmlText/Converter/RichText.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,25 @@ public function __construct(LoggerInterface $logger = null)
$this->logger = $logger;

$this->converter = new Aggregate(
array(
[
new ToRichTextPreNormalize(new Expanding(), new EmbedLinking()),
new Xslt(
'./vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/stylesheets/ezxml/docbook/docbook.xsl',
array(
array(
[
[
'path' => './vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/stylesheets/ezxml/docbook/core.xsl',
'priority' => 99,
),
)
],
]
),
)
]
);

$this->validator = new Validator(
array(
[
'./vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/schemas/docbook/ezpublish.rng',
'./vendor/ezsystems/ezpublish-kernel/eZ/Publish/Core/FieldType/RichText/Resources/schemas/docbook/docbook.iso.sch.xsl',
)
]
);
}

Expand Down

0 comments on commit 916cde2

Please sign in to comment.