Skip to content

Fix SQL type error #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hissy wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix SQL type error #104

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d14a502
Fix SQL type error
hissy Mar 29, 2024
761b916
Code creanup
hissy Mar 30, 2024
f2e8465
Fix typo
hissy Mar 30, 2024
0fececa
Use container to instantiate standard publisher
hissy Mar 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion ...ation_tool/src/PortlandLabs/Concrete5/MigrationTool/Publisher/Block/StandardPublisher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<?php
namespace PortlandLabs\Concrete5\MigrationTool\Publisher\Block;

use Concrete\Core\Database\Connection\Connection;
use Concrete\Core\Legacy\BlockRecord;
use Concrete\Core\Support\Facade\Application;
use Doctrine\DBAL\Types\Type;
use PortlandLabs\Concrete5\MigrationTool\Entity\Import\Batch;
use PortlandLabs\Concrete5\MigrationTool\Entity\Import\BlockValue\BlockValue;
use Concrete\Core\Page\Page;
Expand Down Expand Up @@ -35,13 +38,30 @@ public function publish(Batch $batch, $bt, Page $page, $area, BlockValue $value)
}
// Now we import the OTHER records.
if ($b) {
$app = Application::getFacadeApplication();
/** @var Connection $connection */
$connection = $app->make(Connection::class);
Copy link
Member

@KorvinSzanto KorvinSzanto Mar 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be a hard dependency of this class instead of relying on the service locator? IE:

protected $db;

public function __construct(Connection $db)
{
    $this->db = $db;
}

$sm = $connection->getSchemaManager();
foreach ($records as $record) {
if (strcasecmp($record->getTable(), $bt->getController()->getBlockTypeDatabaseTable()) != 0) {
$columns = $sm->listTableColumns($record->getTable());
$aar = new BlockRecord($record->getTable());
$aar->bID = $b->getBlockID();
foreach ($record->getData() as $key => $value) {
$result = $inspector->inspect($value);
$aar->{$key} = $result->getReplacedValue();
$value = $result->getReplacedValue();
foreach ($columns as $column) {
if ($column->getName() === $key) {
if ($column->getType()->getName() === Type::INTEGER) {
if ($column->getNotnull()) {
$value = (int) $value;
} else {
$value = $value === null ? null : (int) $value;
}
}
}
Copy link
Member

@KorvinSzanto KorvinSzanto Mar 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if ($column->getName() === $key) {
if ($column->getType()->getName() === Type::INTEGER) {
if ($column->getNotnull()) {
$value = (int) $value;
} else {
$value = $value === null ? null : (int) $value;
}
}
}
if (
$column->getName() !== $key ||
$column->getType()->getName() === Type::INTEGER
) {
continue;
}
$value = ($column->getNotNull() || $column !== null) : (int) $value : null;
break;

Using an early return (early continue) is more readable to me here, also worth breaking when the proper column is matched

}
$aar->{$key} = $value;
}
$aar->Save();
}
Expand Down