diff --git a/db_qbe.php b/db_qbe.php
index 7ed278204b..f7628c5fc0 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -10,53 +10,12 @@
* requirements
*/
require_once 'libraries/common.inc.php';
+require_once 'libraries/DBQbe.class.php';
+$response = PMA_Response::getInstance();
-/**
- * Sets globals from $_POST
- */
-$post_params = array(
- 'Field',
- 'Show',
- 'Sort'
-);
-foreach ($post_params as $one_post_param) {
- if (isset($_POST[$one_post_param])) {
- $GLOBALS[$one_post_param] = $_POST[$one_post_param];
- }
-}
-
-/**
- * Sets globals from $_POST patterns, for Or* variables
- * (additional criteria lines)
- */
-
-$post_patterns = array(
- '/^Or/i'
-);
-foreach (array_keys($_POST) as $post_key) {
- foreach ($post_patterns as $one_post_pattern) {
- if (preg_match($one_post_pattern, $post_key)) {
- $GLOBALS[$post_key] = $_POST[$post_key];
- }
- }
-}
-/**
- * Initialize some more global variables
- */
-$GLOBALS['curField'] = array();
-$GLOBALS['curSort'] = array();
-$GLOBALS['curShow'] = array();
-$GLOBALS['curCriteria'] = array();
-$GLOBALS['curAndOrRow'] = array();
-$GLOBALS['curAndOrCol'] = array();
-
-/**
- * Gets the relation settings
- */
+// Gets the relation settings
$cfgRelation = PMA_getRelationsParam();
-$common_functions = PMA_CommonFunctions::getInstance();
-
/**
* A query has been submitted -> (maybe) execute it
*/
@@ -82,492 +41,12 @@ if ($message_to_display) {
}
unset($message_to_display);
-/**
- * Initialize some variables
- */
-$col_cnt = PMA_ifSetOr($_REQUEST['col_cnt'], 3, 'numeric');
-$add_col = PMA_ifSetOr($_REQUEST['add_col'], 0, 'numeric');
-$add_row = PMA_ifSetOr($_REQUEST['add_row'], 0, 'numeric');
-
-$rows = PMA_ifSetOr($_REQUEST['rows'], 0, 'numeric');
-$ins_col = PMA_ifSetOr($_REQUEST['ins_col'], null, 'array');
-$del_col = PMA_ifSetOr($_REQUEST['del_col'], null, 'array');
-
-$prev_criteria = isset($_REQUEST['prev_criteria'])
- ? $_REQUEST['prev_criteria']
- : array();
-$criteria = isset($_REQUEST['criteria'])
- ? $_REQUEST['criteria']
- : array_fill(0, $col_cnt, '');
-
-$ins_row = isset($_REQUEST['ins_row'])
- ? $_REQUEST['ins_row']
- : array_fill(0, $col_cnt, '');
-$del_row = isset($_REQUEST['del_row'])
- ? $_REQUEST['del_row']
- : array_fill(0, $col_cnt, '');
-$and_or_row = isset($_REQUEST['and_or_row'])
- ? $_REQUEST['and_or_row']
- : array_fill(0, $col_cnt, '');
-$and_or_col = isset($_REQUEST['and_or_col'])
- ? $_REQUEST['and_or_col']
- : array_fill(0, $col_cnt, '');
-
-// minimum width
-$form_column_width = 12;
-$col = max($col_cnt + $add_col, 0);
-$row = max($rows + $add_row, 0);
-
-
-// The tables list sent by a previously submitted form
-if (PMA_isValid($_REQUEST['TableList'], 'array')) {
- foreach ($_REQUEST['TableList'] as $each_table) {
- $tbl_names[$each_table] = ' selected="selected"';
- }
-} // end if
-
-
-// this was a work in progress, deactivated for now
-//$columns = PMA_DBI_get_columns_full($GLOBALS['db']);
-//$tables = PMA_DBI_get_columns_full($GLOBALS['db']);
-
-
-/**
- * Prepares the form
- */
-$tbl_result = PMA_DBI_query(
- 'SHOW TABLES FROM ' . $common_functions->backquote($db) . ';',
- null, PMA_DBI_QUERY_STORE
-);
-$tbl_result_cnt = PMA_DBI_num_rows($tbl_result);
-if (0 == $tbl_result_cnt) {
- PMA_Message::error(__('No tables found in database.'))->display();
- exit;
-}
-
-// The tables list gets from MySQL
-while (list($tbl) = PMA_DBI_fetch_row($tbl_result)) {
- $fld_results = PMA_DBI_get_columns($db, $tbl);
-
- if (empty($tbl_names[$tbl]) && ! empty($_REQUEST['TableList'])) {
- $tbl_names[$tbl] = '';
- } else {
- $tbl_names[$tbl] = ' selected="selected"';
- } // end if
-
- // The fields list per selected tables
- if ($tbl_names[$tbl] == ' selected="selected"') {
- $each_table = $common_functions->backquote($tbl);
- $fld[] = $each_table . '.*';
- foreach ($fld_results as $each_field) {
- $each_field = $each_table . '.' . $common_functions->backquote($each_field['Field']);
- $fld[] = $each_field;
-
- // increase the width if necessary
- $form_column_width = max(strlen($each_field), $form_column_width);
- } // end foreach
- } // end if
-} // end while
-PMA_DBI_free_result($tbl_result);
-
-// largest width found
-$realwidth = $form_column_width . 'ex';
-
+// create new qbe search instance
+$db_qbe = new PMA_DBQbe($GLOBALS['db']);
/**
* Displays the Query by example form
*/
-
-/**
- * Provides select options list containing column names
- *
- * @param array $columns All Column Names
- * @param integer $column_number Column Number (0,1,2) or more
- * @param string $selected Selected criteria column name
- *
- * @return HTML for select options
- */
-function showColumnSelectCell($columns, $column_number, $selected = '')
-{
- $html_output = '';
- $html_output .= '| ';
- $html_output .= '';
- $html_output .= ' | ';
- return $html_output;
-}
-
-/**
- * Provides select options list containing sort options (ASC/DESC)
- *
- * @param integer $column_number Column Number (0,1,2) or more
- * @param string $realwidth Largest column width found
- * @param string $asc_selected Selected criteria 'Ascending'
- * @param string $desc_selected Selected criteria 'Descending'
- *
- * @return HTML for select options
- */
-function getSortSelectCell($column_number, $realwidth, $asc_selected = '',
- $desc_selected = '')
-{
- $html_output = '';
- $html_output .= '';
- $html_output .= ' | ';
- return $html_output;
-}
-
-/**
- * Provides search form's row containing column select options
- *
- * @param array $criteria_column_count Number of criteria columns
- * @param integer $columns All column names
- * @param string $ins_col If a new criteria column is needed
- * @param string $del_col If a criteria column is to be deleted
- *
- * @return HTML for search table's row
- */
-function PMA_dbQbegetColumnNamesRow(
- $criteria_column_count, $columns, $ins_col = null, $del_col = null
-) {
- $html_output = '';
- $html_output .= '| ' . __('Column') . ': | ';
- $z = 0;
- for ($column_index = 0; $column_index < $criteria_column_count; $column_index++)
- {
- if (isset($ins_col[$column_index]) && $ins_col[$column_index] == 'on') {
- $html_output .= showColumnSelectCell($columns, $z);
- $z++;
- }
- if (! empty($del_col) && isset($del_col[$column_index]) && $del_col[$column_index] == 'on') {
- continue;
- }
- $selected = '';
- if (isset($_REQUEST['Field'][$column_index])) {
- $selected = $_REQUEST['Field'][$column_index];
- $GLOBALS['curField'][$z] = $_REQUEST['Field'][$column_index];
- }
- $html_output .= showColumnSelectCell($columns, $z, $selected);
- $z++;
- } // end for
- $html_output .= '
';
- return $html_output;
-}
-
-/**
- * Provides search form's row containing sort(ASC/DESC) select options
- *
- * @param array $criteria_column_count Number of criteria columns
- * @param string $realwidth Largest column width found
- * @param string $ins_col If a new criteria column is needed
- * @param string $del_col If a criteria column is to be deleted
- *
- * @return HTML for search table's row
- */
-function PMA_dbQbegetSortRow(
- $criteria_column_count, $realwidth, $ins_col = null, $del_col = null
-) {
- $html_output = '';
- $html_output .= '| ' . __('Sort') . ': | ';
- $z = 0;
- for ($column_index = 0; $column_index < $criteria_column_count; $column_index++)
- {
- if (! empty($ins_col) && isset($ins_col[$column_index]) && $ins_col[$column_index] == 'on') {
- $html_output .= getSortSelectCell($z, $realwidth);
- $z++;
- } // end if
-
- if (! empty($del_col) && isset($del_col[$column_index]) && $del_col[$column_index] == 'on') {
- continue;
- }
- // If they have chosen all fields using the * selector,
- // then sorting is not available, Fix for Bug #570698
- if (isset($_REQUEST['Sort'][$column_index]) && isset($_REQUEST['Field'][$column_index])
- && substr($_REQUEST['Field'][$column_index], -2) == '.*'
- ) {
- $_REQUEST['Sort'][$column_index] = '';
- } //end if
- // Set asc_selected
- if (isset($_REQUEST['Sort'][$column_index]) && $_REQUEST['Sort'][$column_index] == 'ASC') {
- $GLOBALS['curSort'][$z] = $_REQUEST['Sort'][$column_index];
- $asc_selected = ' selected="selected"';
- } else {
- $asc_selected = '';
- } // end if
- // Set desc selected
- if (isset($_REQUEST['Sort'][$column_index]) && $_REQUEST['Sort'][$column_index] == 'DESC') {
- $GLOBALS['curSort'][$z] = $_REQUEST['Sort'][$column_index];
- $desc_selected = ' selected="selected"';
- } else {
- $desc_selected = '';
- } // end if
- $html_output .= getSortSelectCell(
- $z, $realwidth, $asc_selected, $desc_selected
- );
- $z++;
- } // end for
- $html_output .= '
';
- return $html_output;
-}
-
-/**
- * Provides search form's row containing SHOW checkboxes
- *
- * @param array $criteria_column_count Number of criteria columns
- * @param string $ins_col If a new criteria column is needed
- * @param string $del_col If a criteria column is to be deleted
- *
- * @return HTML for search table's row
- */
-function PMA_dbQbegetShowRow(
- $criteria_column_count, $ins_col = null, $del_col = null
-) {
- $html_output = '';
- $html_output .= '| ' . __('Show') . ': | ';
- $z = 0;
- for ($column_index = 0; $column_index < $criteria_column_count; $column_index++)
- {
- if (! empty($ins_col) && isset($ins_col[$column_index]) && $ins_col[$column_index] == 'on') {
- $html_output .= '';
- $html_output .= '';
- $html_output .= ' | ';
- $z++;
- } // end if
- if (! empty($del_col) && isset($del_col[$column_index]) && $del_col[$column_index] == 'on') {
- continue;
- }
- if (isset($_REQUEST['Show'][$column_index])) {
- $checked = ' checked="checked"';
- $GLOBALS['curShow'][$z] = $_REQUEST['Show'][$column_index];
- } else {
- $checked = '';
- }
- $html_output .= '';
- $html_output .= '';
- $html_output .= ' | ';
- $z++;
- } // end for
- $html_output .= '
';
- return $html_output;
-}
-
-/**
- * Provides search form's row containing criteria Inputboxes
- *
- * @param array $criteria_column_count Number of criteria columns
- * @param string $realwidth Largest column width found
- * @param string $criteria Already Filled criteria
- * @param string $prev_criteria Previously filled criteria(hidden form field)
- * @param string $ins_col If a new criteria column is needed
- * @param string $del_col If a criteria column is to be deleted
- *
- * @return HTML for search table's row
- */
-function PMA_dbQbegetCriteriaInputboxRow(
- $criteria_column_count, $realwidth, $criteria, $prev_criteria,
- $ins_col = null, $del_col = null
-) {
- $html_output = '';
- $html_output .= '| ' . __('Criteria') . ': | ';
- $z = 0;
- for ($column_index = 0; $column_index < $criteria_column_count; $column_index++)
- {
- if (! empty($ins_col) && isset($ins_col[$column_index]) && $ins_col[$column_index] == 'on') {
- $html_output .= '';
- $html_output .= '';
- $html_output .= ' | ';
- $z++;
- } // end if
- if (! empty($del_col) && isset($del_col[$column_index]) && $del_col[$column_index] == 'on') {
- continue;
- }
- if (isset($criteria[$column_index])) {
- $tmp_criteria = $criteria[$column_index];
- }
- if ((empty($prev_criteria) || ! isset($prev_criteria[$column_index]))
- || $prev_criteria[$column_index] != htmlspecialchars($tmp_criteria)
- ) {
- $GLOBALS['curCriteria'][$z] = $tmp_criteria;
- } else {
- $GLOBALS['curCriteria'][$z] = $prev_criteria[$column_index];
- }
- $html_output .= '';
- $html_output .= '';
- $html_output .= '';
- $html_output .= ' | ';
- $z++;
- } // end for
- $html_output .= '
';
- return $html_output;
-}
-
-/**
- * Provides footer options for adding/deleting row/columns
- *
- * @param string $type Whether row or column
- *
- * @return HTML for footer options
- */
-function PMA_dbQbeGetFootersOptions($type)
-{
- $html_output = '';
- $html_output .= (($type == 'row')
- ? __('Add/Delete criteria rows') : __('Add/Delete columns'));
- $html_output .= ':';
- $html_output .= '
';
- return $html_output;
-}
-
-/**
- * Provides search form table's footer options
- *
- * @return HTML for table footer
- */
-function PMA_dbQbeGetTableFooters()
-{
- $html_output = '';
- return $html_output;
-}
-
-/**
- * Provides a select list of database tables
- *
- * @param array $table_names Names of all the tables
- *
- * @return HTML for table select list
- */
-function PMA_dbQbeGetTablesList($table_names)
-{
- $html_output = '';
- $html_output .= '
';
- $html_output .= '';
- $html_output .= '';
- return $html_output;
-}
-
-/**
- * Provides And/Or modification cell along with Insert/Delete options
- * (For modifying search form's table columns)
- *
- * @param integer $column_number Column Number (0,1,2) or more
- * @param array $selected Selected criteria column name
- *
- * @return HTML for modification cell
- */
-function PMA_dbQbeGetAndOrColCell($column_number, $selected = null)
-{
- $html_output = '';
- $html_output .= '' . __('Or') . ':';
- $html_output .= '';
- $html_output .= ' ' . __('And') . ':';
- $html_output .= '';
- $html_output .= '
' . __('Ins');
- $html_output .= '';
- $html_output .= ' ' . __('Del');
- $html_output .= '';
- $html_output .= ' | ';
- return $html_output;
-}
-
-/**
- * Provides search form's row containing column modifications options
- * (For modifying search form's table columns)
- *
- * @param array $criteria_column_count Number of criteria columns
- * @param string $realwidth Largest column width found
- * @param string $criteria Already Filled criteria
- * @param string $prev_criteria Previously filled criteria(hidden form field)
- * @param string $ins_col If a new criteria column is needed
- * @param string $del_col If a criteria column is to be deleted
- *
- * @return HTML for search table's row
- */
-function PMA_dbQbeGetModifyColumnsRow($criteria_column_count, $and_or_col,
- $ins_col = null, $del_col = null
-) {
- $html_output = '';
- $html_output .= '| ' . __('Modify') . ': | ';
- $z = 0;
- for ($x = 0; $x < $criteria_column_count; $x++) {
- if (! empty($ins_col) && isset($ins_col[$x]) && $ins_col[$x] == 'on') {
- $html_output .= PMA_dbQbeGetAndOrColCell($z);
- $z++;
- } // end if
-
- if (! empty($del_col) && isset($del_col[$x]) && $del_col[$x] == 'on') {
- continue;
- }
-
- if (isset($and_or_col[$x])) {
- $GLOBALS['curAndOrCol'][$z] = $and_or_col[$x];
- }
- if (isset($and_or_col[$x]) && $and_or_col[$x] == 'or') {
- $chk['or'] = ' checked="checked"';
- $chk['and'] = '';
- } else {
- $chk['and'] = ' checked="checked"';
- $chk['or'] = '';
- }
- $html_output .= PMA_dbQbeGetAndOrColCell($z, $chk);
- $z++;
- } // end for
- $html_output .= '
';
- return $html_output;
-}
-
if ($cfgRelation['designerwork']) {
$url = 'pmd_general.php' . PMA_generate_common_url(
array_merge(
@@ -575,525 +54,13 @@ if ($cfgRelation['designerwork']) {
array('query' => 1)
)
);
- PMA_Message::notice(
+ $response->addHTML(PMA_Message::notice(
sprintf(
__('Switch to %svisual builder%s'),
'',
''
)
- )->display();
+ ));//->display();
}
+$response->addHTML($db_qbe->getSelectionForm($cfgRelation));
?>
-
diff --git a/libraries/DBQbe.class.php b/libraries/DBQbe.class.php
new file mode 100644
index 0000000000..355282c270
--- /dev/null
+++ b/libraries/DBQbe.class.php
@@ -0,0 +1,1278 @@
+_db = $db;
+ // Sets criteria parameters
+ $this->_setSearchParams();
+ $this->_setCriteriaTablesAndColumns();
+ }
+
+ /**
+ * Get CommmonFunctions
+ *
+ * @return CommonFunctions object
+ */
+ public function getCommonFunctions()
+ {
+ if (is_null($this->_common_functions)) {
+ $this->_common_functions = PMA_CommonFunctions::getInstance();
+ }
+ return $this->_common_functions;
+ }
+
+ /**
+ * Sets search parameters
+ *
+ */
+ private function _setSearchParams()
+ {
+ // sets column count
+ $criteriaColumnCount = PMA_ifSetOr($_REQUEST['criteriaColumnCount'], 3, 'numeric');
+ $criteriaColumnAdd = PMA_ifSetOr($_REQUEST['criteriaColumnAdd'], 0, 'numeric');
+ $this->_criteria_column_count = max($criteriaColumnCount + $criteriaColumnAdd, 0);
+
+ // sets row count
+ $rows = PMA_ifSetOr($_REQUEST['rows'], 0, 'numeric');
+ $criteriaRowAdd = PMA_ifSetOr($_REQUEST['criteriaRowAdd'], 0, 'numeric');
+ $this->_criteria_row_count = max($rows + $criteriaRowAdd, 0);
+
+ $this->_criteriaColumnInsert = PMA_ifSetOr($_REQUEST['criteriaColumnInsert'], null, 'array');
+ $this->_criteriaColumnDelete = PMA_ifSetOr($_REQUEST['criteriaColumnDelete'], null, 'array');
+
+ $this->_prev_criteria = isset($_REQUEST['prev_criteria'])
+ ? $_REQUEST['prev_criteria']
+ : array();
+ $this->_criteria = isset($_REQUEST['criteria'])
+ ? $_REQUEST['criteria']
+ : array_fill(0, $criteriaColumnCount, '');
+
+ $this->_criteriaRowInsert = isset($_REQUEST['criteriaRowInsert'])
+ ? $_REQUEST['criteriaRowInsert']
+ : array_fill(0, $criteriaColumnCount, '');
+ $this->_criteriaRowDelete = isset($_REQUEST['criteriaRowDelete'])
+ ? $_REQUEST['criteriaRowDelete']
+ : array_fill(0, $criteriaColumnCount, '');
+ $this->_criteriaAndOrRow = isset($_REQUEST['criteriaAndOrRow'])
+ ? $_REQUEST['criteriaAndOrRow']
+ : array_fill(0, $criteriaColumnCount, '');
+ $this->_criteriaAndOrColumn = isset($_REQUEST['criteriaAndOrColumn'])
+ ? $_REQUEST['criteriaAndOrColumn']
+ : array_fill(0, $criteriaColumnCount, '');
+ // sets minimum width
+ $this->_form_column_width = 12;
+ $this->_curField = array();
+ $this->_curSort = array();
+ $this->_curShow = array();
+ $this->_curCriteria = array();
+ $this->_curAndOrRow = array();
+ $this->_curAndOrCol = array();
+ }
+
+ /**
+ * Sets criteria tables and columns
+ *
+ */
+ private function _setCriteriaTablesAndColumns()
+ {
+ // The tables list sent by a previously submitted form
+ if (PMA_isValid($_REQUEST['TableList'], 'array')) {
+ foreach ($_REQUEST['TableList'] as $each_table) {
+ $this->_criteriaTables[$each_table] = ' selected="selected"';
+ }
+ } // end if
+ $all_tables = PMA_DBI_query(
+ 'SHOW TABLES FROM ' . $this->getCommonFunctions()->backquote($this->_db) . ';',
+ null, PMA_DBI_QUERY_STORE
+ );
+ $all_tables_count = PMA_DBI_num_rows($all_tables);
+ if (0 == $all_tables_count) {
+ PMA_Message::error(__('No tables found in database.'))->display();
+ exit;
+ }
+ // The tables list gets from MySQL
+ while (list($table) = PMA_DBI_fetch_row($all_tables)) {
+ $columns = PMA_DBI_get_columns($this->_db, $table);
+
+ if (empty($this->_criteriaTables[$table]) && ! empty($_REQUEST['TableList'])) {
+ $this->_criteriaTables[$table] = '';
+ } else {
+ $this->_criteriaTables[$table] = ' selected="selected"';
+ } // end if
+
+ // The fields list per selected tables
+ if ($this->_criteriaTables[$table] == ' selected="selected"') {
+ $each_table = $this->getCommonFunctions()->backquote($table);
+ $this->_columnNames[] = $each_table . '.*';
+ foreach ($columns as $each_column) {
+ $each_column = $each_table . '.' . $this->getCommonFunctions()->backquote($each_column['Field']);
+ $this->_columnNames[] = $each_column;
+ // increase the width if necessary
+ $this->_form_column_width = max(strlen($each_column), $this->_form_column_width);
+ } // end foreach
+ } // end if
+ } // end while
+ PMA_DBI_free_result($all_tables);
+
+ // sets the largest width found
+ $this->_realwidth = $this->_form_column_width . 'ex';
+ }
+ /**
+ * Provides select options list containing column names
+ *
+ * @param integer $column_number Column Number (0,1,2) or more
+ * @param string $selected Selected criteria column name
+ *
+ * @return HTML for select options
+ */
+ private function _showColumnSelectCell($column_number, $selected = '')
+ {
+ $html_output = '';
+ $html_output .= '';
+ $html_output .= '';
+ $html_output .= ' | ';
+ return $html_output;
+ }
+
+ /**
+ * Provides select options list containing sort options (ASC/DESC)
+ *
+ * @param integer $column_number Column Number (0,1,2) or more
+ * @param string $asc_selected Selected criteria 'Ascending'
+ * @param string $desc_selected Selected criteria 'Descending'
+ *
+ * @return HTML for select options
+ */
+ private function _getSortSelectCell($column_number, $asc_selected = '',
+ $desc_selected = '')
+ {
+ $html_output = '';
+ $html_output .= '';
+ $html_output .= ' | ';
+ return $html_output;
+ }
+
+ /**
+ * Provides search form's row containing column select options
+ *
+ * @return HTML for search table's row
+ */
+ private function _getColumnNamesRow()
+ {
+ $html_output = '';
+ $html_output .= '| ' . __('Column') . ': | ';
+ $new_column_count = 0;
+ for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++)
+ {
+ if (isset($this->_criteriaColumnInsert[$column_index])
+ && $this->_criteriaColumnInsert[$column_index] == 'on'
+ ) {
+ $html_output .= showColumnSelectCell($new_column_count);
+ $new_column_count++;
+ }
+ if (! empty($this->_criteriaColumnDelete)
+ && isset($this->_criteriaColumnDelete[$column_index])
+ && $this->_criteriaColumnDelete[$column_index] == 'on'
+ ) {
+ continue;
+ }
+ $selected = '';
+ if (isset($_REQUEST['criteriaColumn'][$column_index])) {
+ $selected = $_REQUEST['criteriaColumn'][$column_index];
+ $this->_curField[$new_column_count] = $_REQUEST['criteriaColumn'][$column_index];
+ }
+ $html_output .= $this->_showColumnSelectCell($new_column_count, $selected);
+ $new_column_count++;
+ } // end for
+ $this->_new_column_count = $new_column_count;
+ $html_output .= '
';
+ return $html_output;
+ }
+
+ /**
+ * Provides search form's row containing sort(ASC/DESC) select options
+ *
+ * @return HTML for search table's row
+ */
+ private function _getSortRow()
+ {
+ $html_output = '';
+ $html_output .= '| ' . __('Sort') . ': | ';
+ $new_column_count = 0;
+ for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++)
+ {
+ if (! empty($this->_criteriaColumnInsert)
+ && isset($this->_criteriaColumnInsert[$column_index])
+ && $this->_criteriaColumnInsert[$column_index] == 'on'
+ ) {
+ $html_output .= $this->_getSortSelectCell($new_column_count);
+ $new_column_count++;
+ } // end if
+
+ if (! empty($this->_criteriaColumnDelete)
+ && isset($this->_criteriaColumnDelete[$column_index])
+ && $this->_criteriaColumnDelete[$column_index] == 'on'
+ ) {
+ continue;
+ }
+ // If they have chosen all fields using the * selector,
+ // then sorting is not available, Fix for Bug #570698
+ if (isset($_REQUEST['criteriaSort'][$column_index])
+ && isset($_REQUEST['criteriaColumn'][$column_index])
+ && substr($_REQUEST['criteriaColumn'][$column_index], -2) == '.*'
+ ) {
+ $_REQUEST['criteriaSort'][$column_index] = '';
+ } //end if
+ // Set asc_selected
+ if (isset($_REQUEST['criteriaSort'][$column_index]) && $_REQUEST['criteriaSort'][$column_index] == 'ASC') {
+ $this->_curSort[$new_column_count] = $_REQUEST['criteriaSort'][$column_index];
+ $asc_selected = ' selected="selected"';
+ } else {
+ $asc_selected = '';
+ } // end if
+ // Set desc selected
+ if (isset($_REQUEST['criteriaSort'][$column_index]) && $_REQUEST['criteriaSort'][$column_index] == 'DESC') {
+ $this->_curSort[$new_column_count] = $_REQUEST['criteriaSort'][$column_index];
+ $desc_selected = ' selected="selected"';
+ } else {
+ $desc_selected = '';
+ } // end if
+ $html_output .= $this->_getSortSelectCell(
+ $new_column_count, $asc_selected, $desc_selected
+ );
+ $new_column_count++;
+ } // end for
+ $html_output .= '
';
+ return $html_output;
+ }
+
+ /**
+ * Provides search form's row containing SHOW checkboxes
+ *
+ * @return HTML for search table's row
+ */
+ private function _getShowRow()
+ {
+ $html_output = '';
+ $html_output .= '| ' . __('Show') . ': | ';
+ $new_column_count = 0;
+ for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++)
+ {
+ if (! empty($this->_criteriaColumnInsert)
+ && isset($this->_criteriaColumnInsert[$column_index])
+ && $this->_criteriaColumnInsert[$column_index] == 'on'
+ ) {
+ $html_output .= '';
+ $html_output .= '';
+ $html_output .= ' | ';
+ $new_column_count++;
+ } // end if
+ if (! empty($this->_criteriaColumnDelete)
+ && isset($this->_criteriaColumnDelete[$column_index])
+ && $this->_criteriaColumnDelete[$column_index] == 'on'
+ ) {
+ continue;
+ }
+ if (isset($_REQUEST['criteriaShow'][$column_index])) {
+ $checked_options = ' checked="checked"';
+ $this->_curShow[$new_column_count] = $_REQUEST['criteriaShow'][$column_index];
+ } else {
+ $checked_options = '';
+ }
+ $html_output .= '';
+ $html_output .= '';
+ $html_output .= ' | ';
+ $new_column_count++;
+ } // end for
+ $html_output .= '
';
+ return $html_output;
+ }
+
+ /**
+ * Provides search form's row containing criteria Inputboxes
+ *
+ * @return HTML for search table's row
+ */
+ private function _getCriteriaInputboxRow()
+ {
+ $html_output = '';
+ $html_output .= '| ' . __('Criteria') . ': | ';
+ $new_column_count = 0;
+ for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++)
+ {
+ if (! empty($this->_criteriaColumnInsert)
+ && isset($this->_criteriaColumnInsert[$column_index])
+ && $this->_criteriaColumnInsert[$column_index] == 'on'
+ ) {
+ $html_output .= '';
+ $html_output .= '';
+ $html_output .= ' | ';
+ $new_column_count++;
+ } // end if
+ if (! empty($this->_criteriaColumnDelete)
+ && isset($this->_criteriaColumnDelete[$column_index])
+ && $this->_criteriaColumnDelete[$column_index] == 'on'
+ ) {
+ continue;
+ }
+ if (isset($this->_criteria[$column_index])) {
+ $tmp_criteria = $this->_criteria[$column_index];
+ }
+ if ((empty($this->_prev_criteria)
+ || ! isset($this->_prev_criteria[$column_index]))
+ || $this->_prev_criteria[$column_index] != htmlspecialchars($tmp_criteria)
+ ) {
+ $this->_curCriteria[$new_column_count] = $tmp_criteria;
+ } else {
+ $this->_curCriteria[$new_column_count] = $this->_prev_criteria[$column_index];
+ }
+ $html_output .= '';
+ $html_output .= '';
+ $html_output .= '';
+ $html_output .= ' | ';
+ $new_column_count++;
+ } // end for
+ $html_output .= '
';
+ return $html_output;
+ }
+
+ /**
+ * Provides footer options for adding/deleting row/columns
+ *
+ * @param string $type Whether row or column
+ *
+ * @return HTML for footer options
+ */
+ private function _getFootersOptions($type)
+ {
+ $html_output = '';
+ $html_output .= (($type == 'row')
+ ? __('Add/Delete criteria rows') : __('Add/Delete columns'));
+ $html_output .= ':';
+ $html_output .= '
';
+ return $html_output;
+ }
+
+ /**
+ * Provides search form table's footer options
+ *
+ * @return HTML for table footer
+ */
+ private function _getTableFooters()
+ {
+ $html_output = '';
+ return $html_output;
+ }
+
+ /**
+ * Provides a select list of database tables
+ *
+ * @return HTML for table select list
+ */
+ private function _getTablesList()
+ {
+ $html_output = '';
+ $html_output .= '
';
+ $html_output .= '';
+ $html_output .= '';
+ return $html_output;
+ }
+
+ /**
+ * Provides And/Or modification cell along with Insert/Delete options
+ * (For modifying search form's table columns)
+ *
+ * @param integer $column_number Column Number (0,1,2) or more
+ * @param array $selected Selected criteria column name
+ *
+ * @return HTML for modification cell
+ */
+ private function _getAndOrColCell($column_number, $selected = null)
+ {
+ $html_output = '';
+ $html_output .= '' . __('Or') . ':';
+ $html_output .= '';
+ $html_output .= ' ' . __('And') . ':';
+ $html_output .= '';
+ $html_output .= '
' . __('Ins');
+ $html_output .= '';
+ $html_output .= ' ' . __('Del');
+ $html_output .= '';
+ $html_output .= ' | ';
+ return $html_output;
+ }
+
+ /**
+ * Provides search form's row containing column modifications options
+ * (For modifying search form's table columns)
+ *
+ * @return HTML for search table's row
+ */
+ private function _getModifyColumnsRow()
+ {
+ $html_output = '';
+ $html_output .= '| ' . __('Modify') . ': | ';
+ $new_column_count = 0;
+ for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++) {
+ if (! empty($this->_criteriaColumnInsert)
+ && isset($this->_criteriaColumnInsert[$column_index])
+ && $this->_criteriaColumnInsert[$column_index] == 'on'
+ ) {
+ $html_output .= $this->_getAndOrColCell($new_column_count);
+ $new_column_count++;
+ } // end if
+
+ if (! empty($this->_criteriaColumnDelete)
+ && isset($this->_criteriaColumnDelete[$column_index])
+ && $this->_criteriaColumnDelete[$column_index] == 'on'
+ ) {
+ continue;
+ }
+
+ if (isset($this->_criteriaAndOrColumn[$column_index])) {
+ $this->_curAndOrCol[$new_column_count] = $this->_criteriaAndOrColumn[$column_index];
+ }
+ if (isset($this->_criteriaAndOrColumn[$column_index])
+ && $this->_criteriaAndOrColumn[$column_index] == 'or'
+ ) {
+ $checked_options['or'] = ' checked="checked"';
+ $checked_options['and'] = '';
+ } else {
+ $checked_options['and'] = ' checked="checked"';
+ $checked_options['or'] = '';
+ }
+ $html_output .= $this->_getAndOrColCell($new_column_count, $checked_options);
+ $new_column_count++;
+ } // end for
+ $html_output .= '
';
+ return $html_output;
+ }
+
+ /**
+ * Provides Insert/Delete options for criteria inputbox
+ * with AND/OR relationship modification options
+ *
+ * @param integer $row_index Number of criteria row
+ * @param string $checked_options If checked
+ *
+ * @return HTML
+ */
+ private function _getInsDelAndOrCell($row_index, $checked_options) {
+ $html_output = '';
+ $html_output .= '';
+ $html_output .= '';
+ $html_output .= ' | ';
+ return $html_output;
+ }
+
+ /**
+ * Provides rows for criteria inputbox Insert/Delete options
+ * with AND/OR relationship modification options
+ *
+ * @param integer $new_row_index New row index if rows are added/deleted
+ * @param integer $row_index Row index
+ *
+ * @return HTML table rows
+ */
+ private function _getInputboxRow($new_row_index, $row_index)
+ {
+ $html_output = '';
+ $new_column_count = 0;
+ for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++) {
+ if (! empty($this->_criteriaColumnInsert)
+ && isset($this->_criteriaColumnInsert[$column_index])
+ && $this->_criteriaColumnInsert[$column_index] == 'on'
+ ) {
+ $or = 'Or' . $new_row_index . '[' . $new_column_count . ']';
+ $html_output .= '';
+ $html_output .= '';
+ $html_output .= ' | ';
+ $new_column_count++;
+ } // end if
+ if (! empty($this->_criteriaColumnDelete)
+ && isset($this->_criteriaColumnDelete[$column_index])
+ && $this->_criteriaColumnDelete[$column_index] == 'on'
+ ) {
+ continue;
+ }
+ $or = 'Or' . $new_row_index;
+ if (! empty($_POST[$or]) && isset($_POST[$or][$column_index])) {
+ $tmp_or = $_POST[$or][$column_index];
+ } else {
+ $tmp_or = '';
+ }
+ $html_output .= '';
+ $html_output .= '';
+ $html_output .= ' | ';
+ if (! empty(${$or}) && isset(${$or}[$column_index])) {
+ $GLOBALS[${'cur' . $or}][$new_column_count] = ${$or}[$column_index];
+ }
+ $new_column_count++;
+ } // end for
+ return $html_output;
+ }
+
+ /**
+ * Provides rows for criteria inputbox Insert/Delete options
+ * with AND/OR relationship modification options
+ *
+ * @return HTML table rows
+ */
+ private function _getInsDelAndOrCriteriaRows()
+ {
+ $html_output = '';
+ $new_row_count = 0;
+ $odd_row = true;
+ for ($row_index = 0; $row_index <= $this->_criteria_row_count; $row_index++) {
+ if (isset($this->_criteriaRowInsert[$row_index])
+ && $this->_criteriaRowInsert[$row_index] == 'on'
+ ) {
+ $checked_options['or'] = ' checked="checked"';
+ $checked_options['and'] = '';
+ $html_output .= '';
+ $html_output .= $this->_getInsDelAndOrCell(
+ $new_row_count, $checked_options
+ );
+ $html_output .= $this->_getInputboxRow(
+ $new_row_count, $row_index
+ );
+ $new_row_count++;
+ $html_output .= '
';
+ $odd_row =! $odd_row;
+ } // end if
+ if (isset($this->_criteriaRowDelete[$row_index])
+ && $this->_criteriaRowDelete[$row_index] == 'on'
+ ) {
+ continue;
+ }
+ if (isset($this->_criteriaAndOrRow[$row_index])) {
+ $this->_curAndOrRow[$new_row_count] = $this->_criteriaAndOrRow[$row_index];
+ }
+ if (isset($this->_criteriaAndOrRow[$row_index])
+ && $this->_criteriaAndOrRow[$row_index] == 'and'
+ ) {
+ $checked_options['and'] = ' checked="checked"';
+ $checked_options['or'] = '';
+ } else {
+ $checked_options['or'] = ' checked="checked"';
+ $checked_options['and'] = '';
+ }
+ $html_output .= '';
+ $html_output .= $this->_getInsDelAndOrCell(
+ $new_row_count, $checked_options
+ );
+ $html_output .= $this->_getInputboxRow(
+ $new_row_count, $row_index
+ );
+ $new_row_count++;
+ $html_output .= '
';
+ $odd_row =! $odd_row;
+ } // end for
+ $this->_new_row_count = $new_row_count;
+ return $html_output;
+ }
+
+ /**
+ * Provides SELECT clause for building SQL query
+ *
+ * @return Select clause
+ */
+ private function _getSelectClause(){
+ $select_clause = '';
+ $select_clauses = array();
+ for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++) {
+ if (! empty($this->_curField[$column_index])
+ && isset($this->_curShow[$column_index])
+ && $this->_curShow[$column_index] == 'on')
+ {
+ $select_clauses[] = $this->_curField[$column_index];
+ }
+ } // end for
+ if ($select_clauses) {
+ $select_clause = 'SELECT '
+ . htmlspecialchars(implode(", ", $select_clauses)) . "\n";
+ }
+ return $select_clause;
+ }
+
+ /**
+ * Provides WHERE clause for building SQL query
+ *
+ * @return Where clause
+ */
+ private function _getWhereClause() {
+ $where_clause = '';
+ $criteria_cnt = 0;
+ for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++) {
+ if (! empty($this->_curField[$column_index])
+ && ! empty($this->_curCriteria[$column_index])
+ && $column_index
+ && isset($last_where)
+ && isset($this->_curAndOrCol)) {
+ $where_clause .= ' ' . strtoupper($this->_curAndOrCol[$last_where]) . ' ';
+ }
+ if (! empty($this->_curField[$column_index]) && ! empty($this->_curCriteria[$column_index])) {
+ $where_clause .= '(' . $this->_curField[$column_index] . ' '
+ . $this->_curCriteria[$column_index] . ')';
+ $last_where = $column_index;
+ $criteria_cnt++;
+ }
+ } // end for
+ if ($criteria_cnt > 1) {
+ $where_clause = '(' . $where_clause . ')';
+ }
+ // OR rows ${'cur' . $or}[$column_index]
+ if (! isset($this->_curAndOrRow)) {
+ $this->_curAndOrRow = array();
+ }
+ for ($row_index = 0; $row_index <= $this->_criteria_row_count; $row_index++) {
+ $criteria_cnt = 0;
+ $qry_orwhere = '';
+ $last_orwhere = '';
+ for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++) {
+ if (! empty($this->_curField[$column_index])
+ && ! empty(${'curOr' . $row_index}[$column_index])
+ && $column_index
+ ) {
+ $qry_orwhere .= ' ' . strtoupper($this->_curAndOrCol[$last_orwhere]) . ' ';
+ }
+ if (! empty($this->_curField[$column_index])
+ && ! empty(${'curOr' . $row_index}[$column_index])
+ ) {
+ $qry_orwhere .= '(' . $this->_curField[$column_index]
+ . ' '
+ . ${'curOr' . $row_index}[$column_index]
+ . ')';
+ $last_orwhere = $column_index;
+ $criteria_cnt++;
+ }
+ } // end for
+ if ($criteria_cnt > 1) {
+ $qry_orwhere = '(' . $qry_orwhere . ')';
+ }
+ if (! empty($qry_orwhere)) {
+ $where_clause .= "\n"
+ . strtoupper(isset($this->_curAndOrRow[$row_index]) ? $this->_curAndOrRow[$row_index] . ' ' : '')
+ . $qry_orwhere;
+ } // end if
+ } // end for
+
+ if (! empty($where_clause) && $where_clause != '()') {
+ $where_clause = 'WHERE ' . htmlspecialchars($where_clause) . "\n";
+ } // end if
+ return $where_clause;
+ }
+
+ /**
+ * Provides ORDER BY clause for building SQL query
+ *
+ * @return Order By clause
+ */
+ private function _getOrderByClause()
+ {
+ $orderby_clause = '';
+ $orderby_clauses = array();
+ for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++)
+ {
+ // if all columns are chosen with * selector, then sorting isn't available
+ // Fix for Bug #570698
+ if (! empty($this->_curField[$column_index])
+ && ! empty($this->_curSort[$column_index])
+ ) {
+ if (substr($this->_curField[$column_index], -2) == '.*') {
+ continue;
+ }
+ $orderby_clauses[] = $this->_curField[$column_index] . ' '
+ . $this->_curSort[$column_index];
+ }
+ } // end for
+ if ($orderby_clauses) {
+ $orderby_clause = 'ORDER BY '
+ . htmlspecialchars(implode(", ", $orderby_clauses)) . "\n";
+ }
+ return $orderby_clause;
+ }
+
+ /**
+ * Provides UNIQUE columns and INDEX columns present in criteria tables
+ *
+ * @param array $all_tables Tables involved in the search
+ * @param array $all_columns Columns involved in the search
+ * @param array $where_clause_columns Columns having criteria where clause
+ *
+ * @return array having UNIQUE and INDEX columns
+ */
+ private function _getIndexes($all_tables, $all_columns,
+ $where_clause_columns
+ ) {
+ $unique_columns = array();
+ $index_columns = array();
+
+ foreach ($all_tables as $table) {
+ $indexes = PMA_DBI_get_table_indexes($this->_db, $table);
+ foreach ($indexes as $index) {
+ $column = $table . '.' . $index['Column_name'];
+ if (isset($all_columns[$column])) {
+ if ($index['Non_unique'] == 0) {
+ if (isset($where_clause_columns[$column])) {
+ $unique_columns[$column] = 'Y';
+ } else {
+ $unique_columns[$column] = 'N';
+ }
+ } else {
+ if (isset($where_clause_columns[$column])) {
+ $index_columns[$column] = 'Y';
+ } else {
+ $index_columns[$column] = 'N';
+ }
+ }
+ }
+ } // end while (each index of a table)
+ } // end while (each table)
+
+ return array(
+ 'unique' => $unique_columns,
+ 'index' => $index_columns
+ );
+ }
+
+ /**
+ * Provides UNIQUE columns and INDEX columns present in criteria tables
+ *
+ * @param array $all_tables Tables involved in the search
+ * @param array $all_columns Columns involved in the search
+ * @param array $where_clause_columns Columns having criteria where clause
+ *
+ * @return array having UNIQUE and INDEX columns
+ */
+ private function _getLeftJoinColumnCandidates($all_tables, $all_columns,
+ $where_clause_columns
+ ) {
+ PMA_DBI_select_db($this->_db);
+ $candidate_columns = array();
+
+ // Get unique columns and index columns
+ $indexes = $this->_getIndexes(
+ $all_tables, $all_columns, $where_clause_columns
+ );
+ $unique_columns = $indexes['unique'];
+ $index_columns = $indexes['index'];
+
+ // now we want to find the best.
+ if (isset($unique_columns) && count($unique_columns) > 0) {
+ $candidate_columns = $unique_columns;
+ $needsort = 1;
+ } elseif (isset($index_columns) && count($index_columns) > 0) {
+ $candidate_columns = $index_columns;
+ $needsort = 1;
+ } elseif (isset($where_clause_columns) && count($where_clause_columns) > 0) {
+ $candidate_columns = $where_clause_columns;
+ $needsort = 0;
+ } else {
+ $candidate_columns = $all_tables;
+ $needsort = 0;
+ }
+
+ // If we came up with $unique_columns (very good) or $index_columns (still
+ // good) as $candidate_columns we want to check if we have any 'Y' there
+ // (that would mean that they were also found in the whereclauses
+ // which would be great). if yes, we take only those
+ if ($needsort == 1) {
+ foreach ($candidate_columns as $column => $is_where) {
+ $table = explode('.', $column);
+ $table = $table[0];
+ if ($is_where == 'Y') {
+ $vg[$column] = $table;
+ } else {
+ $sg[$column] = $table;
+ }
+ }
+ if (isset($vg)) {
+ $candidate_columns = $vg;
+ // Candidates restricted in index+where
+ } else {
+ $candidate_columns = $sg;
+ // None of the candidates where in a where-clause
+ }
+ }
+
+ return $candidate_columns;
+ }
+
+ /**
+ * Provides the main table to form the LEFT JOIN clause
+ *
+ * @param array $all_tables Tables involved in the search
+ * @param array $all_columns Columns involved in the search
+ * @param array $where_clause_columns Columns having criteria where clause
+ * @param array $where_clause_tables Tables having criteria where clause
+ *
+ * @return string table name
+ */
+ private function _getMasterTable($all_tables, $all_columns,
+ $where_clause_columns, $where_clause_tables
+ ) {
+ $master = '';
+ if (count($where_clause_tables) == 1) {
+ // If there is exactly one column that has a decent where-clause
+ // we will just use this
+ $master = key($where_clause_tables);
+ } else {
+ // Now let's find out which of the tables has an index
+ // (When the control user is the same as the normal user
+ // because he is using one of his databases as pmadb,
+ // the last db selected is not always the one where we need to work)
+ $candidate_columns = $this->_getLeftJoinColumnCandidates(
+ $all_tables, $all_columns, $where_clause_columns
+ );
+ // If our array of candidates has more than one member we'll just
+ // find the smallest table.
+ // Of course the actual query would be faster if we check for
+ // the Criteria which gives the smallest result set in its table,
+ // but it would take too much time to check this
+ if (count($candidate_columns) > 1) {
+ // Of course we only want to check each table once
+ $checked_tables = $candidate_columns;
+ foreach ($candidate_columns as $table) {
+ if ($checked_tables[$table] != 1) {
+ $tsize[$table] = PMA_Table::countRecords($this->_db, $table, false);
+ $checked_tables[$table] = 1;
+ }
+ $csize[$table] = $tsize[$table];
+ }
+ asort($csize);
+ reset($csize);
+ $master = key($csize); // Smallest
+ } else {
+ reset($candidate_columns);
+ $master = current($candidate_columns); // Only one single candidate
+ }
+ } // end if (exactly one where clause)
+ return $master;
+ }
+
+ /**
+ * Provides columns and tables that have valid where clause criteria
+ *
+ * @return array
+ */
+ private function _getWhereClauseTablesAndColumns()
+ {
+ $where_clause_columns = array();
+ $where_clause_tables = array();
+ // Now we need all tables that we have in the where clause
+ for ($column_index = 0; $column_index < count($this->_criteria); $column_index++) {
+ $current_table = explode('.', $_POST['criteriaColumn'][$column_index]);
+ if (empty($current_table[0]) || empty($current_table[1])) {
+ continue;
+ } // end if
+ $table = str_replace('`', '', $current_table[0]);
+ $column = str_replace('`', '', $current_table[1]);
+ $column = $table . '.' . $column;
+ // Now we know that our array has the same numbers as $criteria
+ // we can check which of our columns has a where clause
+ if (! empty($this->_criteria[$column_index])) {
+ if (substr($this->_criteria[$column_index], 0, 1) == '='
+ || stristr($this->_criteria[$column_index], 'is')
+ ) {
+ $where_clause_columns[$column] = $column;
+ $where_clause_tables[$table] = $table;
+ }
+ } // end if
+ } // end for
+ return array(
+ 'where_clause_tables' => $where_clause_tables,
+ 'where_clause_columns' => $where_clause_columns
+ );
+ }
+
+ /**
+ * Provides FROM clause for building SQL query
+ *
+ * @param string $cfgRelation Relation Settings
+ *
+ * @return FROM clause
+ */
+ private function _getFromClause($cfgRelation)
+ {
+ $from_clause = '';
+ if (isset($_POST['criteriaColumn']) && count($_POST['criteriaColumn']) > 0) {
+ // Initialize some variables
+ $all_tables = $all_columns = $known_tables = $remaining_tables = array();
+ $left_join = '';
+
+ // We only start this if we have fields, otherwise it would be dumb
+ foreach ($_POST['criteriaColumn'] as $value) {
+ $parts = explode('.', $value);
+ if (! empty($parts[0]) && ! empty($parts[1])) {
+ $table = str_replace('`', '', $parts[0]);
+ $all_tables[$table] = $table;
+ $all_columns[] = $table . '.' . str_replace('`', '', $parts[1]);
+ }
+ } // end while
+
+ // Create LEFT JOINS out of Relations
+ if ($cfgRelation['relwork'] && count($all_tables) > 0) {
+ // Get tables and columns with valid where clauses
+ $valid_where_clauses = $this->_getWhereClauseTablesAndColumns($this->_criteria);
+ $where_clause_tables = $valid_where_clauses['where_clause_tables'];
+ $where_clause_columns = $valid_where_clauses['where_clause_columns'];
+ // Get master table
+ $master = $this->_getMasterTable(
+ $all_tables, $all_columns, $where_clause_columns, $where_clause_tables
+ );
+ $from_clause = $this->getCommonFunctions()->backquote($master)
+ . PMA_getRelatives($all_tables, $master);
+
+ } // end if ($cfgRelation['relwork'] && count($all_tables) > 0)
+ } // end count($_POST['criteriaColumn']) > 0
+
+ // In case relations are not defined, just generate the FROM clause
+ // from the list of tables, however we don't generate any JOIN
+ if (empty($from_clause) && isset($all_tables)) {
+ $from_clause = implode(', ', $all_tables);
+ }
+ return $from_clause;
+ }
+
+ /**
+ * Provides the generated SQL query
+ *
+ * @return string SQL query
+ */
+ private function _getSQLQuery($cfgRelation)
+ {
+ $sql_query = '';
+ // get SELECT clause
+ $sql_query .= $this->_getSelectClause();
+ // get FROM clause
+ $from_clause = $this->_getFromClause($cfgRelation);
+ if (! empty($from_clause)) {
+ $sql_query .= 'FROM ' . htmlspecialchars($from_clause) . "\n";
+ }
+ // get WHERE clause
+ $sql_query .= $this->_getWhereClause();
+ // get ORDER BY clause
+ $sql_query .= $this->_getOrderByClause();
+ return $sql_query;
+ }
+
+ /**
+ * Provides the generated QBE form
+ *
+ * @return string QBE form
+ */
+ public function getSelectionForm($cfgRelation)
+ {
+ $html_output = '';
+ return $html_output;
+ }
+}
+?>
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index e1e0975675..62a09809ee 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -1161,54 +1161,66 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte
/**
* Finds all related tables
*
- * @param string $from whether to go from master to foreign or vice versa
- *
- * @return boolean always true
- *
- * @global array $tab_left the list of tables that we still couldn't connect
- * @global array $tab_know the list of allready connected tables
- * @global string $fromclause
+ * @param array $all_tables All the involved tables
+ * @param string $master The master table to form the LEFT JOIN clause
*
+ * @return string LEFT JOIN
* @access private
*/
-function PMA_getRelatives($from)
+function PMA_getRelatives($all_tables, $master)
{
- global $tab_left, $tab_know, $fromclause;
-
+ $fromclause = '';
+ $emerg = '';
$common_functions = PMA_CommonFunctions::getInstance();
-
- if ($from == 'master') {
- $to = 'foreign';
- } else {
- $to = 'master';
- }
- $in_know = '(\'' . implode('\', \'', $tab_know) . '\')';
- $in_left = '(\'' . implode('\', \'', $tab_left) . '\')';
-
- $rel_query = 'SELECT *'
- . ' FROM ' . $common_functions->backquote($GLOBALS['cfgRelation']['db'])
- . '.' . $common_functions->backquote($GLOBALS['cfgRelation']['relation'])
- . ' WHERE ' . $from . '_db = \'' . $common_functions->sqlAddSlashes($GLOBALS['db']) . '\''
- . ' AND ' . $to . '_db = \'' . $common_functions->sqlAddSlashes($GLOBALS['db']) . '\''
- . ' AND ' . $from . '_table IN ' . $in_know
- . ' AND ' . $to . '_table IN ' . $in_left;
- $relations = @PMA_DBI_query($rel_query, $GLOBALS['controllink']);
- while ($row = PMA_DBI_fetch_assoc($relations)) {
- $found_table = $row[$to . '_table'];
- if (isset($tab_left[$found_table])) {
- $fromclause
- .= "\n" . ' LEFT JOIN '
- . $common_functions->backquote($GLOBALS['db']) . '.' . $common_functions->backquote($row[$to . '_table']) . ' ON '
- . $common_functions->backquote($row[$from . '_table']) . '.'
- . $common_functions->backquote($row[$from . '_field']) . ' = '
- . $common_functions->backquote($row[$to . '_table']) . '.'
- . $common_functions->backquote($row[$to . '_field']) . ' ';
- $tab_know[$found_table] = $found_table;
- unset($tab_left[$found_table]);
+ // The list of tables that we still couldn't connect
+ $remaining_tables = $all_tables;
+ unset($remaining_tables[$master]);
+ // The list of allready connected tables
+ $known_tables[$master] = $master;
+ $run = 0;
+ while (count($remaining_tables) > 0) {
+ // Whether to go from master to foreign or vice versa
+ if ($run % 2 == 0) {
+ $from = 'master';
+ $to = 'foreign';
+ } else {
+ $from = 'foreign';
+ $to = 'master';
+ }
+ $in_know = '(\'' . implode('\', \'', $known_tables) . '\')';
+ $in_left = '(\'' . implode('\', \'', $remaining_tables) . '\')';
+ $rel_query = 'SELECT *'
+ . ' FROM ' . $common_functions->backquote($GLOBALS['cfgRelation']['db'])
+ . '.' . $common_functions->backquote($GLOBALS['cfgRelation']['relation'])
+ . ' WHERE ' . $from . '_db = \'' . $common_functions->sqlAddSlashes($GLOBALS['db']) . '\''
+ . ' AND ' . $to . '_db = \'' . $common_functions->sqlAddSlashes($GLOBALS['db']) . '\''
+ . ' AND ' . $from . '_table IN ' . $in_know
+ . ' AND ' . $to . '_table IN ' . $in_left;
+ $relations = @PMA_DBI_query($rel_query, $GLOBALS['controllink']);
+ while ($row = PMA_DBI_fetch_assoc($relations)) {
+ $found_table = $row[$to . '_table'];
+ if (isset($remaining_tables[$found_table])) {
+ $fromclause
+ .= "\n" . ' LEFT JOIN '
+ . $common_functions->backquote($GLOBALS['db']) . '.' . $common_functions->backquote($row[$to . '_table']) . ' ON '
+ . $common_functions->backquote($row[$from . '_table']) . '.'
+ . $common_functions->backquote($row[$from . '_field']) . ' = '
+ . $common_functions->backquote($row[$to . '_table']) . '.'
+ . $common_functions->backquote($row[$to . '_field']) . ' ';
+ $known_tables[$found_table] = $found_table;
+ unset($remaining_tables[$found_table]);
+ }
+ } // end while
+ $run++;
+ if ($run > 5) {
+ foreach ($remaining_tables as $table) {
+ $emerg .= ', ' . $common_functions->backquote($table);
+ unset($remaining_tables[$table]);
+ }
}
} // end while
-
- return true;
+ $fromclause = $emerg . $fromclause;
+ return $fromclause;
} // end of the "PMA_getRelatives()" function
/**