From f0e444a96185ed5ca1e82e6a7998b996a19b6c3f Mon Sep 17 00:00:00 2001 From: Temuri Doghonadze Date: Sat, 16 Mar 2024 08:42:31 +0000 Subject: [PATCH 1/3] Translated using Weblate (Georgian) Currently translated at 56.4% (1936 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ka/ Signed-off-by: Temuri Doghonadze --- po/ka.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ka.po b/po/ka.po index bd0dc1f262..184cc49291 100644 --- a/po/ka.po +++ b/po/ka.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-11-12 15:23-0300\n" -"PO-Revision-Date: 2023-04-16 17:22+0000\n" +"PO-Revision-Date: 2024-03-16 09:09+0000\n" "Last-Translator: Temuri Doghonadze \n" "Language-Team: Georgian \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.17-dev\n" +"X-Generator: Weblate 5.5-dev\n" #: libraries/advisory_rules_generic.php:9 msgid "Uptime below one day" @@ -53,7 +53,7 @@ msgstr "" #: libraries/advisory_rules_generic.php:32 #, php-format msgid "Current amount of Questions: %s" -msgstr "კითხვების მიმდინარე რაოდენობა: %s" +msgstr "კითხვებს მიმდინარე რაოდენობა: %s" #: libraries/advisory_rules_generic.php:37 msgid "Percentage of slow queries" From 5858a10ca27e2f1726d9851f2fa49b4274597f8b Mon Sep 17 00:00:00 2001 From: Temuri Doghonadze Date: Sun, 17 Mar 2024 03:21:54 +0000 Subject: [PATCH 2/3] Translated using Weblate (Georgian) Currently translated at 56.5% (1939 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ka/ Signed-off-by: Temuri Doghonadze --- po/ka.po | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/po/ka.po b/po/ka.po index 184cc49291..1744886f6e 100644 --- a/po/ka.po +++ b/po/ka.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-11-12 15:23-0300\n" -"PO-Revision-Date: 2024-03-16 09:09+0000\n" +"PO-Revision-Date: 2024-03-18 04:02+0000\n" "Last-Translator: Temuri Doghonadze \n" "Language-Team: Georgian \n" @@ -4238,7 +4238,7 @@ msgstr "Microsoft Word 2000" #: libraries/classes/Config/Forms/User/ExportForm.php:122 #: libraries/classes/Config/Forms/User/ImportForm.php:52 msgid "OpenDocument Spreadsheet" -msgstr "OpenDocument Spreadsheet" +msgstr "OpenDocument ელცხრილი" #: libraries/classes/Config/Forms/User/ExportForm.php:126 msgid "OpenDocument Text" @@ -8171,7 +8171,7 @@ msgstr "სანიშნის შექმნა" #: libraries/classes/Database/Qbe.php:1704 msgid "Update bookmark" -msgstr "სანიშნის განახლება" +msgstr "სანიშნეს განახლება" #: libraries/classes/Database/Qbe.php:1706 msgid "Delete bookmark" @@ -10425,10 +10425,8 @@ msgstr "მეტამონაცემები ბაზისთვის % #: libraries/classes/Plugins/Export/ExportSql.php:1458 #: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:631 -#, fuzzy -#| msgid "Creation" msgid "Creation:" -msgstr "შეიქმნა" +msgstr "შეიქმნა:" #: libraries/classes/Plugins/Export/ExportSql.php:1468 #: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:642 @@ -10907,6 +10905,9 @@ msgid "" "prefix like \"https://www.example.com/\". The second option is a title for " "the link." msgstr "" +"გამოიტანს ბმულს; სვეტი შეიცავს ფაილის სახელს. პირველი პარამეტრია ბმულის " +"პრეფიქსი, \"https://www.example.com/\"-ის მსგავსი. მეორე პარამეტრი ბმულის " +"სათაურია." #: libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php:32 msgid "Converts an Internet network address in (IPv4/IPv6) format to binary" @@ -15691,7 +15692,7 @@ msgstr "რეპლიკის რეპლიკაცია" #: templates/server/databases/index.twig:181 #, php-format msgid "Jump to database '%s'" -msgstr "'%s' ბაზაზე გადასვლა" +msgstr "ბაზაზე გადასვლა '%s'" #: templates/server/databases/index.twig:242 #, php-format @@ -16885,10 +16886,8 @@ msgid "Bookmark this SQL query" msgstr "" #: templates/sql/bookmark.twig:15 -#, fuzzy -#| msgid "Label" msgid "Label:" -msgstr "Label" +msgstr "ჭდე:" #: templates/sql/bookmark.twig:22 templates/sql/query.twig:93 msgid "Let every user access this bookmark" From cbbe3401b17ef1cc2ffd937662b6fc098a3d31be Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Mon, 18 Mar 2024 14:19:37 +0100 Subject: [PATCH 3/3] SQL without unique clause is not recognized Signed-off-by: Kamil Tekiela --- libraries/classes/Sql.php | 3 ++- psalm-baseline.xml | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index f7e03b08f2..5e3f241af7 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -21,6 +21,7 @@ use PhpMyAdmin\SqlParser\Utils\Query; use PhpMyAdmin\Utils\ForeignKey; use function __; +use function array_key_exists; use function array_keys; use function array_map; use function bin2hex; @@ -198,7 +199,7 @@ class Sql foreach (array_keys($indexColumns) as $indexColumnName) { if ( ! in_array($indexColumnName, $resultSetColumnNames) - && in_array($indexColumnName, $columns) + && array_key_exists($indexColumnName, $columns) && ! str_contains($columns[$indexColumnName]['Extra'], 'INVISIBLE') ) { continue; diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 2838a68906..955301ac82 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -13265,9 +13265,6 @@ $_SESSION['tmpval']['possible_as_geometry'] $statement->expr[0] - - $columns[$indexColumnName] - $maxRows $oneFieldMeta