aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db/driver/postgres.php
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2012-11-12 11:10:25 +0100
committerIgor Wiedler <igor@wiedler.ch>2012-11-12 11:16:39 +0100
commit0fd3bb170b95bc8c99329e47990e38c038629075 (patch)
tree4222da246667aba91d51a4c2e335c317a766f18a /phpBB/includes/db/driver/postgres.php
parentbf641a7f31f87eb7b88437214315872bff36ae84 (diff)
downloadforums-0fd3bb170b95bc8c99329e47990e38c038629075.tar
forums-0fd3bb170b95bc8c99329e47990e38c038629075.tar.gz
forums-0fd3bb170b95bc8c99329e47990e38c038629075.tar.bz2
forums-0fd3bb170b95bc8c99329e47990e38c038629075.tar.xz
forums-0fd3bb170b95bc8c99329e47990e38c038629075.zip
[ticket/11015] Fixup some things from the big merge
PHPBB3-11015
Diffstat (limited to 'phpBB/includes/db/driver/postgres.php')
-rw-r--r--phpBB/includes/db/driver/postgres.php18
1 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/includes/db/driver/postgres.php b/phpBB/includes/db/driver/postgres.php
index 3f54936d23..147ecd04d9 100644
--- a/phpBB/includes/db/driver/postgres.php
+++ b/phpBB/includes/db/driver/postgres.php
@@ -187,13 +187,13 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
global $cache;
// EXPLAIN only in extra debug mode
- if (defined('DEBUG_EXTRA'))
+ if (defined('DEBUG'))
{
$this->sql_report('start', $query);
}
$this->last_query_text = $query;
- $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+ $this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
$this->sql_add_num_queries($this->query_result);
if ($this->query_result === false)
@@ -203,22 +203,22 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
$this->sql_error($query);
}
- if (defined('DEBUG_EXTRA'))
+ if (defined('DEBUG'))
{
$this->sql_report('stop', $query);
}
- if ($cache_ttl && method_exists($cache, 'sql_save'))
+ if ($cache_ttl)
{
$this->open_queries[(int) $this->query_result] = $this->query_result;
- $cache->sql_save($query, $this->query_result, $cache_ttl);
+ $this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
}
else if (strpos($query, 'SELECT') === 0 && $this->query_result)
{
$this->open_queries[(int) $this->query_result] = $this->query_result;
}
}
- else if (defined('DEBUG_EXTRA'))
+ else if (defined('DEBUG'))
{
$this->sql_report('fromcache', $query);
}
@@ -278,7 +278,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
$query_id = $this->query_result;
}
- if (isset($cache->sql_rowset[$query_id]))
+ if ($cache->sql_exists($query_id))
{
return $cache->sql_fetchrow($query_id);
}
@@ -299,7 +299,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
$query_id = $this->query_result;
}
- if (isset($cache->sql_rowset[$query_id]))
+ if ($cache->sql_exists($query_id))
{
return $cache->sql_rowseek($rownum, $query_id);
}
@@ -348,7 +348,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
$query_id = $this->query_result;
}
- if (isset($cache->sql_rowset[$query_id]))
+ if ($cache->sql_exists($query_id))
{
return $cache->sql_freeresult($query_id);
}