Skip to content

Commit

Permalink
Link help of partitioning types
Browse files Browse the repository at this point in the history
  • Loading branch information
vrana committed Jul 19, 2013
1 parent 3b3d169 commit 0be7532
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
9 changes: 6 additions & 3 deletions adminer/create.inc.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<?php
$TABLE = $_GET["create"];
$partition_by = array('HASH', 'LINEAR HASH', 'KEY', 'LINEAR KEY', 'RANGE', 'LIST');
$partition_by = array();
foreach (array('HASH', 'LINEAR HASH', 'KEY', 'LINEAR KEY', 'RANGE', 'LIST') as $key) {
$partition_by[$key] = $key;
}

$referencable_primary = referencable_primary($TABLE);
$foreign_keys = array();
Expand Down Expand Up @@ -71,7 +74,7 @@
}

$partitioning = "";
if (in_array($row["partition_by"], $partition_by)) {
if ($partition_by[$row["partition_by"]]) {
$partitions = array();
if ($row["partition_by"] == 'RANGE' || $row["partition_by"] == 'LIST') {
foreach (array_filter($row["partition_names"]) as $key => $val) {
Expand Down Expand Up @@ -197,7 +200,7 @@
print_fieldset("partition", lang('Partition by'), $row["partition_by"]);
?>
<p>
<?php echo html_select("partition_by", array(-1 => "") + $partition_by, $row["partition_by"], "partitionByChange(this);") . doc_link("partitioning-types.html"); ?>
<?php echo "<select name='partition_by' onchange='partitionByChange(this);'" . on_help("getTarget(event).value.replace(/./, 'PARTITION BY \$&')", 1) . ">" . optionlist(array("" => "") + $partition_by, $row["partition_by"]) . "</select>"; ?>
(<input name="partition" value="<?php echo h($row["partition"]); ?>">)
<?php echo lang('Partitions'); ?>: <input type="number" name="partitions" class="size<?php echo ($partition_table || !$row["partition_by"] ? " hidden" : ""); ?>" value="<?php echo h($row["partitions"]); ?>">
<table cellspacing="0" id="partition-table"<?php echo ($partition_table ? "" : " class='hidden'"); ?>>
Expand Down
1 change: 1 addition & 0 deletions adminer/static/editing.js
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@ function partitionByChange(el) {
var partitionTable = /RANGE|LIST/.test(selectValue(el));
alterClass(el.form['partitions'], 'hidden', partitionTable || !el.selectedIndex);
alterClass(document.getElementById('partition-table'), 'hidden', !partitionTable);
helpClose();
}

/** Add next partition row
Expand Down
2 changes: 1 addition & 1 deletion externals/jush
Submodule jush updated from 7df469 to 9493dc

0 comments on commit 0be7532

Please sign in to comment.