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

bug #1320470, timestamp is not shown as being NULL under MySQL < 4.1.x

Browse Source
This commit is contained in:
Marc Delisle
2005-10-16 18:48:10 +00:00
parent e6d84d6795
commit 72f452205e
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -13,10 +13,9 @@ $Source$
Transformation for SQL pretty printing (RFE #1327648). Transformation for SQL pretty printing (RFE #1327648).
2005-10-16 Marc Delisle <lem9@users.sourceforge.net> 2005-10-16 Marc Delisle <lem9@users.sourceforge.net>
* tbl_create.php: undefined $field_collation under MySQL < 4.1.x * tbl_create.php, tbl_alter.php: undefined $field_collation under MySQL < 4.1.x
* tbl_properties_structure.php, libraries/sqlparser.lib.php: * tbl_properties_structure.php, tbl_alter.php, libraries/sqlparser.lib.php:
bug #1320470, timestamp is not shown as being NULL under MySQL < 4.1.x bug #1320470, timestamp is not shown as being NULL under MySQL < 4.1.x
(I still have to fix this bug in tbl_alter.php)
2005-10-14 Marc Delisle <lem9@users.sourceforge.net> 2005-10-14 Marc Delisle <lem9@users.sourceforge.net>
* libraries/dbi/mysqli.dbi.lib.php: problem under MySQL 4.0.x * libraries/dbi/mysqli.dbi.lib.php: problem under MySQL 4.0.x

9
tbl_alter.php
View File

@@ -57,7 +57,7 @@ if (isset($do_save_data)) {
$query .= ', CHANGE '; $query .= ', CHANGE ';
} }
$query .= PMA_generateAlterTable($field_orig[$i], $field_name[$i], $field_type[$i], $field_length[$i], $field_attribute[$i], $field_collation[$i], $field_null[$i], $field_default[$i], isset($field_default_current_timestamp[$i]), $field_extra[$i], (isset($field_comments[$i]) ? $field_comments[$i] : ''), $field_default_orig[$i]); $query .= PMA_generateAlterTable($field_orig[$i], $field_name[$i], $field_type[$i], $field_length[$i], $field_attribute[$i], isset($field_collation[$i]) ? $field_collation[$i] : '', $field_null[$i], $field_default[$i], isset($field_default_current_timestamp[$i]), $field_extra[$i], (isset($field_comments[$i]) ? $field_comments[$i] : ''), $field_default_orig[$i]);
} // end for } // end for
// To allow replication, we first select the db to use and then run queries // To allow replication, we first select the db to use and then run queries
@@ -184,7 +184,12 @@ if ($abort == FALSE) {
// TODO: put this code into a require() // TODO: put this code into a require()
// or maybe make it part of PMA_DBI_get_fields(); // or maybe make it part of PMA_DBI_get_fields();
if (PMA_MYSQL_INT_VERSION >= 40102) { // We also need this to correctly learn if a TIMESTAMP is NOT NULL, since
// SHOW FULL FIELDS says NULL and SHOW CREATE TABLE says NOT NULL (tested
// in MySQL 4.0.25). I was able to find that SHOW CREATE TABLE existed
// at least in MySQL 3.23.51.
if (PMA_MYSQL_INT_VERSION >= 32351) {
$show_create_table_query = 'SHOW CREATE TABLE ' $show_create_table_query = 'SHOW CREATE TABLE '
. PMA_backquote($db) . '.' . PMA_backquote($table); . PMA_backquote($db) . '.' . PMA_backquote($table);
$show_create_table_res = PMA_DBI_query($show_create_table_query); $show_create_table_res = PMA_DBI_query($show_create_table_query);

1
tbl_properties_structure.php
View File

@@ -90,7 +90,6 @@ $fields_cnt = PMA_DBI_num_rows($fields_rs);
// in MySQL 4.0.25). I was able to find that SHOW CREATE TABLE existed // in MySQL 4.0.25). I was able to find that SHOW CREATE TABLE existed
// at least in MySQL 3.23.51. // at least in MySQL 3.23.51.
//if (PMA_MYSQL_INT_VERSION >= 40102) {
if (PMA_MYSQL_INT_VERSION >= 32351) { if (PMA_MYSQL_INT_VERSION >= 32351) {
$show_create_table = PMA_DBI_fetch_value( $show_create_table = PMA_DBI_fetch_value(
'SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), 'SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table),