Skip to content

Commit 4834c5f

Browse files
MauricioFauthMauricioFauth
committed
Remove bypass flag from Util::backquote method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent 2d6b263 commit 4834c5f

File tree

5 files changed

+32
-30
lines changed

5 files changed

+32
-30
lines changed

‎libraries/classes/Database/Routines.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -975,14 +975,14 @@ public function getQueryFromRequest(): string
975975
$do_backquote = false;
976976
}
977977

978-
$query .= 'DEFINER=' . Util::backquote($arr[0], $do_backquote);
978+
$query .= 'DEFINER=' . Util::backquoteCompat($arr[0], 'NONE', $do_backquote);
979979

980980
$do_backquote = true;
981981
if (substr($arr[1], 0, 1) === '`' && substr($arr[1], -1) === '`') {
982982
$do_backquote = false;
983983
}
984984

985-
$query .= '@' . Util::backquote($arr[1], $do_backquote) . ' ';
985+
$query .= '@' . Util::backquoteCompat($arr[1], 'NONE', $do_backquote) . ' ';
986986
} else {
987987
$errors[] = __('The definer must be in the "username@hostname" format!');
988988
}

‎libraries/classes/Plugins/Export/ExportSql.php

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,14 +1490,14 @@ public function getTableDef(
14901490

14911491
if (! empty($sql_drop_table) && $dbi->getTable($db, $table)->isView()) {
14921492
$schemaCreate .= 'DROP VIEW IF EXISTS '
1493-
. Util::backquote($tableAlias, $sql_backquotes) . ';'
1493+
. Util::backquoteCompat($tableAlias, 'NONE', $sql_backquotes) . ';'
14941494
. $crlf;
14951495
}
14961496

14971497
// no need to generate a DROP VIEW here, it was done earlier
14981498
if (! empty($sql_drop_table) && ! $dbi->getTable($db, $table)->isView()) {
14991499
$schemaCreate .= 'DROP TABLE IF EXISTS '
1500-
. Util::backquote($tableAlias, $sql_backquotes) . ';'
1500+
. Util::backquoteCompat($tableAlias, 'NONE', $sql_backquotes) . ';'
15011501
. $crlf;
15021502
}
15031503

@@ -1922,17 +1922,18 @@ private function getTableComments(
19221922
. $this->exportComment()
19231923
. $this->exportComment(
19241924
__('MEDIA TYPES FOR TABLE') . ' '
1925-
. Util::backquote($table, $sql_backquotes) . ':'
1925+
. Util::backquoteCompat($table, 'NONE', $sql_backquotes) . ':'
19261926
);
19271927
foreach ($mimeMap as $mimeField => $mime) {
19281928
$schemaCreate .= $this->exportComment(
19291929
' '
1930-
. Util::backquote($mimeField, $sql_backquotes)
1930+
. Util::backquoteCompat($mimeField, 'NONE', $sql_backquotes)
19311931
)
19321932
. $this->exportComment(
19331933
' '
1934-
. Util::backquote(
1934+
. Util::backquoteCompat(
19351935
$mime['mimetype'],
1936+
'NONE',
19361937
$sql_backquotes
19371938
)
19381939
);
@@ -1946,7 +1947,7 @@ private function getTableComments(
19461947
. $this->exportComment()
19471948
. $this->exportComment(
19481949
__('RELATIONSHIPS FOR TABLE') . ' '
1949-
. Util::backquote($tableAlias, $sql_backquotes)
1950+
. Util::backquoteCompat($tableAlias, 'NONE', $sql_backquotes)
19501951
. ':'
19511952
);
19521953

@@ -1958,20 +1959,23 @@ private function getTableComments(
19581959
: $relField;
19591960
$schemaCreate .= $this->exportComment(
19601961
' '
1961-
. Util::backquote(
1962+
. Util::backquoteCompat(
19621963
$relFieldAlias,
1964+
'NONE',
19631965
$sql_backquotes
19641966
)
19651967
)
19661968
. $this->exportComment(
19671969
' '
1968-
. Util::backquote(
1970+
. Util::backquoteCompat(
19691971
$rel['foreign_table'],
1972+
'NONE',
19701973
$sql_backquotes
19711974
)
19721975
. ' -> '
1973-
. Util::backquote(
1976+
. Util::backquoteCompat(
19741977
$rel['foreign_field'],
1978+
'NONE',
19751979
$sql_backquotes
19761980
)
19771981
);
@@ -1984,20 +1988,23 @@ private function getTableComments(
19841988
: $field;
19851989
$schemaCreate .= $this->exportComment(
19861990
' '
1987-
. Util::backquote(
1991+
. Util::backquoteCompat(
19881992
$relFieldAlias,
1993+
'NONE',
19891994
$sql_backquotes
19901995
)
19911996
)
19921997
. $this->exportComment(
19931998
' '
1994-
. Util::backquote(
1999+
. Util::backquoteCompat(
19952000
$oneKey['ref_table_name'],
2001+
'NONE',
19962002
$sql_backquotes
19972003
)
19982004
. ' -> '
1999-
. Util::backquote(
2005+
. Util::backquoteCompat(
20002006
$oneKey['ref_index_list'][$index],
2007+
'NONE',
20012008
$sql_backquotes
20022009
)
20032010
);

‎libraries/classes/Util.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,15 +396,14 @@ public static function getTableList($db): array
396396
* </code>
397397
*
398398
* @param array|string $aName the database, table or field name to "backquote" or array of it
399-
* @param bool $doIt a flag to bypass this function (used by dump functions)
400399
*
401400
* @return mixed the "backquoted" database, table or field name
402401
*
403402
* @access public
404403
*/
405-
public static function backquote($aName, $doIt = true)
404+
public static function backquote($aName)
406405
{
407-
return static::backquoteCompat($aName, 'NONE', $doIt);
406+
return static::backquoteCompat($aName, 'NONE', true);
408407
}
409408

410409
/**

‎psalm-baseline.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5968,8 +5968,6 @@
59685968
<code>$routine['item_num_params']</code>
59695969
<code>$string</code>
59705970
<code>Util::backquote($_POST['item_original_name'])</code>
5971-
<code>Util::backquote($arr[0], $do_backquote)</code>
5972-
<code>Util::backquote($arr[1], $do_backquote)</code>
59735971
<code>Util::backquote($itemName)</code>
59745972
<code>Util::backquote($itemParamName[$i])</code>
59755973
<code>Util::backquote($itemParamName[$i])</code>
@@ -5981,6 +5979,8 @@
59815979
<code>Util::backquote('mysql')</code>
59825980
<code>Util::backquote('procs_priv')</code>
59835981
<code>Util::backquote('procs_priv')</code>
5982+
<code>Util::backquoteCompat($arr[0], 'NONE', $do_backquote)</code>
5983+
<code>Util::backquoteCompat($arr[1], 'NONE', $do_backquote)</code>
59845984
</MixedOperand>
59855985
<PossiblyNullArgument occurrences="7">
59865986
<code>$create_routine</code>
@@ -11504,24 +11504,24 @@
1150411504
<code>Util::backquote($dbNameColumn)</code>
1150511505
<code>Util::backquote($dbNameColumn)</code>
1150611506
<code>Util::backquote($eventName)</code>
11507-
<code>Util::backquote($mimeField, $sql_backquotes)</code>
1150811507
<code>Util::backquote($routine)</code>
1150911508
<code>Util::backquote($table)</code>
11510-
<code>Util::backquote($table, $sql_backquotes)</code>
1151111509
<code>Util::backquote($tableAlias)</code>
1151211510
<code>Util::backquote($tableAlias)</code>
11513-
<code>Util::backquote($tableAlias, $sql_backquotes)</code>
11514-
<code>Util::backquote($tableAlias, $sql_backquotes)</code>
11515-
<code>Util::backquote($tableAlias, $sql_backquotes)</code>
1151611511
<code>Util::backquote($viewAlias)</code>
1151711512
<code>Util::backquote($viewAlias)</code>
1151811513
<code>Util::backquote($viewAlias)</code>
1151911514
<code>Util::backquoteCompat($dbAlias, $compat, isset($GLOBALS['sql_backquotes']))</code>
11515+
<code>Util::backquoteCompat($mimeField, 'NONE', $sql_backquotes)</code>
11516+
<code>Util::backquoteCompat($table, 'NONE', $sql_backquotes)</code>
1152011517
<code>Util::backquoteCompat($tableAlias, $compat, $sql_backquotes)</code>
1152111518
<code>Util::backquoteCompat($tableAlias, $compat, $sql_backquotes)</code>
1152211519
<code>Util::backquoteCompat($tableAlias, $compat, $sql_backquotes)</code>
1152311520
<code>Util::backquoteCompat($tableAlias, $compat, $sql_backquotes)</code>
1152411521
<code>Util::backquoteCompat($tableAlias, $compat, $sql_backquotes)</code>
11522+
<code>Util::backquoteCompat($tableAlias, 'NONE', $sql_backquotes)</code>
11523+
<code>Util::backquoteCompat($tableAlias, 'NONE', $sql_backquotes)</code>
11524+
<code>Util::backquoteCompat($tableAlias, 'NONE', $sql_backquotes)</code>
1152511525
</MixedOperand>
1152611526
<PossiblyInvalidOperand occurrences="1">
1152711527
<code>Context::escape($field-&gt;name)</code>

‎test/classes/UtilTest.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,10 +1603,6 @@ public function providerUnQuoteSelectedChar(): array
16031603
*/
16041604
public function testBackquote($a, $b): void
16051605
{
1606-
// Test bypass quoting (used by dump functions)
1607-
$this->assertEquals($a, Util::backquote($a, false));
1608-
1609-
// Test backquote
16101606
$this->assertEquals($b, Util::backquote($a));
16111607
}
16121608

@@ -1727,12 +1723,12 @@ public function testBackquoteForbidenWords(): void
17271723
if ($type & Token::FLAG_KEYWORD_RESERVED) {
17281724
$this->assertEquals(
17291725
'`' . $keyword . '`',
1730-
Util::backquote($keyword, false)
1726+
Util::backquoteCompat($keyword, 'NONE', false)
17311727
);
17321728
} else {
17331729
$this->assertEquals(
17341730
$keyword,
1735-
Util::backquote($keyword, false)
1731+
Util::backquoteCompat($keyword, 'NONE', false)
17361732
);
17371733
}
17381734
}

0 commit comments

Comments
 (0)