Skip to content

[Forwardport] Ensure integer values are not quoted as strings #18961

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

Closed
gelanivishal wants to merge 5 commits into from
Closed

[Forwardport] Ensure integer values are not quoted as strings #18961

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef37fb1
Ensure integer values are not quoted as strings
udovicic Sep 27, 2018
1922d1a
Fixed versionform variable issue
gelanivishal Nov 1, 2018
f815a23
Reverted changes as per request
gelanivishal Nov 1, 2018
67d05af
Update ProductCategoryList.php
gelanivishal Nov 2, 2018
ef54c99
Update ProductCategoryList.php
gelanivishal Nov 2, 2018
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
5 changes: 1 addition & 4 deletions app/code/Magento/Catalog/Model/ProductCategoryList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,7 @@ public function getCategoryIds($productId)
Select::SQL_UNION_ALL
);

$this->categoryIdList[$productId] = array_map(
'intval',
$this->productResource->getConnection()->fetchCol($unionSelect)
);
$this->categoryIdList[$productId] = array_map('intval', $this->productResource->getConnection()->fetchCol($unionSelect));
Copy link
Contributor

@ihor-sviziev ihor-sviziev Oct 31, 2018

Choose a reason for hiding this comment

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

Previously code was the same as in 2.2-develop, so it's better to keep it as it was before. Please revert this change

Copy link
Contributor Author

@gelanivishal gelanivishal Nov 1, 2018

Choose a reason for hiding this comment

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

@ihor-sviziev Done.

}

return $this->categoryIdList[$productId];
Expand Down
6 changes: 1 addition & 5 deletions app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2021,11 +2021,7 @@ protected function _applyProductLimitations()
$this->getConnection()->quoteInto('cat_index.store_id=?', $filters['store_id'], 'int'),
];
if (isset($filters['visibility']) && !isset($filters['store_table'])) {
$conditions[] = $this->getConnection()->quoteInto(
Copy link
Contributor

@DanielRuf DanielRuf Nov 2, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Still not reverted here, please use the more readable version with multiple lines

'cat_index.visibility IN(?)',
$filters['visibility'],
'int'
);
$conditions[] = $this->getConnection()->quoteInto('cat_index.visibility IN(?)', $filters['visibility'], 'int');
}
$conditions[] = $this->getConnection()->quoteInto('cat_index.category_id=?', $filters['category_id'], 'int');
if (isset($filters['category_is_anchor'])) {
Expand Down
4 changes: 2 additions & 2 deletions lib/internal/Magento/Framework/Mview/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,8 @@ public function update()

for ($vsFrom = $lastVersionId; $vsFrom < $currentVersionId; $vsFrom += $versionBatchSize) {
// Don't go past the current version for atomicy.
$versionTo = min($currentVersionId, $vsFrom + $versionBatchSize);
$ids = array_map('intval', $this->getChangelog()->getList($vsFrom, $versionTo));
$versionTo = min($currentVersionId, $versionFrom + $versionBatchSize);
Copy link
Contributor

@ihor-sviziev ihor-sviziev Oct 31, 2018

Choose a reason for hiding this comment

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

Looks like $versionFrom is not defined there. Please fix it.

Copy link
Contributor Author

@gelanivishal gelanivishal Nov 1, 2018

Choose a reason for hiding this comment

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

@ihor-sviziev Done.

$ids = array_map('intval', $this->getChangelog()->getList($versionFrom, $versionTo));

// We run the actual indexer in batches.
// Chunked AFTER loading to avoid duplicates in separate chunks.
Expand Down