Merge remote-tracking branch 'origin/MAGETWO-43906-long-db-prefix' into PR_Branch

Author: monkeysee

setup/src/Magento/Setup/Test/Unit/Validator/DbValidatorTest.php

@@ -108,6 +108,18 @@ public function testCheckDatabaseTablePrefixWrongFormat()
         $this->assertEquals(true, $this->dbValidator->checkDatabaseTablePrefix('_wrong_format'));
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Table prefix length can't be more than
+     */
+    public function testCheckDatabaseTablePrefixWrongLength()
+    {
+        $this->assertEquals(
+            true,
+            $this->dbValidator->checkDatabaseTablePrefix('mvbXzXzItSIr0wrZW3gqgV2UKrWiK1Mj7bkBlW72rZW3gqgV2UKrWiK1M')
+        );
+    }
+
     /**
      * @expectedException \Magento\Setup\Exception
      * @expectedExceptionMessage Database connection failure.

setup/src/Magento/Setup/Validator/DbValidator.php

@@ -15,6 +15,12 @@
  */
 class DbValidator
 {
+
+    /**
+     * Db prefix max length
+     */
+    const DB_PREFIX_LENGTH = 5;
+
     /**
      * DB connection factory
      *
@@ -44,7 +50,16 @@ public function checkDatabaseTablePrefix($prefix)
         //The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_);
         // the first character should be a letter.
         if ($prefix !== '' && !preg_match('/^([a-zA-Z])([[:alnum:]_]+)$/', $prefix)) {
-            throw new \InvalidArgumentException('Please correct the table prefix format.');
+            throw new \InvalidArgumentException(
+                'Please correct the table prefix format, should contain only numbers, letters or underscores.'
+                .' The first character should be a letter.'
+            );
+        }
+
+        if (strlen($prefix) > self::DB_PREFIX_LENGTH) {
+            throw new \InvalidArgumentException(
+                'Table prefix length can\'t be more than ' . self::DB_PREFIX_LENGTH . ' characters.'
+            );
         }
 
         return true;

setup/view/magento/setup/add-database.phtml

@@ -335,7 +335,7 @@
             id="dbTablePrefix"
             class="form-el-input"
             tooltip-placement="right"
-            tooltip="Enter a prefix for database tables created in this installation. Use letters, numbers or underscores, and begin with a letter (Ex: ‘mg1_’)"
+            tooltip="Enter a prefix for database tables created in this installation. Use letters, numbers or underscores, and begin with a letter (Ex: ‘mg1_’). Table prefix length can't be more than 5 characters."
             tooltip-trigger="focus"
             tooltip-append-to-body="true"
             type="text"