Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Foreign keys default actions (bug #3397606)

  • Loading branch information...
commit 9d34071eb9d6963f1bbaf16ac42135006dd8cb11 1 parent db3ae28
@vrana authored
View
4 adminer/drivers/mysql.inc.php
@@ -457,8 +457,8 @@ function foreign_keys($table) {
"table" => idf_unescape($match[4] != "" ? $match[4] : $match[3]),
"source" => array_map('idf_unescape', $source[0]),
"target" => array_map('idf_unescape', $target[0]),
- "on_delete" => $match[6],
- "on_update" => $match[7],
+ "on_delete" => ($match[6] ? $match[6] : "RESTRICT"),
+ "on_update" => ($match[7] ? $match[7] : "RESTRICT"),
);
}
}
View
4 adminer/drivers/pgsql.inc.php
@@ -287,8 +287,8 @@ function foreign_keys($table) {
$row['table'] = $match2[2];
}
$row['target'] = array_map('trim', explode(',', $match[3]));
- $row['on_delete'] = (preg_match("~ON DELETE ($on_actions)~", $match[4], $match2) ? $match2[1] : '');
- $row['on_update'] = (preg_match("~ON UPDATE ($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] : 'NO ACTION');
$return[$row['conname']] = $row;
}
}
View
1  changes.txt
@@ -1,4 +1,5 @@
Adminer 3.3.4-dev:
+Foreign keys default actions (bug #3397606)
PostgreSQL: fix alter foreign key
PostgreSQL over PDO: connect if the eponymous database does not exist (bug #3391619)
Boolean search (Editor)
Please sign in to comment.
Something went wrong with that request. Please try again.