gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18663 from kamil-tekiela/Fix-dropped-triggers-on-rename

Browse Source 
Fix dropped triggers on rename
This commit is contained in:
Maurício Meneghini Fauth 2023-08-28 21:26:23 -03:00 committed by GitHub
commit e64f1e9d6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/classes/Table.php
View File

@ -1531,8 +1531,9 @@ class Table implements Stringable
RENAME TABLE ' . $this->getFullName(true) . '
TO ' . $newTable->getFullName(true) . ';';
// I don't think a specific error message for views is necessary
if (! $this->dbi->query($GLOBALS['sql_query'])) {
// TODO: this is dead code, should it be removed?
if ($this->dbi->tryQuery($GLOBALS['sql_query']) === false) {
$this->errors[] = $this->dbi->getError();
// Restore triggers in the old database
if ($handleTriggers) {
$this->dbi->selectDb($this->getDbName());
@ -1541,12 +1542,6 @@ class Table implements Stringable
}
}
$this->errors[] = sprintf(
__('Failed to rename table %1$s to %2$s!'),
$this->getFullName(),
$newTable->getFullName()
);
return false;
}

5
phpstan-baseline.neon
View File

@ -8365,11 +8365,6 @@ parameters:
count: 1
path: libraries/classes/Table.php
-
message: "#^Negated boolean expression is always false\\.$#"
count: 1
path: libraries/classes/Table.php
-
message: "#^Parameter \\#1 \\$string of function substr expects string, mixed given\\.$#"
count: 2

24
psalm-baseline.xml
View File

@ -13727,8 +13727,7 @@
<ReferenceConstraintViolation occurrences="1">
<code>return $sqlQuery;</code>
</ReferenceConstraintViolation>
<TypeDoesNotContainType occurrences="2">
<code>! $this-&gt;dbi-&gt;query($GLOBALS['sql_query'])</code>
<TypeDoesNotContainType occurrences="1">
<code>$rowFields[$key] != 'cc'</code>
</TypeDoesNotContainType>
<UnusedVariable occurrences="1">
@ -13815,7 +13814,7 @@
</PossiblyInvalidCast>
</file>
<file src="libraries/classes/Table/Search.php">
<MixedArgument occurrences="16">
<MixedArgument occurrences="15">
<code>$_POST['criteriaColumnNames'][$column_index]</code>
<code>$_POST['criteriaColumnTypes'][$column_index]</code>
<code>$column</code>
@ -13830,16 +13829,14 @@
<code>$criteriaValues[0]</code>
<code>$operator</code>
<code>$operator</code>
<code>$tmp_geom_func</code>
<code>$value</code>
</MixedArgument>
<MixedArgumentTypeCoercion occurrences="1">
<code>$values</code>
</MixedArgumentTypeCoercion>
<MixedAssignment occurrences="4">
<MixedAssignment occurrences="3">
<code>$column</code>
<code>$operator</code>
<code>$tmp_geom_func</code>
<code>$value</code>
</MixedAssignment>
<MixedOperand occurrences="5">
@ -13849,28 +13846,17 @@
<code>$values[0] ?? ''</code>
<code>$values[1] ?? ''</code>
</MixedOperand>
<PossiblyInvalidArgument occurrences="8">
<code>$_POST['criteriaColumnNames'][$column_index]</code>
<code>$_POST['criteriaColumnTypes'][$column_index]</code>
<PossiblyInvalidArgument occurrences="4">
<code>$_POST['customWhereClause']</code>
<code>$_POST['orderByColumn']</code>
<code>$_POST['table']</code>
<code>$operator</code>
<code>$operator</code>
<code>$tmp_geom_func</code>
</PossiblyInvalidArgument>
<PossiblyInvalidArrayOffset occurrences="4">
<PossiblyInvalidArrayOffset occurrences="3">
<code>$_POST['criteriaColumnNames'][$column_index]</code>
<code>$_POST['criteriaColumnTypes'][$column_index]</code>
<code>$_POST['criteriaValues'][$column_index]</code>
<code>$_POST['geom_func'][$column_index]</code>
</PossiblyInvalidArrayOffset>
<PossiblyInvalidCast occurrences="4">
<code>$_POST['criteriaColumnNames'][$column_index]</code>
<code>$_POST['criteriaColumnTypes'][$column_index]</code>
<code>$operator</code>
<code>$operator</code>
</PossiblyInvalidCast>
<PossiblyInvalidIterator occurrences="2">
<code>$_POST['criteriaColumnOperators']</code>
<code>$columnsToDisplay</code>