diff options
| author | Kamil Tekiela <tekiela246@gmail.com> | 2022-11-07 02:17:56 +0300 |
|---|---|---|
| committer | Kamil Tekiela <tekiela246@gmail.com> | 2022-11-08 03:32:10 +0300 |
| commit | 81bc60f7e0f3a28b04ecb15bcb55c20239d1cde0 (patch) | |
| tree | 6a5c86896897b1c180d4439367d803bf82bd526f | |
| parent | 1f4f414b404954a92cdff5b51ec0865ab182074a (diff) | |
Minor fixes in getSqlQueryForIndexCreateOrEdit()
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
| -rw-r--r-- | libraries/classes/Index.php | 2 | ||||
| -rw-r--r-- | libraries/classes/Table.php | 16 | ||||
| -rw-r--r-- | psalm-baseline.xml | 12 | ||||
| -rw-r--r-- | test/classes/TableTest.php | 4 |
4 files changed, 14 insertions, 20 deletions
diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php index 13482ec6d9..03f1b20d67 100644 --- a/libraries/classes/Index.php +++ b/libraries/classes/Index.php @@ -95,7 +95,7 @@ class Index * * @var string */ - private $parser = null; + private $parser = ''; /** * @param array $params parameters diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index 45d695d94b..00fd96b6e1 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -2098,11 +2098,11 @@ class Table implements Stringable } $sqlQuery .= sprintf( - ' ADD %s ', + ' ADD %s', $index->getChoice() ); if ($index->getName()) { - $sqlQuery .= Util::backquote($index->getName()); + $sqlQuery .= ' ' . Util::backquote($index->getName()); } break; @@ -2118,7 +2118,7 @@ class Table implements Stringable $indexFields[$key] .= '(' . $column->getSubPart() . ')'; } - if (empty($indexFields)) { + if ($indexFields === []) { $error = Message::error(__('No index parts defined!')); } else { $sqlQuery .= ' (' . implode(', ', $indexFields) . ')'; @@ -2143,15 +2143,15 @@ class Table implements Stringable } $parser = $index->getParser(); - if ($index->getChoice() === 'FULLTEXT' && ! empty($parser)) { - $sqlQuery .= ' WITH PARSER ' . $this->dbi->escapeString($parser); + if ($index->getChoice() === 'FULLTEXT' && $parser !== '') { + $sqlQuery .= ' WITH PARSER ' . $parser; } $comment = $index->getComment(); - if (! empty($comment)) { + if ($comment !== '') { $sqlQuery .= sprintf( - " COMMENT '%s'", - $this->dbi->escapeString($comment) + ' COMMENT %s', + $this->dbi->quoteString($comment) ); } diff --git a/psalm-baseline.xml b/psalm-baseline.xml index d888ab2316..9e704f2f7a 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -8058,14 +8058,13 @@ <MixedArrayOffset occurrences="1"> <code>$columns['sub_parts'][$key]</code> </MixedArrayOffset> - <MixedAssignment occurrences="15"> + <MixedAssignment occurrences="14"> <code>$column</code> <code>$key</code> <code>$name</code> <code>$sub_part</code> <code>$this->choice</code> <code>$this->comment</code> - <code>$this->keyBlockSize</code> <code>$this->name</code> <code>$this->nonUnique</code> <code>$this->packed</code> @@ -8078,9 +8077,7 @@ <PossiblyNullOperand occurrences="1"> <code>$params['Seq_in_index']</code> </PossiblyNullOperand> - <PossiblyNullPropertyAssignmentValue occurrences="3"> - <code>null</code> - <code>null</code> + <PossiblyNullPropertyAssignmentValue occurrences="1"> <code>null</code> </PossiblyNullPropertyAssignmentValue> <RedundantCastGivenDocblockType occurrences="1"> @@ -13462,10 +13459,7 @@ </PossiblyNullArgument> </file> <file src="libraries/classes/Table.php"> - <DeprecatedMethod occurrences="52"> - <code>escapeString</code> - <code>escapeString</code> - <code>escapeString</code> + <DeprecatedMethod occurrences="49"> <code>escapeString</code> <code>escapeString</code> <code>escapeString</code> diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php index bfb642cf57..434b66f8f0 100644 --- a/test/classes/TableTest.php +++ b/test/classes/TableTest.php @@ -1308,7 +1308,7 @@ class TableTest extends AbstractTestCase $table = new Table($table, $db, $GLOBALS['dbi']); $sql = $table->getSqlQueryForIndexCreateOrEdit($index, $error); - $this->assertEquals('ALTER TABLE `pma_db`.`pma_table` DROP PRIMARY KEY, ADD UNIQUE ;', $sql); + $this->assertEquals('ALTER TABLE `pma_db`.`pma_table` DROP PRIMARY KEY, ADD UNIQUE;', $sql); } /** @@ -1326,7 +1326,7 @@ class TableTest extends AbstractTestCase $table = new Table($table, $db, $GLOBALS['dbi']); $sql = $table->getSqlQueryForIndexCreateOrEdit($index, $error); - $this->assertEquals('ALTER TABLE `pma_db`.`pma_table` DROP PRIMARY KEY, ADD UNIQUE ;', $sql); + $this->assertEquals('ALTER TABLE `pma_db`.`pma_table` DROP PRIMARY KEY, ADD UNIQUE;', $sql); } /** |