From e59dee011c199ec0f0fad819ca6be981db4778f1 Mon Sep 17 00:00:00 2001
From: Ravi Chandra <ravi.chandra@krishtechnolabs.com>
Date: Sat, 13 Oct 2018 18:06:00 +0530
Subject: [PATCH 1/3] Fix SKU limit in import new products

---
 .../Magento/CatalogImportExport/Model/Import/Product.php     | 5 +++++
 .../CatalogImportExport/Model/Import/Product/Validator.php   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 19e33ee267da7..7c73f7f7dba2e 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -159,6 +159,11 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     const URL_KEY = 'url_key';
 
+    /**
+    * SKU max length
+    */
+    const DB_MAX_SKU_LENGTH = 65;
+
     /**
      * Attribute cache
      *
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
index 60bfdd56a718e..818f28aa5f27a 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
@@ -69,6 +69,8 @@ protected function textValidation($attrCode, $type)
         $val = $this->string->cleanString($this->_rowData[$attrCode]);
         if ($type == 'text') {
             $valid = $this->string->strlen($val) < Product::DB_MAX_TEXT_LENGTH;
+        } else if ($attrCode == Product::COL_SKU) {
+            $valid = $this->string->strlen($val) < Product::DB_MAX_SKU_LENGTH;
         } else {
             $valid = $this->string->strlen($val) < Product::DB_MAX_VARCHAR_LENGTH;
         }

From a10f0749d9be91695cf3f3558f60744a23d9e12c Mon Sep 17 00:00:00 2001
From: Ravi Chandra <ravi.chandra@krishtechnolabs.com>
Date: Tue, 16 Oct 2018 14:21:53 +0530
Subject: [PATCH 2/3] [Backport] Fix SKU limit in import new products

---
 .../Magento/CatalogImportExport/Model/Import/Product.php     | 5 -----
 .../CatalogImportExport/Model/Import/Product/Validator.php   | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 7c73f7f7dba2e..19e33ee267da7 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -159,11 +159,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     const URL_KEY = 'url_key';
 
-    /**
-    * SKU max length
-    */
-    const DB_MAX_SKU_LENGTH = 65;
-
     /**
      * Attribute cache
      *
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
index 818f28aa5f27a..40cf70b8f4e73 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
@@ -7,6 +7,7 @@
 
 use Magento\CatalogImportExport\Model\Import\Product;
 use Magento\Framework\Validator\AbstractValidator;
+use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
 
 /**
  * Class Validator
@@ -70,7 +71,7 @@ protected function textValidation($attrCode, $type)
         if ($type == 'text') {
             $valid = $this->string->strlen($val) < Product::DB_MAX_TEXT_LENGTH;
         } else if ($attrCode == Product::COL_SKU) {
-            $valid = $this->string->strlen($val) < Product::DB_MAX_SKU_LENGTH;
+            $valid = $this->string->strlen($val) < SKU::SKU_MAX_LENGTH;
         } else {
             $valid = $this->string->strlen($val) < Product::DB_MAX_VARCHAR_LENGTH;
         }

From ad68105413c6375dbb48884b434a40bb17f72b25 Mon Sep 17 00:00:00 2001
From: Ravi Chandra <ravi.chandra@krishtechnolabs.com>
Date: Thu, 18 Oct 2018 12:15:13 +0530
Subject: [PATCH 3/3] Fix SKU limit in import new products for 2.3 with
 backward compatible allow  64 characters for SKU

---
 .../CatalogImportExport/Model/Import/Product/Validator.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
index 40cf70b8f4e73..793ad935363d3 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
@@ -71,7 +71,7 @@ protected function textValidation($attrCode, $type)
         if ($type == 'text') {
             $valid = $this->string->strlen($val) < Product::DB_MAX_TEXT_LENGTH;
         } else if ($attrCode == Product::COL_SKU) {
-            $valid = $this->string->strlen($val) < SKU::SKU_MAX_LENGTH;
+            $valid = $this->string->strlen($val) <= SKU::SKU_MAX_LENGTH;
         } else {
             $valid = $this->string->strlen($val) < Product::DB_MAX_VARCHAR_LENGTH;
         }