Skip to content

Commit 94ed296

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18699 from kamil-tekiela/escapeString-in-NodeTable
Replace escapeString in NodeTable
2 parents 67dcd7a + 1876e5b commit 94ed296

2 files changed

Lines changed: 10 additions & 30 deletions

File tree

‎psalm-baseline.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7689,16 +7689,6 @@
76897689
<code>Config::getInstance()</code>
76907690
<code>DatabaseInterface::getInstance()</code>
76917691
<code>DatabaseInterface::getInstance()</code>
7692-
<code>escapeString</code>
7693-
<code>escapeString</code>
7694-
<code>escapeString</code>
7695-
<code>escapeString</code>
7696-
<code>escapeString</code>
7697-
<code>escapeString</code>
7698-
<code>escapeString</code>
7699-
<code>escapeString</code>
7700-
<code>escapeString</code>
7701-
<code>escapeString</code>
77027692
</DeprecatedMethod>
77037693
<PossiblyInvalidPropertyFetch>
77047694
<code><![CDATA[$this->realParent()->realName]]></code>

‎src/Navigation/Nodes/NodeTable.php‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,10 @@ public function getPresence(string $type = '', string $searchClause = ''): int
9090
switch ($type) {
9191
case 'columns':
9292
if (! $config->selectedServer['DisableIS']) {
93-
$db = $dbi->escapeString($db);
94-
$table = $dbi->escapeString($table);
9593
$query = 'SELECT COUNT(*) ';
9694
$query .= 'FROM `INFORMATION_SCHEMA`.`COLUMNS` ';
97-
$query .= "WHERE `TABLE_NAME`='" . $table . "' ";
98-
$query .= "AND `TABLE_SCHEMA`='" . $db . "'";
95+
$query .= 'WHERE `TABLE_NAME`=' . $dbi->quoteString($table) . ' ';
96+
$query .= 'AND `TABLE_SCHEMA`=' . $dbi->quoteString($db);
9997
$retval = (int) $dbi->fetchValue($query);
10098
} else {
10199
$db = Util::backquote($db);
@@ -113,19 +111,16 @@ public function getPresence(string $type = '', string $searchClause = ''): int
113111
break;
114112
case 'triggers':
115113
if (! $config->selectedServer['DisableIS']) {
116-
$db = $dbi->escapeString($db);
117-
$table = $dbi->escapeString($table);
118114
$query = 'SELECT COUNT(*) ';
119115
$query .= 'FROM `INFORMATION_SCHEMA`.`TRIGGERS` ';
120116
$query .= 'WHERE `EVENT_OBJECT_SCHEMA` '
121-
. Util::getCollateForIS() . "='" . $db . "' ";
117+
. Util::getCollateForIS() . '=' . $dbi->quoteString($db) . ' ';
122118
$query .= 'AND `EVENT_OBJECT_TABLE` '
123-
. Util::getCollateForIS() . "='" . $table . "'";
119+
. Util::getCollateForIS() . '=' . $dbi->quoteString($table);
124120
$retval = (int) $dbi->fetchValue($query);
125121
} else {
126122
$db = Util::backquote($db);
127-
$table = $dbi->escapeString($table);
128-
$query = 'SHOW TRIGGERS FROM ' . $db . " WHERE `Table` = '" . $table . "'";
123+
$query = 'SHOW TRIGGERS FROM ' . $db . ' WHERE `Table` = ' . $dbi->quoteString($table);
129124
$retval = (int) $dbi->queryAndGetNumRows($query);
130125
}
131126

@@ -164,16 +159,14 @@ public function getData(
164159
switch ($type) {
165160
case 'columns':
166161
if (! $config->selectedServer['DisableIS']) {
167-
$db = $dbi->escapeString($db);
168-
$table = $dbi->escapeString($table);
169162
$query = 'SELECT `COLUMN_NAME` AS `name` ';
170163
$query .= ',`COLUMN_KEY` AS `key` ';
171164
$query .= ',`DATA_TYPE` AS `type` ';
172165
$query .= ',`COLUMN_DEFAULT` AS `default` ';
173166
$query .= ",IF (`IS_NULLABLE` = 'NO', '', 'nullable') AS `nullable` ";
174167
$query .= 'FROM `INFORMATION_SCHEMA`.`COLUMNS` ';
175-
$query .= "WHERE `TABLE_NAME`='" . $table . "' ";
176-
$query .= "AND `TABLE_SCHEMA`='" . $db . "' ";
168+
$query .= 'WHERE `TABLE_NAME`=' . $dbi->quoteString($table) . ' ';
169+
$query .= 'AND `TABLE_SCHEMA`=' . $dbi->quoteString($db) . ' ';
177170
$query .= 'ORDER BY `COLUMN_NAME` ASC ';
178171
$query .= 'LIMIT ' . $pos . ', ' . $maxItems;
179172
$retval = $dbi->fetchResult($query);
@@ -233,23 +226,20 @@ public function getData(
233226
break;
234227
case 'triggers':
235228
if (! $config->selectedServer['DisableIS']) {
236-
$db = $dbi->escapeString($db);
237-
$table = $dbi->escapeString($table);
238229
$query = 'SELECT `TRIGGER_NAME` AS `name` ';
239230
$query .= 'FROM `INFORMATION_SCHEMA`.`TRIGGERS` ';
240231
$query .= 'WHERE `EVENT_OBJECT_SCHEMA` '
241-
. Util::getCollateForIS() . "='" . $db . "' ";
232+
. Util::getCollateForIS() . '=' . $dbi->quoteString($db) . ' ';
242233
$query .= 'AND `EVENT_OBJECT_TABLE` '
243-
. Util::getCollateForIS() . "='" . $table . "' ";
234+
. Util::getCollateForIS() . '=' . $dbi->quoteString($table) . ' ';
244235
$query .= 'ORDER BY `TRIGGER_NAME` ASC ';
245236
$query .= 'LIMIT ' . $pos . ', ' . $maxItems;
246237
$retval = $dbi->fetchResult($query);
247238
break;
248239
}
249240

250241
$db = Util::backquote($db);
251-
$table = $dbi->escapeString($table);
252-
$query = 'SHOW TRIGGERS FROM ' . $db . " WHERE `Table` = '" . $table . "'";
242+
$query = 'SHOW TRIGGERS FROM ' . $db . ' WHERE `Table` = ' . $dbi->quoteString($table);
253243
$handle = $dbi->tryQuery($query);
254244
if ($handle === false) {
255245
break;

0 commit comments

Comments
 (0)