1
0
mirror of https://github.com/vrana/adminer.git synced 2025-08-06 22:56:46 +02:00

Plugins: Add missing namespaces

This commit is contained in:
Jakub Vrana
2025-03-05 14:51:55 +01:00
parent a7f097e78c
commit 293e031498
3 changed files with 5 additions and 5 deletions

View File

@@ -34,7 +34,7 @@ CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN
echo "
WHEN " . Adminer\q($row["TABLE_NAME"]) . " THEN
" . (isset($row["ENGINE"]) ? "IF _engine != '$row[ENGINE]' OR _table_collation != '$row[TABLE_COLLATION]' OR _table_comment != $comment THEN
ALTER TABLE " . idf_escape($row["TABLE_NAME"]) . " ENGINE=$row[ENGINE] COLLATE=$row[TABLE_COLLATION] COMMENT=$comment;
ALTER TABLE " . Adminer\idf_escape($row["TABLE_NAME"]) . " ENGINE=$row[ENGINE] COLLATE=$row[TABLE_COLLATION] COMMENT=$comment;
END IF" : "BEGIN END") . ";";
}
echo "
@@ -92,14 +92,14 @@ CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN
$row["default"] = ($default !== null ? Adminer\q($default) : "NULL");
$row["after"] = Adminer\q($after); //! rgt AFTER lft, lft AFTER id doesn't work
$row["alter"] = Adminer\escape_string(
idf_escape($row["COLUMN_NAME"])
Adminer\idf_escape($row["COLUMN_NAME"])
. " $row[COLUMN_TYPE]"
. ($row["COLLATION_NAME"] ? " COLLATE $row[COLLATION_NAME]" : "")
. ($default !== null ? " DEFAULT " . ($default == "CURRENT_TIMESTAMP" ? $default : $row["default"]) : "")
. ($row["IS_NULLABLE"] == "YES" ? "" : " NOT NULL")
. ($row["EXTRA"] ? " $row[EXTRA]" : "")
. ($row["COLUMN_COMMENT"] ? " COMMENT " . Adminer\q($row["COLUMN_COMMENT"]) : "")
. ($after ? " AFTER " . idf_escape($after) : " FIRST")
. ($after ? " AFTER " . Adminer\idf_escape($after) : " FIRST")
);
echo ", ADD $row[alter]";
$fields[] = $row;

View File

@@ -26,7 +26,7 @@ class AdminerEditForeign {
$id = $foreignKey["target"][0];
$options = &$values[$target][$id];
if (!$options) {
$column = idf_escape($id);
$column = Adminer\idf_escape($id);
if (preg_match('~binary~', $field["type"])) {
$column = "HEX($column)";
}

View File

@@ -28,6 +28,6 @@ class AdminerLoginTable {
function login($login, $password) {
$connection = Adminer\connection();
return (bool) $connection->result("SELECT COUNT(*) FROM " . idf_escape($this->database) . ".login WHERE login = " . Adminer\q($login) . " AND password_sha1 = " . Adminer\q(sha1($password)));
return (bool) $connection->result("SELECT COUNT(*) FROM " . Adminer\idf_escape($this->database) . ".login WHERE login = " . Adminer\q($login) . " AND password_sha1 = " . Adminer\q(sha1($password)));
}
}