mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-09 16:17:48 +02:00
Code Issues Releases Wiki Activity

Foreign keys default actions (bug #3397606)

Browse Source
This commit is contained in:
Jakub Vrana
2011-08-29 13:21:02 +02:00
parent db3ae281bb
commit 9d34071eb9
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adminer/drivers/mysql.inc.php
View File

@@ -457,8 +457,8 @@ if (!defined("DRIVER")) {
"table" => idf_unescape($match[4] != "" ? $match[4] : $match[3]), "table" => idf_unescape($match[4] != "" ? $match[4] : $match[3]),
"source" => array_map('idf_unescape', $source[0]), "source" => array_map('idf_unescape', $source[0]),
"target" => array_map('idf_unescape', $target[0]), "target" => array_map('idf_unescape', $target[0]),
"on_delete" => $match[6], "on_delete" => ($match[6] ? $match[6] : "RESTRICT"),
"on_update" => $match[7], "on_update" => ($match[7] ? $match[7] : "RESTRICT"),
); );
} }
} }

4
adminer/drivers/pgsql.inc.php
View File

@@ -287,8 +287,8 @@ ORDER BY conkey, conname") as $row) {
$row['table'] = $match2[2]; $row['table'] = $match2[2];
} }
$row['target'] = array_map('trim', explode(',', $match[3])); $row['target'] = array_map('trim', explode(',', $match[3]));
$row['on_delete'] = (preg_match("~ON DELETE ($on_actions)~", $match[4], $match2) ? $match2[1] : ''); $row['on_delete'] = (preg_match("~ON DELETE ($on_actions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
$row['on_update'] = (preg_match("~ON UPDATE ($on_actions)~", $match[4], $match2) ? $match2[1] : ''); $row['on_update'] = (preg_match("~ON UPDATE ($on_actions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
$return[$row['conname']] = $row; $return[$row['conname']] = $row;
} }
} }

1
changes.txt
View File

@@ -1,4 +1,5 @@
Adminer 3.3.4-dev: Adminer 3.3.4-dev:
Foreign keys default actions (bug #3397606)
PostgreSQL: fix alter foreign key PostgreSQL: fix alter foreign key
PostgreSQL over PDO: connect if the eponymous database does not exist (bug #3391619) PostgreSQL over PDO: connect if the eponymous database does not exist (bug #3391619)
Boolean search (Editor) Boolean search (Editor)