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

Fixed a bug when a column had the same name as the table, the table would not be created on the target.

Browse Source 
And added a FIXME tag for another bug
This commit is contained in:
Herman van Rink
2009-09-24 13:18:47 +00:00
parent 3af3745260
commit 6268d5c52b
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/server_synchronize.lib.php
View File

@@ -1,4 +1,5 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* PMA_getMatchingTables places matching tables in source
@@ -648,9 +649,14 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm
$Show_create_query = "SHOW CREATE TABLE ".PMA_backquote($src_db). '.' .PMA_backquote($uncommon_tables[$table_index]);
$Show_create_result = PMA_DBI_fetch_result($Show_create_query, null, null, $src_link);
$Create_Query = $Show_create_result[0]['Create Table'];
$split_result = split(PMA_backquote($uncommon_tables[$table_index]), $Create_Query);
$Create_Table_Query = $split_result[0]. PMA_backquote($trg_db). '.' .PMA_backquote($uncommon_tables[$table_index]). $split_result[1];
// Replace the src table name with a `dbname`.`tablename`
$Create_Table_Query = preg_replace('/' . PMA_backquote($uncommon_tables[$table_index]) . '/',
PMA_backquote($trg_db). '.' .PMA_backquote($uncommon_tables[$table_index]),
$Create_Query,
$limit = 1
);
$is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $src_db ."'
AND TABLE_NAME = '" .$uncommon_tables[$table_index]. "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;" ;
@@ -686,6 +692,8 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm
* @param $table_index index of table in matching_table_array
* @param $uncommon_tables_fields field names of the uncommon table
* @param $display true/false value
*
* FIXME: This turns NULL values into '' (empty string)
*/
function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display)
{