';
+ echo '
';
-
+
/**
- * Displays the tables containing the source tables names, their difference with the target tables and target tables names
+ * Displays the tables containing the source tables names, their difference with the target tables and target tables names
*/
PMA_syncDisplayHeaderSource($src_db);
$odd_row = false;
@@ -294,10 +295,10 @@ if ((isset($_REQUEST['submit_connect']))) {
$num_of_updates = sizeof($update_array[$i]);
} else {
$num_of_updates = 0;
- }
+ }
} else {
$num_of_updates = 0;
- }
+ }
}
/**
* Calculating the number of insertions for each matching table
@@ -308,13 +309,13 @@ if ((isset($_REQUEST['submit_connect']))) {
$num_of_insertions = sizeof($insert_array[$i]);
} else {
$num_of_insertions = 0;
- }
+ }
} else {
$num_of_insertions = 0;
- }
- }
+ }
+ }
/**
- * Displays the name of the matching table
+ * Displays the name of the matching table
*/
$odd_row = PMA_syncDisplayBeginTableRow($odd_row);
echo '' . htmlspecialchars($matching_tables[$i]) . '
@@ -325,74 +326,74 @@ if ((isset($_REQUEST['submit_connect']))) {
*/
$num_alter_cols = 0;
$num_insert_cols = 0;
- $num_remove_cols = 0;
+ $num_remove_cols = 0;
$num_add_index = 0;
- $num_remove_index = 0;
+ $num_remove_index = 0;
if (isset($alter_str_array[$i])) {
- $num_alter_cols = sizeof($alter_str_array[$i]);
+ $num_alter_cols = sizeof($alter_str_array[$i]);
}
if (isset($add_column_array[$i])) {
$num_insert_cols = sizeof($add_column_array[$i]);
}
if (isset($uncommon_columns[$i])) {
- $num_remove_cols = sizeof($uncommon_columns[$i]);
+ $num_remove_cols = sizeof($uncommon_columns[$i]);
}
if (isset($add_indexes_array[$i])) {
$num_add_index = sizeof($add_indexes_array[$i]);
}
if (isset($remove_indexes_array[$i])) {
- $num_remove_index = sizeof($remove_indexes_array[$i]);
- }
+ $num_remove_index = sizeof($remove_indexes_array[$i]);
+ }
if (isset($alter_indexes_array[$i])) {
$num_add_index += sizeof($alter_indexes_array[$i]);
- $num_remove_index += sizeof($alter_indexes_array[$i]);
- }
+ $num_remove_index += sizeof($alter_indexes_array[$i]);
+ }
/**
- * Display the red button of structure synchronization if there exists any structure difference or index difference.
+ * Display the red button of structure synchronization if there exists any structure difference or index difference.
*/
if (($num_alter_cols > 0) || ($num_insert_cols > 0) || ($num_remove_cols > 0) || ($num_add_index > 0) || ($num_remove_index > 0)) {
-
- echo '![' . $GLOBALS['strClickToSelect'] . '](' . $pmaThemeImage . 'new_struct.jpg)
';
}
/**
- * Display the green button of data synchronization if there exists any data difference.
- */
+ * Display the green button of data synchronization if there exists any data difference.
+ */
if (isset($update_array[$i]) || isset($insert_array[$i])) {
if (isset($update_array[$i][0][$matching_tables_keys[$i][0]]) || isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) {
- echo '![' . $GLOBALS['strClickToSelect'] . '](' . $pmaThemeImage . 'new_data.jpg)
';
- }
+ "','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')" />';
+ }
}
echo '
';
- }
+ }
/**
* Displays the tables' names present in source but missing from target
*/
for ($j = 0; $j < count($source_tables_uncommon); $j++) {
$odd_row = PMA_syncDisplayBeginTableRow($odd_row);
echo ' + ' . htmlspecialchars($source_tables_uncommon[$j]) . ' ';
-
+
echo '![' . $GLOBALS['strClickToSelect'] . '](' . $pmaThemeImage . 'new_struct.jpg)
';
-
+
if ($row_count[$j] > 0)
{
- echo '';
- }
+ }
echo '
';
-
+
/**
* This "list" div will contain a table and each row will depict information about structure/data diffrence in tables.
* Rows will be generated dynamically as soon as the colored buttons "D" or "S" are clicked.
*/
-
- echo '';
if(! $src_connection && $src_type == 'rmt') {
echo $GLOBALS['strCouldNotConnectSource'] . '
'; } @@ -98,7 +99,7 @@ if ((isset($_REQUEST['submit_connect']))) { } echo '
';
unset($_REQUEST['submit_connect']);
-
+
} else {
/**
* Creating the link object for both source and target databases and
@@ -112,77 +113,77 @@ if ((isset($_REQUEST['submit_connect']))) {
}
${"{$con}_db_selected"} = PMA_DBI_select_db(${"{$con}_db"}, ${"{$con}_link"});
} // end foreach ($cons as $con)
-
+
if (($src_db_selected != 1) || ($trg_db_selected != 1)) {
/**
* Displays error string if the database(s) did not exist
*/
- echo ''; } @@ -98,7 +99,7 @@ if ((isset($_REQUEST['submit_connect']))) { } echo '
';
+ echo '
';
unset($_REQUEST['submit_connect']);
-
+
} else if (($src_db_selected == 1) && ($trg_db_selected == 1)) {
/**
- * Using PMA_DBI_get_tables() to get all the tables
- * from target and source databases.
+ * Using PMA_DBI_get_tables() to get all the tables
+ * from target and source databases.
*/
$src_tables = PMA_DBI_get_tables($src_db, $src_link);
$source_tables_num = sizeof($src_tables);
-
+
$trg_tables = PMA_DBI_get_tables($trg_db, $trg_link);
$target_tables_num = sizeof($trg_tables);
-
+
/**
- * initializing arrays to save matching and non-matching
- * table names from target and source databases.
- */
+ * initializing arrays to save matching and non-matching
+ * table names from target and source databases.
+ */
$unmatched_num_src = 0;
$source_tables_uncommon = array();
$unmatched_num_trg = 0;
$target_tables_uncommon = array();
$matching_tables = array();
$matching_tables_num = 0;
-
+
/**
* Using PMA_getMatchingTables to find which of the tables' names match
- * in target and source database.
- */
+ * in target and source database.
+ */
PMA_getMatchingTables($trg_tables, $src_tables, $matching_tables, $source_tables_uncommon);
/**
- * Finding the uncommon tables for the target database
+ * Finding the uncommon tables for the target database
* using function PMA_getNonMatchingTargetTables()
*/
PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, $target_tables_uncommon);
-
+
/**
- * Initializing several arrays to save the data and structure
+ * Initializing several arrays to save the data and structure
* difference between the source and target databases.
*/
$row_count = array(); //number of rows in source table that needs to be created in target database
- $fields_num = array(); //number of fields in each matching table
+ $fields_num = array(); //number of fields in each matching table
$delete_array = array(); //stores the primary key values for target tables that have excessive rows than corresponding source tables.
$insert_array = array(array(array()));// stores the primary key values for the rows in each source table that are not present in target tables.
$update_array = array(array(array())); //stores the primary key values, name of field to be updated, value of the field to be updated for
- // each row of matching table.
- $matching_tables_fields = array(); //contains the fields' names for each matching table
- $matching_tables_keys = array(); //contains the primary keys' names for each matching table
- $uncommon_tables_fields = array(); //coantains the fields for all the source tables that are not present in target
+ // each row of matching table.
+ $matching_tables_fields = array(); //contains the fields' names for each matching table
+ $matching_tables_keys = array(); //contains the primary keys' names for each matching table
+ $uncommon_tables_fields = array(); //coantains the fields for all the source tables that are not present in target
$matching_tables_num = sizeof($matching_tables);
-
+
$source_columns = array(); //contains the full columns' information for all the source tables' columns
$target_columns = array(); //contains the full columns' information for all the target tables' columns
$uncommon_columns = array(); //contains names of columns present in source table but absent from the corresponding target table
$source_indexes = array(); //contains indexes on all the source tables
$target_indexes = array(); //contains indexes on all the target tables
$add_indexes_array = array(); //contains the indexes name present in source but absent from target tables
- $target_tables_keys = array(); //contains the keys of all the target tables
+ $target_tables_keys = array(); //contains the keys of all the target tables
$alter_indexes_array = array(); //contains the names of all the indexes for each table that need to be altered in target database
$remove_indexes_array = array(); //contains the names of indexes that are excessive in target tables
$alter_str_array = array(array()); //contains the criteria for each column that needs to be altered in target tables
@@ -191,49 +192,49 @@ if ((isset($_REQUEST['submit_connect']))) {
* The criteria array contains all the criteria against which columns are compared for differences.
*/
$criteria = array('Field', 'Type', 'Null', 'Collation', 'Key', 'Default', 'Comment');
-
+
for($i = 0; $i < sizeof($matching_tables); $i++) {
/**
- * Finding out all the differences structure, data and index diff for all the matching tables only
+ * Finding out all the differences structure, data and index diff for all the matching tables only
*/
PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $matching_tables_fields, $update_array, $insert_array,
$delete_array, $fields_num, $i, $matching_tables_keys);
-
+
PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns,
- $target_columns, $alter_str_array, $add_column_array, $uncommon_columns, $criteria, $target_tables_keys, $i);
-
+ $target_columns, $alter_str_array, $add_column_array, $uncommon_columns, $criteria, $target_tables_keys, $i);
+
PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_indexes, $target_indexes,
- $add_indexes_array, $alter_indexes_array, $remove_indexes_array, $i);
+ $add_indexes_array, $alter_indexes_array, $remove_indexes_array, $i);
}
-
+
for($j = 0; $j < sizeof($source_tables_uncommon); $j++) {
/**
* Finding out the number of rows to be added in tables that need to be added in target database
*/
PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $j, $row_count);
- }
+ }
/**
- * Storing all arrays in session for use when page is reloaded for each button press
+ * Storing all arrays in session for use when page is reloaded for each button press
*/
- $_SESSION['matching_tables'] = $matching_tables;
+ $_SESSION['matching_tables'] = $matching_tables;
$_SESSION['update_array'] = $update_array;
- $_SESSION['insert_array'] = $insert_array;
- $_SESSION['src_db'] = $src_db;
- $_SESSION['trg_db'] = $trg_db;
- $_SESSION['matching_fields'] = $matching_tables_fields;
- $_SESSION['src_uncommon_tables'] = $source_tables_uncommon;
- $_SESSION['src_username'] = $src_username ;
- $_SESSION['trg_username'] = $trg_username;
- $_SESSION['src_password'] = $src_password;
- $_SESSION['trg_password'] = $trg_password;
+ $_SESSION['insert_array'] = $insert_array;
+ $_SESSION['src_db'] = $src_db;
+ $_SESSION['trg_db'] = $trg_db;
+ $_SESSION['matching_fields'] = $matching_tables_fields;
+ $_SESSION['src_uncommon_tables'] = $source_tables_uncommon;
+ $_SESSION['src_username'] = $src_username ;
+ $_SESSION['trg_username'] = $trg_username;
+ $_SESSION['src_password'] = $src_password;
$_SESSION['trg_password'] = $trg_password;
- $_SESSION['src_server'] = $src_server;
- $_SESSION['trg_server'] = $trg_server;
+ $_SESSION['trg_password'] = $trg_password;
+ $_SESSION['src_server'] = $src_server;
+ $_SESSION['trg_server'] = $trg_server;
$_SESSION['src_type'] = $src_type;
$_SESSION['trg_type'] = $trg_type;
$_SESSION['matching_tables_keys'] = $matching_tables_keys;
$_SESSION['uncommon_tables_fields'] = $uncommon_tables_fields;
- $_SESSION['uncommon_tables_row_count'] = $row_count;
+ $_SESSION['uncommon_tables_row_count'] = $row_count;
$_SESSION['target_tables_uncommon'] = $target_tables_uncommon;
$_SESSION['uncommon_tables'] = $source_tables_uncommon;
$_SESSION['delete_array'] = $delete_array;
@@ -248,8 +249,8 @@ if ((isset($_REQUEST['submit_connect']))) {
$_SESSION['alter_indexes_array'] = $alter_indexes_array;
$_SESSION['remove_indexes_array'] = $remove_indexes_array;
$_SESSION['source_indexes'] = $source_indexes;
- $_SESSION['target_indexes'] = $target_indexes;
-
+ $_SESSION['target_indexes'] = $target_indexes;
+
/**
* Displays the sub-heading and icons showing Structure Synchronization and Data Synchronization
*/
@@ -257,7 +258,7 @@ if ((isset($_REQUEST['submit_connect']))) {
. PMA_generate_common_hidden_inputs('', '');
echo '';
if ($src_db_selected != 1) {
echo sprintf($GLOBALS['strDatabaseNotExisting'], htmlspecialchars($src_db));
}
if ($trg_db_selected != 1) {
echo sprintf($GLOBALS['strDatabaseNotExisting'], htmlspecialchars($trg_db));
}
- echo '
';
+ echo ' '
+ '
. ($GLOBALS['cfg']['MainPageIconic']
? '' .' |
';
}
/**
- * Display the green button of data synchronization if there exists any data difference.
- */
+ * Display the green button of data synchronization if there exists any data difference.
+ */
if (isset($update_array[$i]) || isset($insert_array[$i])) {
if (isset($update_array[$i][0][$matching_tables_keys[$i][0]]) || isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) {
- echo '';
- }
+ "','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')" />';
+ }
}
echo '
';
- }
+ }
/**
* Displays the tables' names present in source but missing from target
*/
for ($j = 0; $j < count($source_tables_uncommon); $j++) {
$odd_row = PMA_syncDisplayBeginTableRow($odd_row);
echo '';
-
+
if ($row_count[$j] > 0)
{
- echo '';
- }
+ }
echo '
-
+
';
/**
- * This fieldset displays the checkbox to confirm deletion of previous rows from target tables
+ * This fieldset displays the checkbox to confirm deletion of previous rows from target tables
*/
echo '
+
';
- echo '';
- }
+ echo '';
+ }
}
} // end if ((isset($_REQUEST['submit_connect'])))
-
+
/**
- * Display the page when 'Apply Selected Changes' is pressed
+ * Display the page when 'Apply Selected Changes' is pressed
*/
if (isset($_REQUEST['Table_ids'])) {
/**
* Displays success message
*/
echo '| ' . $strDataDiff . ' | |||||||
|---|---|---|---|---|---|---|---|
| ' . $strTableName . ' | +' . $strTableName . ' | ' . $strCreateTable . ' | ' . $strTableAddColumn . ' | ' . $strTableRemoveColumn . ' | @@ -446,57 +447,57 @@ if ((isset($_REQUEST['submit_connect']))) {' . $strTableApplyIndex . ' | '. $strTableUpdateRow . ' | ' . $strTableInsertRow . ' | -
' . $GLOBALS['strHaveBeenSynchronized'] . '
';
-
- $src_db = $_SESSION['src_db'];
+
+ $src_db = $_SESSION['src_db'];
$trg_db = $_SESSION['trg_db'];
- $update_array = $_SESSION['update_array'];
- $insert_array = $_SESSION['insert_array'];
- $src_username = $_SESSION['src_username'];
- $trg_username = $_SESSION['trg_username'];
- $src_password = $_SESSION['src_password'];
+ $update_array = $_SESSION['update_array'];
+ $insert_array = $_SESSION['insert_array'];
+ $src_username = $_SESSION['src_username'];
+ $trg_username = $_SESSION['trg_username'];
+ $src_password = $_SESSION['src_password'];
$trg_password = $_SESSION['trg_password'];
$src_server = $_SESSION['src_server'];
$trg_server = $_SESSION['trg_server'];
$src_type = $_SESSION['src_type'];
$trg_type = $_SESSION['trg_type'];
- $uncommon_tables = $_SESSION['uncommon_tables'];
- $matching_tables = $_SESSION['matching_tables'];
+ $uncommon_tables = $_SESSION['uncommon_tables'];
+ $matching_tables = $_SESSION['matching_tables'];
$matching_tables_keys = $_SESSION['matching_tables_keys'];
- $matching_tables_fields = $_SESSION['matching_fields'];
- $source_tables_uncommon = $_SESSION['src_uncommon_tables'];
+ $matching_tables_fields = $_SESSION['matching_fields'];
+ $source_tables_uncommon = $_SESSION['src_uncommon_tables'];
$uncommon_tables_fields = $_SESSION['uncommon_tables_fields'];
$target_tables_uncommon = $_SESSION['target_tables_uncommon'];
$row_count = $_SESSION['uncommon_tables_row_count'];
$target_tables = $_SESSION['target_tables'];
-
+
$delete_array = $_SESSION['delete_array'];
$uncommon_columns = $_SESSION['uncommon_columns'];
$source_columns = $_SESSION['source_columns'];
@@ -508,9 +509,9 @@ if (isset($_REQUEST['Table_ids'])) {
$alter_indexes_array = $_SESSION['alter_indexes_array'];
$remove_indexes_array = $_SESSION['remove_indexes_array'];
$source_indexes = $_SESSION['source_indexes'];
- $target_indexes = $_SESSION['target_indexes'];
+ $target_indexes = $_SESSION['target_indexes'];
$uncommon_cols = $uncommon_columns;
-
+
/**
* Creating link object for source and target databases
*/
@@ -524,17 +525,17 @@ if (isset($_REQUEST['Table_ids'])) {
$GLOBALS['db'] = ${"{$con}_db"};
}
} // end foreach ($cons as $con)
-
+
/**
- * Initializing arrays to save the table ids whose data and structure difference is to be applied
+ * Initializing arrays to save the table ids whose data and structure difference is to be applied
*/
$matching_table_data_diff = array(); //stores id of matching table having data difference
$matching_table_structure_diff = array(); //stores id of matching tables having structure difference
$uncommon_table_structure_diff = array(); //stores id of uncommon tables having structure difference
$uncommon_table_data_diff = array(); //stores id of uncommon tables having data difference
-
+
for ($i = 0; isset($_REQUEST[$i]); $i++ ) {
- if (isset($_REQUEST[$i])) {
+ if (isset($_REQUEST[$i])) {
$table_id = split("US", $_REQUEST[$i]);
if (isset($table_id[1])) {
$uncommon_table_structure_diff[] = $table_id[1];
@@ -547,7 +548,7 @@ if (isset($_REQUEST['Table_ids'])) {
if (isset($table_id[1])) {
$matching_table_structure_diff[] = $table_id[1];
}
-
+
$table_id = split("MD", $_REQUEST[$i]);
if (isset($table_id[1])) {
$matching_table_data_diff[] = $table_id[1];
@@ -560,99 +561,99 @@ if (isset($_REQUEST['Table_ids'])) {
for($q = 0; $q < sizeof($matching_table_structure_diff); $q++)
{
if (isset($alter_str_array[$matching_table_structure_diff[$q]])) {
-
+
PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields,
$criteria, $matching_tables_keys, $target_tables_keys, $matching_table_structure_diff[$q], false);
-
- unset($alter_str_array[$matching_table_structure_diff[$q]]);
- }
+
+ unset($alter_str_array[$matching_table_structure_diff[$q]]);
+ }
if (isset($add_column_array[$matching_table_structure_diff[$q]])) {
-
- PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $matching_table_structure_diff[$q], $target_tables_keys,
+
+ PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $matching_table_structure_diff[$q], $target_tables_keys,
$matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link);
-
+
if (isset($delete_array[$matching_table_structure_diff[$q]])) {
-
+
PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $matching_table_structure_diff[$q], $target_tables_keys, $delete_array, false);
-
- unset($delete_array[$matching_table_structure_diff[$q]]);
- }
+
+ unset($delete_array[$matching_table_structure_diff[$q]]);
+ }
PMA_addColumnsInTargetTable($src_db, $trg_db,$src_link, $trg_link, $matching_tables, $source_columns, $add_column_array, $matching_tables_fields,
$criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables,$uncommon_tables_fields, $matching_table_structure_diff[$q], $uncommon_cols, false);
-
+
unset($add_column_array[$matching_table_structure_diff[$q]]);
}
if (isset($uncommon_columns[$matching_table_structure_diff[$q]])) {
-
+
PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $matching_table_structure_diff[$q], false);
-
- unset($uncommon_columns[$matching_table_structure_diff[$q]]);
+
+ unset($uncommon_columns[$matching_table_structure_diff[$q]]);
}
- if (isset($add_indexes_array[$matching_table_structure_diff[$q]]) || isset($remove_indexes_array[$matching_table_structure_diff[$q]])
+ if (isset($add_indexes_array[$matching_table_structure_diff[$q]]) || isset($remove_indexes_array[$matching_table_structure_diff[$q]])
|| isset($alter_indexes_array[$matching_table_structure_diff[$q]])) {
-
- PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array,
- $remove_indexes_array, $matching_table_structure_diff[$q], false);
-
+
+ PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array,
+ $remove_indexes_array, $matching_table_structure_diff[$q], false);
+
unset($add_indexes_array[$matching_table_structure_diff[$q]]);
unset($alter_indexes_array[$matching_table_structure_diff[$q]]);
unset($remove_indexes_array[$matching_table_structure_diff[$q]]);
- }
+ }
}
/**
- * Applying the data difference. First checks if structure diff is applied or not.
+ * Applying the data difference. First checks if structure diff is applied or not.
* If not, then apply structure difference first then apply data difference.
*/
for($p = 0; $p < sizeof($matching_table_data_diff); $p++)
- {
+ {
if ($_REQUEST['checked'] == 'true') {
-
- PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $matching_table_data_diff[$p], $target_tables_keys,
+
+ PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $matching_table_data_diff[$p], $target_tables_keys,
$matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link);
-
+
if (isset($delete_array[$matching_table_data_diff[$p]])) {
-
+
PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $matching_table_data_diff[$p], $target_tables_keys, $delete_array, false);
-
- unset($delete_array[$matching_table_data_diff[$p]]);
- }
- }
+
+ unset($delete_array[$matching_table_data_diff[$p]]);
+ }
+ }
if (isset($alter_str_array[$matching_table_data_diff[$p]])) {
-
+
PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields,
$criteria, $matching_tables_keys, $target_tables_keys, $matching_table_data_diff[$p], false);
-
- unset($alter_str_array[$matching_table_data_diff[$p]]);
+
+ unset($alter_str_array[$matching_table_data_diff[$p]]);
}
if (isset($add_column_array[$matching_table_data_diff[$p]])) {
-
- PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $matching_table_data_diff[$p], $target_tables_keys,
+
+ PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $matching_table_data_diff[$p], $target_tables_keys,
$matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link);
-
+
if (isset($delete_array[$matching_table_data_diff[$p]])) {
-
+
PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $matching_table_data_diff[$p], $target_tables_keys, $delete_array, false);
-
- unset($delete_array[$matching_table_data_diff[$p]]);
- }
+
+ unset($delete_array[$matching_table_data_diff[$p]]);
+ }
PMA_addColumnsInTargetTable($src_db, $trg_db,$src_link, $trg_link, $matching_tables, $source_columns, $add_column_array, $matching_tables_fields,
$criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables, $uncommon_tables_fields, $matching_table_data_diff[$p], $uncommon_cols, false);
-
+
unset($add_column_array[$matching_table_data_diff[$p]]);
}
if (isset($uncommon_columns[$matching_table_data_diff[$p]])) {
-
+
PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $matching_table_data_diff[$p], false);
-
- unset($uncommon_columns[$matching_table_data_diff[$p]]);
- }
- if ((isset($matching_table_structure_diff[$q]) && isset($add_indexes_array[$matching_table_structure_diff[$q]]))
- || (isset($matching_table_structure_diff[$q]) && isset($remove_indexes_array[$matching_table_structure_diff[$q]]))
+
+ unset($uncommon_columns[$matching_table_data_diff[$p]]);
+ }
+ if ((isset($matching_table_structure_diff[$q]) && isset($add_indexes_array[$matching_table_structure_diff[$q]]))
+ || (isset($matching_table_structure_diff[$q]) && isset($remove_indexes_array[$matching_table_structure_diff[$q]]))
|| (isset($matching_table_structure_diff[$q]) && isset($alter_indexes_array[$matching_table_structure_diff[$q]]))) {
-
- PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array,
- $remove_indexes_array, $matching_table_structure_diff[$q], false);
-
+
+ PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array,
+ $remove_indexes_array, $matching_table_structure_diff[$q], false);
+
unset($add_indexes_array[$matching_table_structure_diff[$q]]);
unset($alter_indexes_array[$matching_table_structure_diff[$q]]);
unset($remove_indexes_array[$matching_table_structure_diff[$q]]);
@@ -661,11 +662,11 @@ if (isset($_REQUEST['Table_ids'])) {
* Applying the data difference.
*/
PMA_updateTargetTables($matching_tables, $update_array, $src_db, $trg_db, $trg_link, $matching_table_data_diff[$p], $matching_tables_keys, false);
-
+
PMA_insertIntoTargetTable($matching_tables, $src_db, $trg_db, $src_link, $trg_link , $matching_tables_fields, $insert_array,
$matching_table_data_diff[$p], $matching_tables_keys, $source_columns, $add_column_array, $criteria, $target_tables_keys,
- $uncommon_tables, $uncommon_tables_fields, $uncommon_cols, $alter_str_array, $source_indexes, $target_indexes, $add_indexes_array,
- $alter_indexes_array, $delete_array, $update_array, false);
+ $uncommon_tables, $uncommon_tables_fields, $uncommon_cols, $alter_str_array, $source_indexes, $target_indexes, $add_indexes_array,
+ $alter_indexes_array, $delete_array, $update_array, false);
}
/**
* Updating the session variables to the latest values of the arrays.
@@ -676,84 +677,84 @@ if (isset($_REQUEST['Table_ids'])) {
$_SESSION['add_column_array'] = $add_column_array;
$_SESSION['add_indexes_array'] = $add_indexes_array;
$_SESSION['remove_indexes_array'] = $remove_indexes_array;
- $_SESSION['insert_array'] = $insert_array;
+ $_SESSION['insert_array'] = $insert_array;
$_SESSION['update_array'] = $update_array;
-
+
/**
- * Applying structure difference to selected non-matching tables (present in Source but absent from Target).
- */
+ * Applying structure difference to selected non-matching tables (present in Source but absent from Target).
+ */
for($s = 0; $s < sizeof($uncommon_table_structure_diff); $s++)
- {
+ {
PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $uncommon_table_structure_diff[$s], $uncommon_tables_fields, false);
$_SESSION['uncommon_tables_fields'] = $uncommon_tables_fields;
-
+
unset($uncommon_tables[$uncommon_table_structure_diff[$s]]);
}
/**
- * Applying data difference to selected non-matching tables (present in Source but absent from Target).
- * Before data synchronization, structure synchronization is confirmed.
+ * Applying data difference to selected non-matching tables (present in Source but absent from Target).
+ * Before data synchronization, structure synchronization is confirmed.
*/
for($r = 0; $r < sizeof($uncommon_table_data_diff); $r++)
- {
+ {
if (!(in_array($uncommon_table_data_diff[$r], $uncommon_table_structure_diff))) {
if (isset($uncommon_tables[$uncommon_table_data_diff[$r]])) {
-
+
PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $uncommon_table_data_diff[$r],
$uncommon_tables_fields, false);
$_SESSION['uncommon_tables_fields'] = $uncommon_tables_fields;
-
- unset($uncommon_tables[$uncommon_table_data_diff[$r]]);
+
+ unset($uncommon_tables[$uncommon_table_data_diff[$r]]);
}
- }
- PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $uncommon_table_data_diff[$r],
+ }
+ PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $uncommon_table_data_diff[$r],
$_SESSION['uncommon_tables_fields'], false);
-
- unset($row_count[$uncommon_table_data_diff[$r]]);
+
+ unset($row_count[$uncommon_table_data_diff[$r]]);
}
/**
- * Again all the tables from source and target database are displayed with their differences.
+ * Again all the tables from source and target database are displayed with their differences.
* The differences have been removed from tables that have been synchronized
*/
echo '';
+ echo '';
}
/**
@@ -915,25 +916,25 @@ if (isset($_REQUEST['Table_ids'])) {
*/
if (isset($_REQUEST['synchronize_db'])) {
-
- $src_db = $_SESSION['src_db'];
+
+ $src_db = $_SESSION['src_db'];
$trg_db = $_SESSION['trg_db'];
- $update_array = $_SESSION['update_array'];
- $insert_array = $_SESSION['insert_array'];
- $src_username = $_SESSION['src_username'];
- $trg_username = $_SESSION['trg_username'];
- $src_password = $_SESSION['src_password'];
+ $update_array = $_SESSION['update_array'];
+ $insert_array = $_SESSION['insert_array'];
+ $src_username = $_SESSION['src_username'];
+ $trg_username = $_SESSION['trg_username'];
+ $src_password = $_SESSION['src_password'];
$trg_password = $_SESSION['trg_password'];
- $matching_tables = $_SESSION['matching_tables'];
+ $matching_tables = $_SESSION['matching_tables'];
$matching_tables_keys = $_SESSION['matching_tables_keys'];
- $matching_tables_fields = $_SESSION['matching_fields'];
- $source_tables_uncommon = $_SESSION['src_uncommon_tables'];
+ $matching_tables_fields = $_SESSION['matching_fields'];
+ $source_tables_uncommon = $_SESSION['src_uncommon_tables'];
$uncommon_tables_fields = $_SESSION['uncommon_tables_fields'];
$target_tables_uncommon = $_SESSION['target_tables_uncommon'];
$row_count = $_SESSION['uncommon_tables_row_count'];
- $uncommon_tables = $_SESSION['uncommon_tables'];
+ $uncommon_tables = $_SESSION['uncommon_tables'];
$target_tables = $_SESSION['target_tables'];
-
+
$delete_array = $_SESSION['delete_array'];
$uncommon_columns = $_SESSION['uncommon_columns'];
$source_columns = $_SESSION['source_columns'];
@@ -945,9 +946,9 @@ if (isset($_REQUEST['synchronize_db'])) {
$alter_indexes_array = $_SESSION['alter_indexes_array'];
$remove_indexes_array = $_SESSION['remove_indexes_array'];
$source_indexes = $_SESSION['source_indexes'];
- $target_indexes = $_SESSION['target_indexes'];
+ $target_indexes = $_SESSION['target_indexes'];
$uncommon_cols = $uncommon_columns;
-
+
/**
* Display success message.
*/
@@ -989,7 +990,7 @@ if (isset($_REQUEST['synchronize_db'])) {
echo '';
}
echo ' ';
-
+
/**
* connecting the source and target servers
*/
@@ -1008,84 +1009,84 @@ if (isset($_REQUEST['synchronize_db'])) {
// working on current server, so initialize this for tracking
$GLOBALS['db'] = $_SESSION['trg_db'];
}
-
+
/**
* Displaying the queries.
*/
- echo '' . $GLOBALS['strQueriesExecuted'] . '
'; - echo ' ';
+ echo '
";
}
/**
@@ -1093,8 +1094,8 @@ if (isset($_REQUEST['synchronize_db'])) {
*/
if (! isset($_REQUEST['submit_connect']) && ! isset($_REQUEST['synchronize_db']) && ! isset($_REQUEST['Table_ids']) )
-{
-/**
+{
+/**
* Displays the sub-page heading
*/
echo '' . $GLOBALS['strQueriesExecuted'] . '
'; + echo ' ';
/**
- * Applying all sorts of differences for each matching table
+ * Applying all sorts of differences for each matching table
*/
- for($p = 0; $p < sizeof($matching_tables); $p++) {
+ for($p = 0; $p < sizeof($matching_tables); $p++) {
/**
- * If the check box is checked for deleting previous rows from the target database tables then
+ * If the check box is checked for deleting previous rows from the target database tables then
* first find out rows to be deleted and then delete the rows.
*/
if (isset($_REQUEST['delete_rows'])) {
PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $p, $target_tables_keys, $matching_tables_keys,
$trg_db, $trg_link, $src_db, $src_link);
-
+
if (isset($delete_array[$p])) {
- PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $p, $target_tables_keys, $delete_array, true);
- unset($delete_array[$p]);
- }
+ PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $p, $target_tables_keys, $delete_array, true);
+ unset($delete_array[$p]);
+ }
}
if (isset($alter_str_array[$p])) {
PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields,
$criteria, $matching_tables_keys, $target_tables_keys, $p, true);
- unset($alter_str_array[$p]);
- }
+ unset($alter_str_array[$p]);
+ }
if (isset($add_column_array[$p])) {
PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $p, $target_tables_keys, $matching_tables_keys,
$trg_db, $trg_link, $src_db, $src_link);
-
+
if (isset($delete_array[$p])) {
PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $p, $target_tables_keys, $delete_array, true);
- unset($delete_array[$p]);
- }
+ unset($delete_array[$p]);
+ }
PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, $add_column_array,
- $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables, $uncommon_tables_fields,
+ $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables, $uncommon_tables_fields,
$p, $uncommon_cols, true);
unset($add_column_array[$p]);
}
if (isset($uncommon_columns[$p])) {
PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $p, true);
- unset($uncommon_columns[$p]);
- }
- if (isset($matching_table_structure_diff) &&
- (isset($add_indexes_array[$matching_table_structure_diff[$p]])
- || isset($remove_indexes_array[$matching_table_structure_diff[$p]])
+ unset($uncommon_columns[$p]);
+ }
+ if (isset($matching_table_structure_diff) &&
+ (isset($add_indexes_array[$matching_table_structure_diff[$p]])
+ || isset($remove_indexes_array[$matching_table_structure_diff[$p]])
|| isset($alter_indexes_array[$matching_table_structure_diff[$p]]))) {
- PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array,
- $remove_indexes_array, $matching_table_structure_diff[$p], true);
-
+ PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array,
+ $remove_indexes_array, $matching_table_structure_diff[$p], true);
+
unset($add_indexes_array[$matching_table_structure_diff[$p]]);
unset($alter_indexes_array[$matching_table_structure_diff[$p]]);
unset($remove_indexes_array[$matching_table_structure_diff[$p]]);
- }
-
+ }
+
PMA_updateTargetTables($matching_tables, $update_array, $src_db, $trg_db, $trg_link, $p, $matching_tables_keys, true);
-
- PMA_insertIntoTargetTable($matching_tables, $src_db, $trg_db, $src_link, $trg_link , $matching_tables_fields, $insert_array, $p,
- $matching_tables_keys, $matching_tables_keys, $source_columns, $add_column_array, $criteria, $target_tables_keys, $uncommon_tables,
- $uncommon_tables_fields,$uncommon_cols, $alter_str_array,$source_indexes, $target_indexes, $add_indexes_array,
- $alter_indexes_array, $delete_array, $update_array, true);
- }
-
+
+ PMA_insertIntoTargetTable($matching_tables, $src_db, $trg_db, $src_link, $trg_link , $matching_tables_fields, $insert_array, $p,
+ $matching_tables_keys, $matching_tables_keys, $source_columns, $add_column_array, $criteria, $target_tables_keys, $uncommon_tables,
+ $uncommon_tables_fields,$uncommon_cols, $alter_str_array,$source_indexes, $target_indexes, $add_indexes_array,
+ $alter_indexes_array, $delete_array, $update_array, true);
+ }
+
/**
- * Creating and populating tables present in source but absent from target database.
- */
- for($q = 0; $q < sizeof($source_tables_uncommon); $q++) {
+ * Creating and populating tables present in source but absent from target database.
+ */
+ for($q = 0; $q < sizeof($source_tables_uncommon); $q++) {
if (isset($uncommon_tables[$q])) {
PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, true);
}
if (isset($row_count[$q])) {
- PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, true);
+ PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, true);
}
}
- echo "
";
+ echo "' . ($GLOBALS['cfg']['MainPageIconic'] @@ -1103,20 +1104,20 @@ if (isset($_REQUEST['synchronize_db'])) { : '') . $strSynchronize .'
'; - - echo '
+
+ echo '
' . $strSynchronizationNote . '
';
-}
+}
/**
* Displays the footer
diff --git a/setup/index.php b/setup/index.php
index 1d5f2cb03..0c7288a25 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -36,6 +36,7 @@ require './libraries/header_http.inc.php';
+
diff --git a/sql.php b/sql.php
index 248ebe3ad..4b38943b3 100644
--- a/sql.php
+++ b/sql.php
@@ -16,6 +16,7 @@ require_once './libraries/check_user_privileges.lib.php';
require_once './libraries/bookmark.lib.php';
$GLOBALS['js_include'][] = 'mootools.js';
+$GLOBALS['js_include'][] = 'mootools-more.js';
/**
* Defines the url to return to in case of error in a sql statement
diff --git a/tbl_import.php b/tbl_import.php
index 784cfde73..bfdecd9c7 100644
--- a/tbl_import.php
+++ b/tbl_import.php
@@ -14,7 +14,8 @@ require_once './libraries/common.inc.php';
/**
* Load mootools for upload progress bar
*/
-$GLOBALS['js_include'][] = 'mootools.js';
+$GLOBALS['js_include'][] = 'mootools.js';
+$GLOBALS['js_include'][] = 'mootools-more.js';
/**
* Gets tables informations and displays top links
diff --git a/tbl_replace.php b/tbl_replace.php
index a7da0bc56..278fdc56b 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -415,6 +415,7 @@ $GLOBALS['js_include'][] = 'tbl_change.js';
$GLOBALS['js_include'][] = 'functions.js';
// in case we call sql.php which needs those:
$GLOBALS['js_include'][] = 'mootools.js';
+$GLOBALS['js_include'][] = 'mootools-more.js';
$active_page = $goto_include;
diff --git a/tbl_select.php b/tbl_select.php
index 4a8d88fa2..f37d1a7e7 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -20,6 +20,7 @@ require_once './libraries/mysql_charsets.lib.php';
$GLOBALS['js_include'][] = 'tbl_change.js';
$GLOBALS['js_include'][] = 'mootools.js';
+$GLOBALS['js_include'][] = 'mootools-more.js';
if ($GLOBALS['cfg']['PropertiesIconic'] == true) {
$titles['Browse'] =
diff --git a/tbl_structure.php b/tbl_structure.php
index 750fbdc39..109a61d38 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -15,6 +15,7 @@ require_once './libraries/mysql_charsets.lib.php';
require_once './libraries/relation.lib.php';
$GLOBALS['js_include'][] = 'mootools.js';
+$GLOBALS['js_include'][] = 'mootools-more.js';
/**
* handle multiple field commands if required