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

Fix eporting without backquotes (bug #737023).

Browse Source
This commit is contained in:
Michal Čihař
2003-05-13 13:27:17 +00:00
parent e13ff90da1
commit 57e72b0541
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -34,6 +34,8 @@ $Source$
* tbl_replace.php3: Display message after updating row. * tbl_replace.php3: Display message after updating row.
* libraries/common.lib.php3: Fix tab attributes when some specified as * libraries/common.lib.php3: Fix tab attributes when some specified as
parameters. parameters.
* libraries/build_dump.lib.php3: Fix eporting without backquotes (bug
#737023).
2003-05-12 Garvin Hicking <me@supergarv.de> 2003-05-12 Garvin Hicking <me@supergarv.de>
* queryframe.php3: Remove left/bottom margin to better fit the link title * queryframe.php3: Remove left/bottom margin to better fit the link title

8
libraries/build_dump.lib.php3
View File

@@ -26,11 +26,11 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
* This function exists because mysql_field_type() returns 'blob' * This function exists because mysql_field_type() returns 'blob'
* even for 'text' fields. * even for 'text' fields.
*/ */
function PMA_fieldTypes($db, $table) { function PMA_fieldTypes($db, $table,$use_backquotes) {
PMA_mysql_select_db($db); PMA_mysql_select_db($db);
$table_def = PMA_mysql_query('SHOW FIELDS FROM ' . PMA_backquote($table)); $table_def = PMA_mysql_query('SHOW FIELDS FROM ' . PMA_backquote($table));
while($row = @PMA_mysql_fetch_array($table_def)) { while($row = @PMA_mysql_fetch_array($table_def)) {
$types[PMA_backquote($row['Field'])] = ereg_replace('\\(.*', '', $row['Type']); $types[PMA_backquote($row['Field'],$use_backquotes)] = ereg_replace('\\(.*', '', $row['Type']);
} }
return $types; return $types;
} }
@@ -274,7 +274,7 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
// get the real types of the table's fields (in an array) // get the real types of the table's fields (in an array)
// the key of the array is the backquoted field name // the key of the array is the backquoted field name
$field_types = PMA_fieldTypes($db,$table); $field_types = PMA_fieldTypes($db,$table,$use_backquotes);
// Checks whether the field is an integer or not // Checks whether the field is an integer or not
for ($j = 0; $j < $fields_cnt; $j++) { for ($j = 0; $j < $fields_cnt; $j++) {
@@ -452,7 +452,7 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
// get the real types of the table's fields (in an array) // get the real types of the table's fields (in an array)
// the key of the array is the backquoted field name // the key of the array is the backquoted field name
$field_types = PMA_fieldTypes($db,$table); $field_types = PMA_fieldTypes($db,$table,$use_backquotes);
for ($j = 0; $j < $fields_cnt; $j++) { for ($j = 0; $j < $fields_cnt; $j++) {
if (!isset($row[$j])) { if (!isset($row[$j])) {