From 85c325a27449ed39b001c3ea0ca9cc1203899da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Thu, 27 Jan 2022 10:05:02 +0100
Subject: [PATCH] Sql.mysql: Clean up backport.
The Mysql module in Pike 8.0 does not handle an argument value
of UNDEFINED identically to as if the corresponding argument
was omitted.
Fixes list_{dbs,tables}() with omitted wild card argument.
Also fixes an obscure special case in list_fields().
---
lib/modules/Sql.pmod/mysql.pike | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/lib/modules/Sql.pmod/mysql.pike b/lib/modules/Sql.pmod/mysql.pike
index 3dfeae92b9..3523c64057 100644
--- a/lib/modules/Sql.pmod/mysql.pike
+++ b/lib/modules/Sql.pmod/mysql.pike
@@ -872,12 +872,18 @@ Mysql.mysql_result streaming_typed_query (string query,
array(string) list_dbs(string|void wild)
{
- return fix_result_charset(::list_dbs(wild && fix_query_charset(wild)[0]));
+ if (!wild) {
+ return fix_result_charset(::list_dbs());
+ }
+ return fix_result_charset(::list_dbs(fix_query_charset(wild)[0]));
}
array(string) list_tables(string|void wild)
{
- return fix_result_charset(::list_tables(wild && fix_query_charset(wild)[0]));
+ if (!wild) {
+ return fix_result_charset(::list_tables());
+ }
+ return fix_result_charset(::list_tables(fix_query_charset(wild)[0]));
}
array(mapping(string:mixed)) list_fields(string table, string|void wild)
@@ -895,8 +901,15 @@ array(mapping(string:mixed)) list_fields(string table, string|void wild)
return fix_result_charset(::list_fields(@a));
}
- // Very uncommon case, but...
- //
+ // Very uncommon cases, but...
+
+ if (sizeof(a) == 1) {
+ // The split marker has been recoded.
+ // Assume that fix_query_charset() is stable.
+ return fix_result_charset(::list_fields(fix_query_charset(table)[0],
+ fix_query_charset(wild)[0]));
+ }
+
// Assume that the table name can not contain NUL characters.
return fix_result_charset(::list_fields(a[0], a[1..] * "\0\0PIKE\0\0"));
}
--
GitLab