diff --git a/db_search.php b/db_search.php
index 867d4774cf..329f7772ab 100644
--- a/db_search.php
+++ b/db_search.php
@@ -12,6 +12,7 @@
*
*/
require_once 'libraries/common.inc.php';
+require_once 'libraries/db_search.lib.php';
$response = PMA_Response::getInstance();
$header = $response->getHeader();
@@ -135,354 +136,4 @@ $response->addHTML(
(! empty($criteriaColumnName) ? $criteriaColumnName : '')
)
);
-
-/**
- * Builds the SQL search query
- *
- * @param string $table The table name
- * @param string $criteriaColumnName Restrict the search to this column
- * @param string $search_str the string to search
- * @param integer $search_option type of search
- * (1 -> 1 word at least, 2 -> all words,
- * 3 -> exact string, 4 -> regexp)
- *
- * @return array 3 SQL querys (for count, display and delete results)
- *
- * @todo can we make use of fulltextsearch IN BOOLEAN MODE for this?
- * PMA_backquote
- * PMA_DBI_free_result
- * PMA_DBI_fetch_assoc
- * $GLOBALS['db']
- * explode
- * count
- * strlen
- */
-function PMA_getSearchSqls($table, $criteriaColumnName, $search_str, $search_option)
-{
- // Statement types
- $sqlstr_select = 'SELECT';
- $sqlstr_delete = 'DELETE';
- // Table to use
- $sqlstr_from = ' FROM ' . PMA_backquote($GLOBALS['db']) . '.' . PMA_backquote($table);
- // Search words or pattern
- $search_words = (($search_option > 2)
- ? array($search_str) : explode(' ', $search_str));
-
- $like_or_regex = (($search_option == 4) ? 'REGEXP' : 'LIKE');
- $automatic_wildcard = (($search_option < 3) ? '%' : '');
-
- $where_clause = PMA_dbSearchGetWhereClause(
- $table, $search_words, $search_option, $criteriaColumnName, $like_or_regex,
- $automatic_wildcard
- );
-
- // Builds complete queries
- $sql['select_columns'] = $sqlstr_select . ' * ' . $sqlstr_from . $where_clause;
- // here, I think we need to still use the COUNT clause, even for
- // VIEWs, anyway we have a WHERE clause that should limit results
- $sql['select_count'] = $sqlstr_select . ' COUNT(*) AS `count`'
- . $sqlstr_from . $where_clause;
- $sql['delete'] = $sqlstr_delete . $sqlstr_from . $where_clause;
-
- return $sql;
-}
-
-/**
- * Provides where clause for bulding SQL query
- *
- * @param string $table the table name
- * @param integer $search_words Search words or pattern
- * @param integer $search_option type of search
- * (1 -> 1 word at least, 2 -> all words,
- * 3 -> exact string, 4 -> regexp)
- * @param string $criteriaColumnName Restrict the search to this column
- * @param string $like_or_regex Whether to use 'LIKE' or 'REGEXP'
- * @param string $automatic_wildcard Use automatic wildcard
- *
- * @return string The generated where clause
- */
-function PMA_dbSearchGetWhereClause($table, $search_words, $search_option,
- $criteriaColumnName, $like_or_regex, $automatic_wildcard
-) {
- $where_clause = '';
- // Columns to select
- $allColumns = PMA_DBI_get_columns($GLOBALS['db'], $table);
- $likeClauses = array();
-
- foreach ($search_words as $search_word) {
- // Eliminates empty values
- if (strlen($search_word) === 0) {
- continue;
- }
- $likeClausesPerColumn = array();
- // for each column in the table
- foreach ($allColumns as $column) {
- if (! isset($criteriaColumnName)
- || strlen($criteriaColumnName) == 0
- || $column['Field'] == $criteriaColumnName
- ) {
- // Drizzle has no CONVERT and all text columns are UTF-8
- $column = ((PMA_DRIZZLE)
- ? PMA_backquote($column['Field'])
- : 'CONVERT(' . PMA_backquote($column['Field']) . ' USING utf8)');
- $likeClausesPerColumn[] = $column . ' ' . $like_or_regex . ' '
- . "'"
- . $automatic_wildcard . $search_word . $automatic_wildcard
- . "'";
- }
- } // end for
- if (count($likeClausesPerColumn) > 0) {
- $likeClauses[] = implode(' OR ', $likeClausesPerColumn);
- }
- } // end for
-
- $implode_str = ($search_option == 1 ? ' OR ' : ' AND ');
- if ( empty($likeClauses)) {
- // this could happen when the "inside column" does not exist
- // in any selected tables
- $where_clause = ' WHERE FALSE';
- } else {
- $where_clause = ' WHERE (' . implode(') ' . $implode_str . ' (', $likeClauses) . ')';
- }
- return $where_clause;
-}
-
-/**
- * Displays database search results
- *
- * @param array $tables_selected Tables on which search is to be performed
- * @param string $searched The search word/phrase/regexp
- * @param string $option_str Type of search
- * @param string $search_str the string to search
- * @param integer $search_option type of search
- * (1 -> 1 word at least, 2 -> all words,
- * 3 -> exact string, 4 -> regexp)
- * @param string $criteriaColumnName Restrict the search to this column
- *
- * @return string HTML for search results
- */
-function PMA_dbSearchGetSearchResults($tables_selected, $searched, $option_str,
- $search_str, $search_option, $criteriaColumnName = null
-) {
- $html_output = '';
- // Displays search string
- $html_output .= '
'
- . ''
- . '';
-
- $num_search_result_total = 0;
- $odd_row = true;
- // For each table selected as search criteria
- foreach ($tables_selected as $each_table) {
- // Gets the SQL statements
- $newsearchsqls = PMA_getSearchSqls(
- $each_table, (! empty($criteriaColumnName) ? $criteriaColumnName : ''),
- $search_str, $search_option
- );
- // Executes the "COUNT" statement
- $res_cnt = PMA_DBI_fetch_value($newsearchsqls['select_count']);
- $num_search_result_total += $res_cnt;
- $html_output .= PMA_dbSearchGetResultsRow(
- $each_table, $newsearchsqls, $odd_row
- );
- $odd_row = ! $odd_row;
- } // end for
- $html_output .= '
';
-
- if (count($tables_selected) > 1) {
- $html_output .= '';
- $html_output .= sprintf(
- _ngettext(
- 'Total: %s match',
- 'Total: %s matches',
- $num_search_result_total
- ),
- $num_search_result_total
- );
- $html_output .= '
';
- }
- return $html_output;
-}
-
-/**
- * Provides search results row with browse/delete links.
- * (for a table)
- *
- * @param string $each_table Tables on which search is to be performed
- * @param array $newsearchsqls Contains SQL queries
- * @param bool $odd_row For displaying contrasting table rows
- *
- * @return string HTML row
- */
-function PMA_dbSearchGetResultsRow($each_table, $newsearchsqls, $odd_row)
-{
- $this_url_params = array(
- 'db' => $GLOBALS['db'],
- 'goto' => 'db_sql.php',
- 'pos' => 0,
- 'is_js_confirmed' => 0,
- );
- $res_cnt = PMA_DBI_fetch_value($newsearchsqls['select_count']);
- // Start forming search results row
- $html_output = '';
- $html_output .= '| ';
- $html_output .= sprintf(
- _ngettext(
- '%1$s match in %2$s',
- '%1$s matches in %2$s', $res_cnt
- ),
- $res_cnt, htmlspecialchars($each_table)
- );
- $html_output .= ' | ';
-
- if ($res_cnt > 0) {
- $this_url_params['sql_query'] = $newsearchsqls['select_columns'];
- $browse_result_path = 'sql.php' . PMA_generate_common_url($this_url_params);
- $html_output .= ''
- . __('Browse') . ' | ';
- $this_url_params['sql_query'] = $newsearchsqls['delete'];
- $delete_result_path = 'sql.php' . PMA_generate_common_url($this_url_params);
- $html_output .= ''
- . __('Delete') . ' | ';
- } else {
- $html_output .= ' | '
- .' | ';
- }// end if else
- $html_output .= '
';
- return $html_output;
-}
-
-/**
- * Provides the main search form's html
- *
- * @param string $searched Keyword/Regular expression to be searched
- * @param integer $search_option Type of search (one word, phrase etc.)
- * @param array $tables_names_only Names of all tables
- * @param array $tables_selected Tables on which search is to be performed
- * @param array $url_params URL parameters
- * @param string $criteriaColumnName Restrict the search to this column
- *
- * @return string HTML for selection form
- */
-function PMA_dbSearchGetSelectionForm($searched, $search_option, $tables_names_only,
- $tables_selected, $url_params, $criteriaColumnName = null
-) {
- $html_output = '';
- $html_output .= '';
- $html_output .= getResultDivs();
-
- return $html_output;
-}
-
-/**
- * Provides div tags for browsing search results and sql query form.
- *
- * @return string div tags
- */
-function getResultDivs()
-{
- $html_output = '';
- $html_output .= '';
- $html_output .= '
';
- $html_output .= '
';
- $html_output .= '';
- $html_output .= '
';
- $html_output .= '
';
- $html_output .= '';
- $html_output .= '';
- $html_output .= '
';
- $html_output .= '';
- $html_output .= '';
- return $html_output;
-}
?>
diff --git a/libraries/db_search.lib.php b/libraries/db_search.lib.php
new file mode 100644
index 0000000000..5a4266c5ef
--- /dev/null
+++ b/libraries/db_search.lib.php
@@ -0,0 +1,361 @@
+ 1 word at least, 2 -> all words,
+ * 3 -> exact string, 4 -> regexp)
+ *
+ * @return array 3 SQL querys (for count, display and delete results)
+ *
+ * @todo can we make use of fulltextsearch IN BOOLEAN MODE for this?
+ * PMA_backquote
+ * PMA_DBI_free_result
+ * PMA_DBI_fetch_assoc
+ * $GLOBALS['db']
+ * explode
+ * count
+ * strlen
+ */
+function PMA_getSearchSqls($table, $criteriaColumnName, $search_str, $search_option)
+{
+ // Statement types
+ $sqlstr_select = 'SELECT';
+ $sqlstr_delete = 'DELETE';
+ // Table to use
+ $sqlstr_from = ' FROM ' . PMA_backquote($GLOBALS['db']) . '.' . PMA_backquote($table);
+ // Search words or pattern
+ $search_words = (($search_option > 2)
+ ? array($search_str) : explode(' ', $search_str));
+
+ $like_or_regex = (($search_option == 4) ? 'REGEXP' : 'LIKE');
+ $automatic_wildcard = (($search_option < 3) ? '%' : '');
+
+ $where_clause = PMA_dbSearchGetWhereClause(
+ $table, $search_words, $search_option, $criteriaColumnName, $like_or_regex,
+ $automatic_wildcard
+ );
+
+ // Builds complete queries
+ $sql['select_columns'] = $sqlstr_select . ' * ' . $sqlstr_from . $where_clause;
+ // here, I think we need to still use the COUNT clause, even for
+ // VIEWs, anyway we have a WHERE clause that should limit results
+ $sql['select_count'] = $sqlstr_select . ' COUNT(*) AS `count`'
+ . $sqlstr_from . $where_clause;
+ $sql['delete'] = $sqlstr_delete . $sqlstr_from . $where_clause;
+
+ return $sql;
+}
+
+/**
+ * Provides where clause for bulding SQL query
+ *
+ * @param string $table the table name
+ * @param integer $search_words Search words or pattern
+ * @param integer $search_option type of search
+ * (1 -> 1 word at least, 2 -> all words,
+ * 3 -> exact string, 4 -> regexp)
+ * @param string $criteriaColumnName Restrict the search to this column
+ * @param string $like_or_regex Whether to use 'LIKE' or 'REGEXP'
+ * @param string $automatic_wildcard Use automatic wildcard
+ *
+ * @return string The generated where clause
+ */
+function PMA_dbSearchGetWhereClause($table, $search_words, $search_option,
+ $criteriaColumnName, $like_or_regex, $automatic_wildcard
+) {
+ $where_clause = '';
+ // Columns to select
+ $allColumns = PMA_DBI_get_columns($GLOBALS['db'], $table);
+ $likeClauses = array();
+
+ foreach ($search_words as $search_word) {
+ // Eliminates empty values
+ if (strlen($search_word) === 0) {
+ continue;
+ }
+ $likeClausesPerColumn = array();
+ // for each column in the table
+ foreach ($allColumns as $column) {
+ if (! isset($criteriaColumnName)
+ || strlen($criteriaColumnName) == 0
+ || $column['Field'] == $criteriaColumnName
+ ) {
+ // Drizzle has no CONVERT and all text columns are UTF-8
+ $column = ((PMA_DRIZZLE)
+ ? PMA_backquote($column['Field'])
+ : 'CONVERT(' . PMA_backquote($column['Field']) . ' USING utf8)');
+ $likeClausesPerColumn[] = $column . ' ' . $like_or_regex . ' '
+ . "'"
+ . $automatic_wildcard . $search_word . $automatic_wildcard
+ . "'";
+ }
+ } // end for
+ if (count($likeClausesPerColumn) > 0) {
+ $likeClauses[] = implode(' OR ', $likeClausesPerColumn);
+ }
+ } // end for
+
+ $implode_str = ($search_option == 1 ? ' OR ' : ' AND ');
+ if ( empty($likeClauses)) {
+ // this could happen when the "inside column" does not exist
+ // in any selected tables
+ $where_clause = ' WHERE FALSE';
+ } else {
+ $where_clause = ' WHERE (' . implode(') ' . $implode_str . ' (', $likeClauses) . ')';
+ }
+ return $where_clause;
+}
+
+/**
+ * Displays database search results
+ *
+ * @param array $tables_selected Tables on which search is to be performed
+ * @param string $searched The search word/phrase/regexp
+ * @param string $option_str Type of search
+ * @param string $search_str the string to search
+ * @param integer $search_option type of search
+ * (1 -> 1 word at least, 2 -> all words,
+ * 3 -> exact string, 4 -> regexp)
+ * @param string $criteriaColumnName Restrict the search to this column
+ *
+ * @return string HTML for search results
+ */
+function PMA_dbSearchGetSearchResults($tables_selected, $searched, $option_str,
+ $search_str, $search_option, $criteriaColumnName = null
+) {
+ $html_output = '';
+ // Displays search string
+ $html_output .= '
'
+ . ''
+ . '';
+
+ $num_search_result_total = 0;
+ $odd_row = true;
+ // For each table selected as search criteria
+ foreach ($tables_selected as $each_table) {
+ // Gets the SQL statements
+ $newsearchsqls = PMA_getSearchSqls(
+ $each_table, (! empty($criteriaColumnName) ? $criteriaColumnName : ''),
+ $search_str, $search_option
+ );
+ // Executes the "COUNT" statement
+ $res_cnt = PMA_DBI_fetch_value($newsearchsqls['select_count']);
+ $num_search_result_total += $res_cnt;
+ $html_output .= PMA_dbSearchGetResultsRow(
+ $each_table, $newsearchsqls, $odd_row
+ );
+ $odd_row = ! $odd_row;
+ } // end for
+ $html_output .= '
';
+
+ if (count($tables_selected) > 1) {
+ $html_output .= '';
+ $html_output .= sprintf(
+ _ngettext(
+ 'Total: %s match',
+ 'Total: %s matches',
+ $num_search_result_total
+ ),
+ $num_search_result_total
+ );
+ $html_output .= '
';
+ }
+ return $html_output;
+}
+
+/**
+ * Provides search results row with browse/delete links.
+ * (for a table)
+ *
+ * @param string $each_table Tables on which search is to be performed
+ * @param array $newsearchsqls Contains SQL queries
+ * @param bool $odd_row For displaying contrasting table rows
+ *
+ * @return string HTML row
+ */
+function PMA_dbSearchGetResultsRow($each_table, $newsearchsqls, $odd_row)
+{
+ $this_url_params = array(
+ 'db' => $GLOBALS['db'],
+ 'goto' => 'db_sql.php',
+ 'pos' => 0,
+ 'is_js_confirmed' => 0,
+ );
+ $res_cnt = PMA_DBI_fetch_value($newsearchsqls['select_count']);
+ // Start forming search results row
+ $html_output = '';
+ $html_output .= '| ';
+ $html_output .= sprintf(
+ _ngettext(
+ '%1$s match in %2$s',
+ '%1$s matches in %2$s', $res_cnt
+ ),
+ $res_cnt, htmlspecialchars($each_table)
+ );
+ $html_output .= ' | ';
+
+ if ($res_cnt > 0) {
+ $this_url_params['sql_query'] = $newsearchsqls['select_columns'];
+ $browse_result_path = 'sql.php' . PMA_generate_common_url($this_url_params);
+ $html_output .= ''
+ . __('Browse') . ' | ';
+ $this_url_params['sql_query'] = $newsearchsqls['delete'];
+ $delete_result_path = 'sql.php' . PMA_generate_common_url($this_url_params);
+ $html_output .= ''
+ . __('Delete') . ' | ';
+ } else {
+ $html_output .= ' | '
+ .' | ';
+ }// end if else
+ $html_output .= '
';
+ return $html_output;
+}
+
+/**
+ * Provides the main search form's html
+ *
+ * @param string $searched Keyword/Regular expression to be searched
+ * @param integer $search_option Type of search (one word, phrase etc.)
+ * @param array $tables_names_only Names of all tables
+ * @param array $tables_selected Tables on which search is to be performed
+ * @param array $url_params URL parameters
+ * @param string $criteriaColumnName Restrict the search to this column
+ *
+ * @return string HTML for selection form
+ */
+function PMA_dbSearchGetSelectionForm($searched, $search_option, $tables_names_only,
+ $tables_selected, $url_params, $criteriaColumnName = null
+) {
+ $html_output = '';
+ $html_output .= '';
+ $html_output .= getResultDivs();
+
+ return $html_output;
+}
+
+/**
+ * Provides div tags for browsing search results and sql query form.
+ *
+ * @return string div tags
+ */
+function getResultDivs()
+{
+ $html_output = '';
+ $html_output .= '';
+ $html_output .= '
';
+ $html_output .= '
';
+ $html_output .= '';
+ $html_output .= '
';
+ $html_output .= '
';
+ $html_output .= '';
+ $html_output .= '';
+ $html_output .= '
';
+ $html_output .= '';
+ $html_output .= '';
+ return $html_output;
+}
+?>