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

SET and ENUM fields may have a character set, too.

Browse Source
This commit is contained in:
Alexander M. Turek
2003-06-08 17:12:40 +00:00
parent 8c525a6732
commit ba9faea1f3
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $Source$
2003-06-08 Alexander M. Turek <rabus@users.sourceforge.net> 2003-06-08 Alexander M. Turek <rabus@users.sourceforge.net>
* server_privileges.php3: MySQL 4.1 users could not edit column privileges. * server_privileges.php3: MySQL 4.1 users could not edit column privileges.
* tbl_properties.inc.php3, tbl_properties_structure.inc.php3:
SET and ENUM fields may have a character set, too.
2003-06-07 Alexander M. Turek <rabus@users.sourceforge.net> 2003-06-07 Alexander M. Turek <rabus@users.sourceforge.net>
* libraries/common.lib.php3: Incremented required config.inc.php3 revision * libraries/common.lib.php3: Incremented required config.inc.php3 revision

2
tbl_properties.inc.php3
View File

@@ -274,6 +274,8 @@ for ($i = 0 ; $i < $num_fields; $i++) {
|| strtolower(substr($type, 0, 8)) == 'tinytext' || strtolower(substr($type, 0, 8)) == 'tinytext'
|| strtolower(substr($type, 0, 10)) == 'mediumtext' || strtolower(substr($type, 0, 10)) == 'mediumtext'
|| strtolower(substr($type, 0, 8)) == 'longtext' || strtolower(substr($type, 0, 8)) == 'longtext'
|| strtolower(substr($type, 0, 3)) == 'set'
|| strtolower(substr($type, 0, 4)) == 'enum'
) && !$binary) { ) && !$binary) {
$real_charset = strpos($row['Collation'], '_') ? substr($row['Collation'], 0, strpos($row['Collation'], '_')) : $row['Collation']; $real_charset = strpos($row['Collation'], '_') ? substr($row['Collation'], 0, strpos($row['Collation'], '_')) : $row['Collation'];
} else { } else {

4
tbl_properties_structure.php3
View File

@@ -148,6 +148,8 @@ while ($row = PMA_mysql_fetch_array($fields_rs)) {
|| substr($type, 0, 8) == 'tinytext' || substr($type, 0, 8) == 'tinytext'
|| substr($type, 0, 10) == 'mediumtext' || substr($type, 0, 10) == 'mediumtext'
|| substr($type, 0, 8) == 'longtext' || substr($type, 0, 8) == 'longtext'
|| strtolower(substr($type, 0, 3)) == 'set'
|| strtolower(substr($type, 0, 4)) == 'enum'
) && !$binary) { ) && !$binary) {
if (strpos($type, ' character set ')) { if (strpos($type, ' character set ')) {
$type = substr($type, 0, strpos($type, ' character set ')); $type = substr($type, 0, strpos($type, ' character set '));
@@ -700,4 +702,4 @@ require('./tbl_query_box.php3');
*/ */
echo "\n"; echo "\n";
require('./footer.inc.php3'); require('./footer.inc.php3');
?> ?>