The branch, master has been updated
via 9fb8bf6ce6f4380a96c7aaaad4711797d4e791e2 (commit)
from 04b9b79c1c79dfec95446bf28c3662b4531e57ff (commit)
- Log -----------------------------------------------------------------
commit 9fb8bf6ce6f4380a96c7aaaad4711797d4e791e2
Author: Michal Čihař <[email protected]>
Date: Thu Jul 21 13:40:54 2011 +0200
Fix indentation
-----------------------------------------------------------------------
Summary of changes:
libraries/server_synchronize.lib.php | 454 +++++++++++++++++-----------------
1 files changed, 227 insertions(+), 227 deletions(-)
diff --git a/libraries/server_synchronize.lib.php
b/libraries/server_synchronize.lib.php
index 5757166..3a6a666 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -141,7 +141,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link,
$trg_link, &$matching
if (sizeof($is_key) == 1) {
$trg_select_query .= $is_key[0]. "='" .
$source_result_set[$j] . "'";
- } elseif (sizeof($is_key) > 1){
+ } elseif (sizeof($is_key) > 1) {
for ($k=0; $k < sizeof($is_key); $k++) {
$trg_select_query .= $is_key[$k] . "='" .
$source_result_set[$j][$is_key[$k]] . "'";
if ($k < (sizeof($is_key)-1)) {
@@ -269,21 +269,21 @@ function PMA_dataDiffInTables($src_db, $trg_db,
$src_link, $trg_link, &$matching
$insert_row++;
}
} else {
- /**
- * Placing the primary key, and the value of primary key of
the row that is to be inserted in the target table
- * This condition is met when there is an additional column
in the source table
- */
- if (sizeof($is_key) == 1) {
- if (isset($source_result_set[$j])) {
-
$insert_array[$matching_table_index][$insert_row][$is_key[0]] =
$source_result_set[$j];
- }
- } elseif (sizeof($is_key) > 1) {
- for ($l = 0; $l < sizeof($is_key); $l++) {
- if
(isset($source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]]))
{
-
$insert_array[$matching_table_index][$insert_row][$is_key[$l]] =
$source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]];
- }
+ /**
+ * Placing the primary key, and the value of primary key of
the row that is to be inserted in the target table
+ * This condition is met when there is an additional column in
the source table
+ */
+ if (sizeof($is_key) == 1) {
+ if (isset($source_result_set[$j])) {
+
$insert_array[$matching_table_index][$insert_row][$is_key[0]] =
$source_result_set[$j];
+ }
+ } elseif (sizeof($is_key) > 1) {
+ for ($l = 0; $l < sizeof($is_key); $l++) {
+ if
(isset($source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]]))
{
+
$insert_array[$matching_table_index][$insert_row][$is_key[$l]] =
$source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]];
}
}
+ }
$insert_row++;
}
} // for loop ends
@@ -291,18 +291,18 @@ function PMA_dataDiffInTables($src_db, $trg_db,
$src_link, $trg_link, &$matching
}
/**
-* PMA_findDeleteRowsFromTargetTables finds the rows which are to be deleted
from target table.
-*
-* @param $delete_array array containing rows that are to be deleted
-* @param $matching_table array containing matching table names
-* @param $matching_table_index index of a table from $matching_table array
-* @param $trg_keys array of target table keys
-* @param $src_keys array of source table keys
-* @param $trg_db name of target database
-* @param $trg_link connection established with target server
-* @param $src_db name of source database
-* @param $src_link connection established with source server
-*/
+ * PMA_findDeleteRowsFromTargetTables finds the rows which are to be deleted
from target table.
+ *
+ * @param $delete_array array containing rows that are to be deleted
+ * @param $matching_table array containing matching table names
+ * @param $matching_table_index index of a table from $matching_table array
+ * @param $trg_keys array of target table keys
+ * @param $src_keys array of source table keys
+ * @param $trg_db name of target database
+ * @param $trg_link connection established with target server
+ * @param $src_db name of source database
+ * @param $src_link connection established with source server
+ */
function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table,
$matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link,$src_db,
$src_link)
{
if (isset($trg_keys[$matching_table_index])) {
@@ -366,14 +366,14 @@ function
PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma
}
/**
-* PMA_dataDiffInUncommonTables() finds the data difference in
$source_tables_uncommon
-*
-* @param $source_tables_uncommon array of table names; containing table
names that are in source db and not in target db
-* @param $src_db name of source database
-* @param $src_link connection established with source server
-* @param $index index of a table from $matching_table array
-* @param $row_count number of rows
-*/
+ * PMA_dataDiffInUncommonTables() finds the data difference in
$source_tables_uncommon
+ *
+ * @param $source_tables_uncommon array of table names; containing table
names that are in source db and not in target db
+ * @param $src_db name of source database
+ * @param $src_link connection established with source server
+ * @param $index index of a table from $matching_table array
+ * @param $row_count number of rows
+ */
function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db,
$src_link, $index, &$row_count)
{
$query = "SELECT COUNT(*) FROM " . PMA_backquote($src_db) . "." .
PMA_backquote($source_tables_uncommon[$index]);
@@ -382,19 +382,19 @@ function
PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_lin
}
/**
-* PMA_updateTargetTables() sets the updated field values to target table rows
using $update_array[$matching_table_index]
-*
-*
-* @param $table Array containing matching tables' names
-* @param $update_array A three dimensional array containing field
-* value updates required for each matching
table
-* @param $src_db Name of source database
-* @param $trg_db Name of target database
-* @param $trg_link Connection established with target server
-* @param $matching_table_index index of matching table in
matching_table_array
-* @param $matching_table_keys
-* @param $display true/false value
-*/
+ * PMA_updateTargetTables() sets the updated field values to target table rows
using $update_array[$matching_table_index]
+ *
+ *
+ * @param $table Array containing matching tables' names
+ * @param $update_array A three dimensional array containing field
+ * value updates required for each matching
table
+ * @param $src_db Name of source database
+ * @param $trg_db Name of target database
+ * @param $trg_link Connection established with target server
+ * @param $matching_table_index index of matching table in
matching_table_array
+ * @param $matching_table_keys
+ * @param $display true/false value
+ */
function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db,
$trg_link, $matching_table_index, $matching_table_keys, $display)
{
if (isset($update_array[$matching_table_index])) {
@@ -439,33 +439,33 @@ function PMA_updateTargetTables($table, $update_array,
$src_db, $trg_db, $trg_li
}
/**
-* PMA_insertIntoTargetTable() inserts missing rows in the target table using
$array_insert[$matching_table_index]
-*
-* @param $matching_table array containing matching table names
-* @param $src_db name of source database
-* @param $trg_db name of target database
-* @param $src_link connection established with source server
-* @param $trg_link connection established with target server
-* @param $table_fields array containing field names of a table
-* @param $array_insert
-* @param $matching_table_index index of matching table in
matching_table_array
-* @param $matching_tables_keys array containing field names that are keys
in the matching table
-* @param $source_columns array containing source column information
-* @param $add_column_array array containing column names that are to be
added in target table
-* @param $criteria array containing criterias like type, null,
collation, default etc
-* @param $target_tables_keys array containing field names that are keys
in the target table
-* @param $uncommon_tables array containing table names that are
present in source db but not in targt db
-* @param $uncommon_tables_fields array containing field names of the uncommon
tables
-* @param $uncommon_cols column names that are present in target
table and not in source table
-* @param $alter_str_array array containing column names that are to be
altered
-* @param $source_indexes column names on which indexes are made in
source table
-* @param $target_indexes column names on which indexes are made in
target table
-* @param $add_indexes_array array containing column names on which index
is to be added in target table
-* @param $alter_indexes_array array containing column names whose indexes
are to be altered. Only index name and uniqueness of an index can be changed
-* @param $delete_array array containing rows that are to be deleted
-* @param $update_array array containing rows that are to be updated
in target
-* @param $display true/false value
-*/
+ * PMA_insertIntoTargetTable() inserts missing rows in the target table using
$array_insert[$matching_table_index]
+ *
+ * @param $matching_table array containing matching table names
+ * @param $src_db name of source database
+ * @param $trg_db name of target database
+ * @param $src_link connection established with source server
+ * @param $trg_link connection established with target server
+ * @param $table_fields array containing field names of a table
+ * @param $array_insert
+ * @param $matching_table_index index of matching table in
matching_table_array
+ * @param $matching_tables_keys array containing field names that are keys
in the matching table
+ * @param $source_columns array containing source column information
+ * @param $add_column_array array containing column names that are to
be added in target table
+ * @param $criteria array containing criterias like type, null,
collation, default etc
+ * @param $target_tables_keys array containing field names that are keys
in the target table
+ * @param $uncommon_tables array containing table names that are
present in source db but not in targt db
+ * @param $uncommon_tables_fields array containing field names of the
uncommon tables
+ * @param $uncommon_cols column names that are present in target
table and not in source table
+ * @param $alter_str_array array containing column names that are to
be altered
+ * @param $source_indexes column names on which indexes are made in
source table
+ * @param $target_indexes column names on which indexes are made in
target table
+ * @param $add_indexes_array array containing column names on which
index is to be added in target table
+ * @param $alter_indexes_array array containing column names whose indexes
are to be altered. Only index name and uniqueness of an index can be changed
+ * @param $delete_array array containing rows that are to be deleted
+ * @param $update_array array containing rows that are to be
updated in target
+ * @param $display true/false value
+ */
function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db,
$src_link, $trg_link, $table_fields, &$array_insert, $matching_table_index,
$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, $display)
@@ -578,17 +578,17 @@ function PMA_insertIntoTargetTable($matching_table,
$src_db, $trg_db, $src_link,
}
/**
-* PMA_createTargetTables() Create the missing table $uncommon_table in target
database
-*
-* @param $src_db name of source database
-* @param $trg_db name of target database
-* @param $src_link connection established with source server
-* @param $trg_link connection established with target server
-* @param $uncommon_tables names of tables present in source but not
in target
-* @param $table_index index of table in $uncommon_tables array
-* @param $uncommon_tables_fields field names of the uncommon table
-* @param $display true/false value
-*/
+ * PMA_createTargetTables() Create the missing table $uncommon_table in target
database
+ *
+ * @param $src_db name of source database
+ * @param $trg_db name of target database
+ * @param $src_link connection established with source server
+ * @param $trg_link connection established with target server
+ * @param $uncommon_tables names of tables present in source but not
in target
+ * @param $table_index index of table in $uncommon_tables array
+ * @param $uncommon_tables_fields field names of the uncommon table
+ * @param $display true/false value
+ */
function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link,
&$uncommon_tables, $table_index, &$uncommon_tables_fields, $display)
{
if (isset($uncommon_tables[$table_index])) {
@@ -630,19 +630,19 @@ function PMA_createTargetTables($src_db, $trg_db,
$src_link, $trg_link, &$uncomm
}
}
/**
-* PMA_populateTargetTables() inserts data into uncommon tables after they have
been created
-*
-* @param $src_db name of source database
-* @param $trg_db name of target database
-* @param $src_link connection established with source server
-* @param $trg_link connection established with target server
-* @param $uncommon_tables array containing uncommon table names (table
names that are present in source but not in target db)
-* @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)
-*/
+ * PMA_populateTargetTables() inserts data into uncommon tables after they
have been created
+ *
+ * @param $src_db name of source database
+ * @param $trg_db name of target database
+ * @param $src_link connection established with source server
+ * @param $trg_link connection established with target server
+ * @param $uncommon_tables array containing uncommon table names
(table names that are present in source but not in target db)
+ * @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)
{
$display = false; // todo: maybe display some of the queries if they are
not too numerous
@@ -670,16 +670,16 @@ function PMA_populateTargetTables($src_db, $trg_db,
$src_link, $trg_link, $uncom
}
/**
-* PMA_deleteFromTargetTable() delete rows from target table
-*
-* @param $trg_db name of target database
-* @param $trg_link connection established with target server
-* @param $matching_tables array containing matching table names
-* @param $table_index index of table in matching_table_array
-* @param $target_tables_keys primary key names of the target tables
-* @param $delete_array array containing the key values of rows that
are to be deleted
-* @param $display true/false value
-*/
+ * PMA_deleteFromTargetTable() delete rows from target table
+ *
+ * @param $trg_db name of target database
+ * @param $trg_link connection established with target server
+ * @param $matching_tables array containing matching table names
+ * @param $table_index index of table in matching_table_array
+ * @param $target_tables_keys primary key names of the target tables
+ * @param $delete_array array containing the key values of rows
that are to be deleted
+ * @param $display true/false value
+ */
function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables,
$table_index, $target_tables_keys, $delete_array, $display)
{
for ($i = 0; $i < sizeof($delete_array[$table_index]); $i++) {
@@ -719,31 +719,31 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link,
$matching_tables, $table_
}
/**
-* PMA_structureDiffInTables() Gets all the column information for source and
target table.
-* Compare columns on their names.
-* If column exists in target then compare Type, Null, Collation, Key, Default
and Comment for that column.
-* If column does not exist in target table then it is placed in
$add_column_array.
-* If column exists in target table but criteria is different then it is palced
in $alter_str_array.
-* If column does not exist in source table but is present in target table then
it is placed in $uncommon_columns.
-* Keys for all the source tables that have a corresponding target table are
placed in $matching_tables_keys.
-* Keys for all the target tables that have a corresponding source table are
placed in $target_tables_keys.
-*
-* @param $src_db name of source database
-* @param $trg_db name of target database
-* @param $src_link connection established with source server
-* @param $trg_link connection established with target server
-* @param $matching_tables array containing names of matching tables
-* @param $source_columns array containing columns information of the
source tables
-* @param $target_columns array containing columns information of the
target tables
-* @param $alter_str_array three dimensional associative array first
index being the matching table index, second index being column name for which
target
-* column have some criteria different and
third index containing the criteria which is different.
-* @param $add_column_array two dimensional associative array, first
index of the array contain the matching table number and second index contain
the
-* column name which is to be added in the
target table
-* @param $uncommon_columns array containing the columns that are
present in the target table but not in the source table
-* @param $criteria array containing the criterias which are to
be checked for field that is present in source table and target table
-* @param $target_tables_keys array containing the field names which is
key in the target table
-* @param $matching_table_index integer number of the matching table
-*/
+ * PMA_structureDiffInTables() Gets all the column information for source and
target table.
+ * Compare columns on their names.
+ * If column exists in target then compare Type, Null, Collation, Key, Default
and Comment for that column.
+ * If column does not exist in target table then it is placed in
$add_column_array.
+ * If column exists in target table but criteria is different then it is
palced in $alter_str_array.
+ * If column does not exist in source table but is present in target table
then it is placed in $uncommon_columns.
+ * Keys for all the source tables that have a corresponding target table are
placed in $matching_tables_keys.
+ * Keys for all the target tables that have a corresponding source table are
placed in $target_tables_keys.
+ *
+ * @param $src_db name of source database
+ * @param $trg_db name of target database
+ * @param $src_link connection established with source server
+ * @param $trg_link connection established with target server
+ * @param $matching_tables array containing names of matching tables
+ * @param $source_columns array containing columns information of
the source tables
+ * @param $target_columns array containing columns information of
the target tables
+ * @param $alter_str_array three dimensional associative array first
index being the matching table index, second index being column name for which
target
+ * column have some criteria different and
third index containing the criteria which is different.
+ * @param $add_column_array two dimensional associative array, first
index of the array contain the matching table number and second index contain
the
+ * column name which is to be added in the
target table
+ * @param $uncommon_columns array containing the columns that are
present in the target table but not in the source table
+ * @param $criteria array containing the criterias which are
to be checked for field that is present in source table and target table
+ * @param $target_tables_keys array containing the field names which is
key in the target table
+ * @param $matching_table_index integer number of the matching table
+ */
function 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,
$matching_table_index)
{
@@ -788,25 +788,25 @@ function PMA_structureDiffInTables($src_db, $trg_db,
$src_link, $trg_link, $matc
}
}
/**
-* PMA_addColumnsInTargetTable() adds column that are present in source table
but not in target table
-*
-* @param $src_db name of source database
-* @param $trg_db name of target database
-* @param $src_link connection established with source server
-* @param $trg_link connection established with target server
-* @param $matching_tables array containing names of matching tables
-* @param $source_columns array containing columns information of the
source tables
-* @param $add_column_array array containing the names of the
column(field) that are to be added in the target
-* @param $matching_tables_fields
-* @param $criteria array containing the criterias
-* @param $matching_tables_keys array containing the field names which is
key in the source table
-* @param $target_tables_keys array containing the field names which is
key in the target table
-* @param $uncommon_tables array containing the table names that are
present in source db and not in target db
-* @param $uncommon_tables_fields array containing the names of the fields of
the uncommon tables
-* @param $table_counter integer number of the matching table
-* @param $uncommon_cols
-* @param $display true/false value
-*/
+ * PMA_addColumnsInTargetTable() adds column that are present in source table
but not in target table
+ *
+ * @param $src_db name of source database
+ * @param $trg_db name of target database
+ * @param $src_link connection established with source server
+ * @param $trg_link connection established with target server
+ * @param $matching_tables array containing names of matching tables
+ * @param $source_columns array containing columns information of
the source tables
+ * @param $add_column_array array containing the names of the
column(field) that are to be added in the target
+ * @param $matching_tables_fields
+ * @param $criteria array containing the criterias
+ * @param $matching_tables_keys array containing the field names which is
key in the source table
+ * @param $target_tables_keys array containing the field names which is
key in the target table
+ * @param $uncommon_tables array containing the table names that are
present in source db and not in target db
+ * @param $uncommon_tables_fields array containing the names of the fields
of the uncommon tables
+ * @param $table_counter integer number of the matching table
+ * @param $uncommon_cols
+ * @param $display true/false value
+ */
function 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, $table_counter, $uncommon_cols,
$display)
{
@@ -885,18 +885,18 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db,
$src_link, $trg_link, $ma
}
}
/**
-* PMA_checkForeignKeys() checks if the referenced table have foreign keys.
-* uses PMA_createTargetTables()
-*
-* @param $src_db name of source database
-* @param $src_link connection established with source server
-* @param $trg_db name of target database
-* @param $trg_link connection established with target server
-* @param $referenced_table table whose column is a foreign key in
another table
-* @param $uncommon_tables array containing names that are uncommon
-* @param $uncommon_tables_fields field names of the uncommon table
-* @param $display true/false value
-*/
+ * PMA_checkForeignKeys() checks if the referenced table have foreign keys.
+ * uses PMA_createTargetTables()
+ *
+ * @param $src_db name of source database
+ * @param $src_link connection established with source server
+ * @param $trg_db name of target database
+ * @param $trg_link connection established with target server
+ * @param $referenced_table table whose column is a foreign key in
another table
+ * @param $uncommon_tables array containing names that are uncommon
+ * @param $uncommon_tables_fields field names of the uncommon table
+ * @param $display true/false value
+ */
function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link
,$referenced_table, &$uncommon_tables, &$uncommon_tables_fields, $display)
{
$is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE
TABLE_SCHEMA = '" . $src_db . "'
@@ -916,20 +916,20 @@ function PMA_checkForeignKeys($src_db, $src_link,
$trg_db, $trg_link ,$reference
}
}
/**
-* PMA_alterTargetTableStructure() alters structure of the target table using
$alter_str_array
-*
-* @param $trg_db name of target database
-* @param $trg_link connection established with target server
-* @param $matching_tables array containing names of matching tables
-* @param $source_columns array containing columns information of the
source table
-* @param $alter_str_array array containing the column name and
criteria which is to be altered for the targert table
-* @param $matching_tables_fields array containing the name of the fields for
the matching table
-* @param $criteria array containing the criterias
-* @param $matching_tables_keys array containing the field names which is
key in the source table
-* @param $target_tables_keys array containing the field names which is
key in the target table
-* @param $matching_table_index integer number of the matching table
-* @param $display true/false value
-*/
+ * PMA_alterTargetTableStructure() alters structure of the target table using
$alter_str_array
+ *
+ * @param $trg_db name of target database
+ * @param $trg_link connection established with target server
+ * @param $matching_tables array containing names of matching tables
+ * @param $source_columns array containing columns information of
the source table
+ * @param $alter_str_array array containing the column name and
criteria which is to be altered for the targert table
+ * @param $matching_tables_fields array containing the name of the fields
for the matching table
+ * @param $criteria array containing the criterias
+ * @param $matching_tables_keys array containing the field names which is
key in the source table
+ * @param $target_tables_keys array containing the field names which is
key in the target table
+ * @param $matching_table_index integer number of the matching table
+ * @param $display true/false value
+ */
function 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_index, $display)
{
@@ -1050,15 +1050,15 @@ function PMA_alterTargetTableStructure($trg_db,
$trg_link, $matching_tables, &$s
}
/**
-* PMA_removeColumnsFromTargetTable() removes the columns which are present in
target table but not in source table.
-*
-* @param $trg_db name of target database
-* @param $trg_link connection established with target server
-* @param $matching_tables array containing names of matching tables
-* @param $uncommon_columns array containing the names of the column which
are to be dropped from the target table
-* @param $table_counter index of the matching table as in
$matchiing_tables array
-* @param $display true/false value
-*/
+ * PMA_removeColumnsFromTargetTable() removes the columns which are present in
target table but not in source table.
+ *
+ * @param $trg_db name of target database
+ * @param $trg_link connection established with target server
+ * @param $matching_tables array containing names of matching tables
+ * @param $uncommon_columns array containing the names of the column which
are to be dropped from the target table
+ * @param $table_counter index of the matching table as in
$matchiing_tables array
+ * @param $display true/false value
+ */
function PMA_removeColumnsFromTargetTable($trg_db, $trg_link,
$matching_tables, $uncommon_columns, $table_counter, $display)
{
if (isset($uncommon_columns[$table_counter])) {
@@ -1103,22 +1103,22 @@ function PMA_removeColumnsFromTargetTable($trg_db,
$trg_link, $matching_tables,
}
/**
-* PMA_indexesDiffInTables() compares the source table indexes with target
table indexes and keep the indexes to be added in target table in
$add_indexes_array
-* indexes to be altered in $alter_indexes_array and indexes to be removed from
target table in $remove_indexes_array.
-* Only keyname and uniqueness characteristic of the indexes are altered.
-*
-* @param $src_db name of source database
-* @param $trg_db name of target database
-* @param $src_link connection established with source server
-* @param $trg_link connection established with target server
-* @param $matching_tables array containing the matching tables name
-* @param $source_indexes array containing the indexes of the source
table
-* @param $target_indexes array containing the indexes of the target
table
-* @param $add_indexes_array array containing the name of the column on
which the index is to be added in the target table
-* @param $alter_indexes_array array containing the key name which needs
to be altered
-* @param $remove_indexes_array array containing the key name of the index
which is to be removed from the target table
-* @param $table_counter number of the matching table
-*/
+ * PMA_indexesDiffInTables() compares the source table indexes with target
table indexes and keep the indexes to be added in target table in
$add_indexes_array
+ * indexes to be altered in $alter_indexes_array and indexes to be removed
from target table in $remove_indexes_array.
+ * Only keyname and uniqueness characteristic of the indexes are altered.
+ *
+ * @param $src_db name of source database
+ * @param $trg_db name of target database
+ * @param $src_link connection established with source server
+ * @param $trg_link connection established with target server
+ * @param $matching_tables array containing the matching tables name
+ * @param $source_indexes array containing the indexes of the source
table
+ * @param $target_indexes array containing the indexes of the target
table
+ * @param $add_indexes_array array containing the name of the column on
which the index is to be added in the target table
+ * @param $alter_indexes_array array containing the key name which needs
to be altered
+ * @param $remove_indexes_array array containing the key name of the index
which is to be removed from the target table
+ * @param $table_counter number of the matching table
+ */
function 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, $table_counter)
{
@@ -1169,19 +1169,19 @@ function PMA_indexesDiffInTables($src_db, $trg_db,
$src_link, $trg_link, $matchi
}
/**
-* PMA_applyIndexesDiff() create indexes, alters indexes and remove indexes.
-*
-* @param $trg_db name of target database
-* @param $trg_link connection established with target server
-* @param $matching_tables array containing the matching tables name
-* @param $source_indexes array containing the indexes of the source
table
-* @param $target_indexes array containing the indexes of the target
table
-* @param $add_indexes_array array containing the column names on which
indexes are to be created in target table
-* @param $alter_indexes_array array containing the column names for which
indexes are to be altered
-* @param $remove_indexes_array array containing the key name of the
indexes which are to be removed from the target table
-* @param $table_counter number of the matching table
-* @param $display true/false value
-*/
+ * PMA_applyIndexesDiff() create indexes, alters indexes and remove indexes.
+ *
+ * @param $trg_db name of target database
+ * @param $trg_link connection established with target server
+ * @param $matching_tables array containing the matching tables name
+ * @param $source_indexes array containing the indexes of the source
table
+ * @param $target_indexes array containing the indexes of the target
table
+ * @param $add_indexes_array array containing the column names on which
indexes are to be created in target table
+ * @param $alter_indexes_array array containing the column names for
which indexes are to be altered
+ * @param $remove_indexes_array array containing the key name of the
indexes which are to be removed from the target table
+ * @param $table_counter number of the matching table
+ * @param $display true/false value
+ */
function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables,
$source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array,
$remove_indexes_array, $table_counter, $display)
{
@@ -1259,7 +1259,7 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link,
$matching_tables, $source_ind
* into account
*
* @param $query the query to display
-*/
+ */
function PMA_displayQuery($query) {
if (strlen($query) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
$query = substr($query, 0,
$GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]';
@@ -1271,7 +1271,7 @@ function PMA_displayQuery($query) {
* PMA_syncDisplayHeaderSource() shows the header for source database
*
* @param string $src_db source db name
-*/
+ */
function PMA_syncDisplayHeaderSource($src_db) {
echo '<div id="serverstatus" style = "overflow: auto; width: 1020px;
height: 220px; border-left: 1px gray solid; border-bottom: 1px gray solid;
padding:0; margin-bottom: 1em "> ';
@@ -1294,7 +1294,7 @@ function PMA_syncDisplayHeaderSource($src_db) {
* @param string $trg_db target db name
* @param array $matching_tables
* @return boolean $odd_row current value of this toggle
-*/
+ */
function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db,
$matching_tables) {
echo '<table id="serverstatusconnections" class="data" width="43%">';
echo '<tr>';
@@ -1320,7 +1320,7 @@ function
PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables)
*
* @param boolean $odd_row current status of the toggle
* @return boolean $odd_row final status of the toggle
-*/
+ */
function PMA_syncDisplayBeginTableRow($odd_row) {
$odd_row = ! $odd_row;
echo '<tr height="32" class=" ';
@@ -1359,13 +1359,13 @@ function PMA_get_column_values($database, $table,
$column, $link = null)
}
/**
-* array PMA_get_table_indexes($database, $table, $link = null)
-*
-* @param string $database name of database
-* @param string $table name of the table whose indexes are to be
retreived
-* @param mixed $link mysql link resource
-* @return array $indexes
-*/
+ * array PMA_get_table_indexes($database, $table, $link = null)
+ *
+ * @param string $database name of database
+ * @param string $table name of the table whose indexes are to be
retreived
+ * @param mixed $link mysql link resource
+ * @return array $indexes
+ */
function PMA_get_table_indexes($database, $table, $link = null)
{
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
