mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-10 17:45:18 +02:00
Code Issues Releases Wiki Activity

[feature/postgresql-fulltext-search] remove backward compatibility

Browse Source 
removes backward compatibility before PostgreSQL ver 8.3
if version is before 8.3 displays error.

PHPBB3-9730
This commit is contained in:
Dhruv Goel 2012-06-10 17:11:30 +05:30
parent f83da6c0ef
commit d1a49e01ce
1 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
phpBB/includes/search/fulltext_postgres.php
View File

@ -60,12 +60,6 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
{
$this->tsearch_builtin = true;
}
if (!$this->tsearch_builtin)
{
$db->sql_query("SELECT set_curcfg('" . $db->sql_escape($config['fulltext_postgres_ts_name']) . "')");
}
}
$error = false;
@ -94,21 +88,9 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
}
if (!$this->tsearch_builtin)
{
$sql = "SELECT c.relname
FROM pg_catalog.pg_class c
WHERE c.relkind = 'r'
AND c.relname = 'pg_ts_cfg'
AND pg_catalog.pg_table_is_visible(c.oid)";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
if (empty ($row['relname']))
{
return $user->lang['FULLTEXT_POSTGRES_TS_NOT_FOUND'];
}
}
return false;
}
@ -480,16 +462,9 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
$tmp_sql_match = array();
foreach (explode(',', $sql_match) as $sql_match_column)
{
if ($this->tsearch_builtin)
{
$tmp_sql_match[] = "to_tsvector ('" . $db->sql_escape($config['fulltext_postgres_ts_name']) . "', " . $sql_match_column . ") @@ to_tsquery ('" . $db->sql_escape($config['fulltext_postgres_ts_name']) . "', '" . $db->sql_escape($this->tsearch_query) . "')";
}
else
{
$tmp_sql_match[] = "to_tsvector (" . $sql_match_column . ") @@ to_tsquery ('" . $db->sql_escape($this->tsearch_query) . "')";
}
}
$sql = "SELECT $sql_select
FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p
@ -889,19 +864,10 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
<dt><label>' . $user->lang['FULLTEXT_POSTGRES_TS_NAME'] . '</label><br /><span>' . $user->lang['FULLTEXT_POSTGRES_TS_NAME_EXPLAIN'] . '</span></dt>
<dd><select name="config[fulltext_postgres_ts_name]">';
if ($db->sql_layer == 'postgres')
{
if ($this->tsearch_builtin)
if ($db->sql_layer == 'postgres' && $this->tsearch_builtin)
{
$sql = 'SELECT cfgname AS ts_name
FROM pg_ts_config';
}
else
{
$sql = 'SELECT *
FROM pg_ts_cfg';
}
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))