nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed MySQL < 5 code

Browse Source
This commit is contained in:
Sebastian Mendel
2007-10-02 09:46:28 +00:00
parent 03caaca92a
commit 619f6592ee
4 changed files with 54 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/tbl_common.php
View File

@@ -14,7 +14,7 @@ require_once './libraries/bookmark.lib.php';
// Check parameters // Check parameters
PMA_checkParameters(array('db', 'table')); PMA_checkParameters(array('db', 'table'));
if (PMA_MYSQL_INT_VERSION >= 50002 && $db === 'information_schema') { if ($db === 'information_schema') {
$db_is_information_schema = true; $db_is_information_schema = true;
} else { } else {
$db_is_information_schema = false; $db_is_information_schema = false;

3
libraries/tbl_indexes.lib.php
View File

@@ -204,8 +204,7 @@ function PMA_show_indexes($table, &$indexes, &$indexes_info, &$indexes_data,
. ' </th>' . "\n"; . ' </th>' . "\n";
} }
if ((PMA_MYSQL_INT_VERSION < 40002 && $indexes_info[$index_name]['Comment'] == 'FULLTEXT') if ($indexes_info[$index_name]['Index_type'] == 'FULLTEXT') {
|| (PMA_MYSQL_INT_VERSION >= 40002 && $indexes_info[$index_name]['Index_type'] == 'FULLTEXT')) {
$index_type = 'FULLTEXT'; $index_type = 'FULLTEXT';
} elseif ($index_name == 'PRIMARY') { } elseif ($index_name == 'PRIMARY') {
$index_type = 'PRIMARY'; $index_type = 'PRIMARY';

7
libraries/tbl_links.inc.php
View File

@@ -86,13 +86,10 @@ if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_
$tabs['operation']['link'] = 'tbl_operations.php'; $tabs['operation']['link'] = 'tbl_operations.php';
$tabs['operation']['text'] = $strOperations; $tabs['operation']['text'] = $strOperations;
$ln8_stt = (PMA_MYSQL_INT_VERSION >= 40000)
? 'TRUNCATE TABLE '
: 'DELETE FROM ';
$tabs['empty']['link'] = 'sql.php'; $tabs['empty']['link'] = 'sql.php';
$tabs['empty']['args']['sql_query'] = $ln8_stt . PMA_backquote($table); $tabs['empty']['args']['sql_query'] = 'TRUNCATE TABLE ' . PMA_backquote($table);
$tabs['empty']['args']['zero_rows'] = sprintf($strTableHasBeenEmptied, htmlspecialchars($table)); $tabs['empty']['args']['zero_rows'] = sprintf($strTableHasBeenEmptied, htmlspecialchars($table));
$tabs['empty']['attr'] = 'onclick="return confirmLink(this, \'' . $ln8_stt . PMA_jsFormat($table) . '\')"'; $tabs['empty']['attr'] = 'onclick="return confirmLink(this, \'TRUNCATE TABLE ' . PMA_jsFormat($table) . '\')"';
$tabs['empty']['args']['goto'] = 'tbl_structure.php'; $tabs['empty']['args']['goto'] = 'tbl_structure.php';
$tabs['empty']['class'] = 'caution'; $tabs['empty']['class'] = 'caution';
$tabs['empty']['icon'] = 'b_empty.png'; $tabs['empty']['icon'] = 'b_empty.png';

126
libraries/tbl_properties.inc.php
View File

@@ -41,8 +41,7 @@ document.onkeydown = onKeyDownArrowsHandler;
// the default CURRENT TIMESTAMP checkbox and label // the default CURRENT TIMESTAMP checkbox and label
// and, field_x_7a represents the checkbox itself // and, field_x_7a represents the checkbox itself
if (PMA_MYSQL_INT_VERSION >= 40102) { ?>
?>
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
function display_field_options(field_type, i) { function display_field_options(field_type, i) {
@@ -56,7 +55,6 @@ function display_field_options(field_type, i) {
} }
// ]]> // ]]>
</script> </script>
<?php } ?>
<form method="post" action="<?php echo $action; ?>"> <form method="post" action="<?php echo $action; ?>">
<?php <?php
@@ -126,9 +124,7 @@ $content_cells = array();
$header_cells[] = $strField; $header_cells[] = $strField;
$header_cells[] = $strType . ($GLOBALS['cfg']['ReplaceHelpImg'] ? PMA_showMySQLDocu('SQL-Syntax', 'data-types') : '<br /><span style="font-weight: normal">' . PMA_showMySQLDocu('SQL-Syntax', 'data-types') . '</span>'); $header_cells[] = $strType . ($GLOBALS['cfg']['ReplaceHelpImg'] ? PMA_showMySQLDocu('SQL-Syntax', 'data-types') : '<br /><span style="font-weight: normal">' . PMA_showMySQLDocu('SQL-Syntax', 'data-types') . '</span>');
$header_cells[] = $strLengthSet . '<sup>1</sup>'; $header_cells[] = $strLengthSet . '<sup>1</sup>';
if (PMA_MYSQL_INT_VERSION >= 40100) { $header_cells[] = $strCollation;
$header_cells[] = $strCollation;
}
$header_cells[] = $strAttr; $header_cells[] = $strAttr;
$header_cells[] = $strNull; $header_cells[] = $strNull;
$header_cells[] = $strDefault . '<sup>2</sup>'; $header_cells[] = $strDefault . '<sup>2</sup>';
@@ -156,18 +152,16 @@ $comments_map = array();
$mime_map = array(); $mime_map = array();
$available_mime = array(); $available_mime = array();
if ($cfgRelation['commwork'] || PMA_MYSQL_INT_VERSION >= 40100) { $comments_map = PMA_getComments($db, $table);
$comments_map = PMA_getComments($db, $table); $header_cells[] = $strComments;
$header_cells[] = $strComments;
if ($cfgRelation['mimework'] && $cfg['BrowseMIME']) { if ($cfgRelation['mimework'] && $cfg['BrowseMIME']) {
$mime_map = PMA_getMIME($db, $table); $mime_map = PMA_getMIME($db, $table);
$available_mime = PMA_getAvailableMIMEtypes(); $available_mime = PMA_getAvailableMIMEtypes();
$header_cells[] = $strMIME_MIMEtype; $header_cells[] = $strMIME_MIMEtype;
$header_cells[] = $strMIME_transformation; $header_cells[] = $strMIME_transformation;
$header_cells[] = $strMIME_transformation_options . '<sup>3</sup>'; $header_cells[] = $strMIME_transformation_options . '<sup>3</sup>';
}
} }
// garvin: workaround for field_fulltext, because its submitted indizes contain // garvin: workaround for field_fulltext, because its submitted indizes contain
@@ -187,9 +181,7 @@ for ($i = 0 ; $i <= $num_fields; $i++) {
$row['Field'] = (isset($field_name) && isset($field_name[$i]) ? $field_name[$i] : FALSE); $row['Field'] = (isset($field_name) && isset($field_name[$i]) ? $field_name[$i] : FALSE);
$row['Type'] = (isset($field_type) && isset($field_type[$i]) ? $field_type[$i] : FALSE); $row['Type'] = (isset($field_type) && isset($field_type[$i]) ? $field_type[$i] : FALSE);
if (PMA_MYSQL_INT_VERSION >= 40100) { $row['Collation'] = (isset($field_collation) && isset($field_collation[$i]) ? $field_collation[$i] : '');
$row['Collation'] = (isset($field_collation) && isset($field_collation[$i]) ? $field_collation[$i] : '');
}
$row['Null'] = (isset($field_null) && isset($field_null[$i]) ? $field_null[$i] : ''); $row['Null'] = (isset($field_null) && isset($field_null[$i]) ? $field_null[$i] : '');
if (isset($field_type[$i]) && $row['Null'] == '') { if (isset($field_type[$i]) && $row['Null'] == '') {
$submit_null = TRUE; $submit_null = TRUE;
@@ -250,9 +242,7 @@ for ($i = 0 ; $i <= $num_fields; $i++) {
$content_cells[$i][$ci] .= "\n" . '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '" type="text" name="field_name[]" size="10" maxlength="64" value="' . (isset($row) && isset($row['Field']) ? str_replace('"', '&quot;', $row['Field']) : '') . '" class="textfield" title="' . $strField . '" />'; $content_cells[$i][$ci] .= "\n" . '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '" type="text" name="field_name[]" size="10" maxlength="64" value="' . (isset($row) && isset($row['Field']) ? str_replace('"', '&quot;', $row['Field']) : '') . '" class="textfield" title="' . $strField . '" />';
$ci++; $ci++;
$content_cells[$i][$ci] = '<select name="field_type[]" id="field_' . $i . '_' . ($ci - $ci_offset) . '" '; $content_cells[$i][$ci] = '<select name="field_type[]" id="field_' . $i . '_' . ($ci - $ci_offset) . '" ';
if (PMA_MYSQL_INT_VERSION >= 40102) { $content_cells[$i][$ci] .= 'onchange="display_field_options(this.options[this.selectedIndex].value,' . $i .')" ';
$content_cells[$i][$ci] .= 'onchange="display_field_options(this.options[this.selectedIndex].value,' . $i .')" ';
}
$content_cells[$i][$ci] .= '>' . "\n"; $content_cells[$i][$ci] .= '>' . "\n";
if (empty($row['Type'])) { if (empty($row['Type'])) {
@@ -283,11 +273,9 @@ for ($i = 0 ; $i <= $num_fields; $i++) {
// some types, for example longtext, are reported as // some types, for example longtext, are reported as
// "longtext character set latin7" when their charset and / or collation // "longtext character set latin7" when their charset and / or collation
// differs from the ones of the corresponding database. // differs from the ones of the corresponding database.
if (PMA_MYSQL_INT_VERSION >= 40100) { $tmp = strpos($type, 'character set');
$tmp = strpos($type, 'character set'); if ($tmp) {
if ($tmp) { $type = substr($type, 0, $tmp - 1);
$type = substr($type, 0, $tmp-1);
}
} }
if (isset($submit_length) && $submit_length != FALSE) { if (isset($submit_length) && $submit_length != FALSE) {
@@ -323,11 +311,7 @@ for ($i = 0 ; $i <= $num_fields; $i++) {
$length_to_display = htmlspecialchars($length); $length_to_display = htmlspecialchars($length);
} else { } else {
$length_to_display = $length; $length_to_display = $length;
if (!preg_match('@BINARY[\(]@i', $row['Type']) && PMA_MYSQL_INT_VERSION < 40100) { $binary = FALSE;
$binary = stristr($row['Type'], 'binary');
} else {
$binary = FALSE;
}
$unsigned = stristr($row['Type'], 'unsigned'); $unsigned = stristr($row['Type'], 'unsigned');
$zerofill = stristr($row['Type'], 'zerofill'); $zerofill = stristr($row['Type'], 'zerofill');
} }
@@ -335,12 +319,10 @@ for ($i = 0 ; $i <= $num_fields; $i++) {
$content_cells[$i][$ci] .= "\n" . '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '" type="text" name="field_length[]" size="8" value="' . str_replace('"', '&quot;', $length_to_display) . '" class="textfield" />' . "\n"; $content_cells[$i][$ci] .= "\n" . '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '" type="text" name="field_length[]" size="8" value="' . str_replace('"', '&quot;', $length_to_display) . '" class="textfield" />' . "\n";
$ci++; $ci++;
if (PMA_MYSQL_INT_VERSION >= 40100) { $tmp_collation = empty($row['Collation']) ? null : $row['Collation'];
$tmp_collation = empty($row['Collation']) ? null : $row['Collation']; $content_cells[$i][$ci] = PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'field_collation[]', 'field_' . $i . '_' . ($ci - $ci_offset), $tmp_collation, FALSE);
$content_cells[$i][$ci] = PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'field_collation[]', 'field_' . $i . '_' . ($ci - $ci_offset), $tmp_collation, FALSE); unset($tmp_collation);
unset($tmp_collation); $ci++;
$ci++;
}
$content_cells[$i][$ci] = '<select style="font-size: 70%;" name="field_attribute[]" id="field_' . $i . '_' . ($ci - $ci_offset) . '">' . "\n"; $content_cells[$i][$ci] = '<select style="font-size: 70%;" name="field_attribute[]" id="field_' . $i . '_' . ($ci - $ci_offset) . '">' . "\n";
@@ -384,14 +366,14 @@ for ($i = 0 ; $i <= $num_fields; $i++) {
} }
// Dynamically add ON UPDATE CURRENT_TIMESTAMP to the possible attributes // Dynamically add ON UPDATE CURRENT_TIMESTAMP to the possible attributes
if (PMA_MYSQL_INT_VERSION >= 40102 && !in_array('ON UPDATE CURRENT_TIMESTAMP', $cfg['AttributeTypes'])) { if (! in_array('ON UPDATE CURRENT_TIMESTAMP', $cfg['AttributeTypes'])) {
$cfg['AttributeTypes'][] = 'ON UPDATE CURRENT_TIMESTAMP'; $cfg['AttributeTypes'][] = 'ON UPDATE CURRENT_TIMESTAMP';
} }
$cnt_attribute_types = count($cfg['AttributeTypes']); $cnt_attribute_types = count($cfg['AttributeTypes']);
for ($j = 0;$j < $cnt_attribute_types; $j++) { for ($j = 0;$j < $cnt_attribute_types; $j++) {
if (PMA_MYSQL_INT_VERSION >= 40100 && $cfg['AttributeTypes'][$j] == 'BINARY') { if ($cfg['AttributeTypes'][$j] == 'BINARY') {
continue; continue;
} }
$content_cells[$i][$ci] .= ' <option value="'. $cfg['AttributeTypes'][$j] . '"'; $content_cells[$i][$ci] .= ' <option value="'. $cfg['AttributeTypes'][$j] . '"';
@@ -431,28 +413,24 @@ for ($i = 0 ; $i <= $num_fields; $i++) {
} }
// for a TIMESTAMP, do not show CURRENT_TIMESTAMP as a default value // for a TIMESTAMP, do not show CURRENT_TIMESTAMP as a default value
if (PMA_MYSQL_INT_VERSION >= 40102 if ($type_upper == 'TIMESTAMP'
&& $type_upper == 'TIMESTAMP' && $default_current_timestamp
&& $default_current_timestamp && isset($row['Default'])) {
&& isset($row)
&& isset($row['Default'])) {
$row['Default'] = ''; $row['Default'] = '';
} }
$content_cells[$i][$ci] .= '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '" type="text" name="field_default[]" size="12" value="' . (isset($row) && isset($row['Default']) ? str_replace('"', '&quot;', $row['Default']) : '') . '" class="textfield" />'; $content_cells[$i][$ci] .= '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '" type="text" name="field_default[]" size="12" value="' . (isset($row) && isset($row['Default']) ? str_replace('"', '&quot;', $row['Default']) : '') . '" class="textfield" />';
if (PMA_MYSQL_INT_VERSION >= 40102) { if ($type_upper == 'TIMESTAMP') {
if ($type_upper == 'TIMESTAMP') { $tmp_display_type = 'block';
$tmp_display_type = 'block'; } else {
} else { $tmp_display_type = 'none';
$tmp_display_type = 'none'; $default_current_timestamp = FALSE;
$default_current_timestamp = FALSE;
}
$content_cells[$i][$ci] .= '<br /><div id="div_' . $i . '_' . ($ci - $ci_offset) . '" style="white-space: nowrap; display: ' . $tmp_display_type . '"><input id="field_' . $i . '_' . ($ci - $ci_offset) . 'a" type="checkbox" name="field_default_current_timestamp[' . $i . ']"';
if ($default_current_timestamp) {
$content_cells[$i][$ci] .= ' checked="checked" ';
}
$content_cells[$i][$ci] .= ' /><label for="field_' . $i . '_' . ($ci - $ci_offset) . 'a" style="font-size: 70%;">CURRENT_TIMESTAMP</label></div>';
} }
$content_cells[$i][$ci] .= '<br /><div id="div_' . $i . '_' . ($ci - $ci_offset) . '" style="white-space: nowrap; display: ' . $tmp_display_type . '"><input id="field_' . $i . '_' . ($ci - $ci_offset) . 'a" type="checkbox" name="field_default_current_timestamp[' . $i . ']"';
if ($default_current_timestamp) {
$content_cells[$i][$ci] .= ' checked="checked" ';
}
$content_cells[$i][$ci] .= ' /><label for="field_' . $i . '_' . ($ci - $ci_offset) . 'a" style="font-size: 70%;">CURRENT_TIMESTAMP</label></div>';
$ci++; $ci++;
$content_cells[$i][$ci] = '<select name="field_extra[]" id="field_' . $i . '_' . ($ci - $ci_offset) . '">'; $content_cells[$i][$ci] = '<select name="field_extra[]" id="field_' . $i . '_' . ($ci - $ci_offset) . '">';
@@ -519,10 +497,8 @@ for ($i = 0 ; $i <= $num_fields; $i++) {
} // end if ($action ==...) } // end if ($action ==...)
// garvin: comments // garvin: comments
if ($cfgRelation['commwork'] || PMA_MYSQL_INT_VERSION >= 40100) { $content_cells[$i][$ci] = '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '" type="text" name="field_comments[]" size="12" value="' . (isset($row) && isset($row['Field']) && is_array($comments_map) && isset($comments_map[$row['Field']]) ? htmlspecialchars($comments_map[$row['Field']]) : '') . '" class="textfield" />';
$content_cells[$i][$ci] = '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '" type="text" name="field_comments[]" size="12" value="' . (isset($row) && isset($row['Field']) && is_array($comments_map) && isset($comments_map[$row['Field']]) ? htmlspecialchars($comments_map[$row['Field']]) : '') . '" class="textfield" />'; $ci++;
$ci++;
}
// garvin: MIME-types // garvin: MIME-types
if ($cfgRelation['mimework'] && $cfg['BrowseMIME'] && $cfgRelation['commwork']) { if ($cfgRelation['mimework'] && $cfg['BrowseMIME'] && $cfgRelation['commwork']) {
@@ -656,12 +632,8 @@ if ($action == 'tbl_create.php') {
<td width="25">&nbsp;</td> <td width="25">&nbsp;</td>
<th><?php echo $strStorageEngine; ?>:&nbsp;<?php echo PMA_showMySQLDocu('Storage_engines', 'Storage_engines'); ?> <th><?php echo $strStorageEngine; ?>:&nbsp;<?php echo PMA_showMySQLDocu('Storage_engines', 'Storage_engines'); ?>
</th> </th>
<?php <td width="25">&nbsp;</td>
if (PMA_MYSQL_INT_VERSION >= 40100) { <th><?php echo $strCollation ;?>:&nbsp;</th>
echo ' <td width="25">&nbsp;</td>' . "\n"
. ' <th>' . $strCollation . ':&nbsp;</th>' . "\n";
}
?>
</tr> </tr>
<tr><td><input type="text" name="comment" size="40" maxlength="80" <tr><td><input type="text" name="comment" size="40" maxlength="80"
value="<?php echo (isset($comment) ? $comment : ''); ?>" value="<?php echo (isset($comment) ? $comment : ''); ?>"
@@ -669,16 +641,18 @@ if ($action == 'tbl_create.php') {
</td> </td>
<td width="25">&nbsp;</td> <td width="25">&nbsp;</td>
<td> <td>
<?php echo PMA_StorageEngine::getHtmlSelect('tbl_type', null, (isset($GLOBALS['tbl_type']) ? $GLOBALS['tbl_type'] : null)); ?> <?php
</td> echo PMA_StorageEngine::getHtmlSelect('tbl_type', null,
<?php (isset($GLOBALS['tbl_type']) ? $GLOBALS['tbl_type'] : null));
if (PMA_MYSQL_INT_VERSION >= 40100) {
echo ' <td width="25">&nbsp;</td>' . "\n"
. ' <td>' . "\n"
. PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'tbl_collation', null, (isset($tbl_collation) ? $tbl_collation : null), FALSE, 3)
. ' </td>' . "\n";
}
?> ?>
</td>
<td width="25">&nbsp;</td>
<td>
<?php
echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'tbl_collation',
null, (isset($tbl_collation) ? $tbl_collation : null), FALSE, 3);
?>
</td>
</tr> </tr>
</table> </table>
<br /> <br />