From 7d264396df47c17675dd70601a19cb3a06a45ff0 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 2 Jun 2006 13:26:27 +0000
Subject: some adjustments nils: please have a look at the @todo comment in
mcp_queue.php
git-svn-id: file:///svn/phpbb/trunk@6002 89ea8834-ac86-4346-8a33-228a782c2dd0
---
phpBB/includes/db/oracle.php | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
(limited to 'phpBB/includes/db/oracle.php')
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index f2499c5456..d9a7298c04 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -57,7 +57,7 @@ class dbal_oracle extends dbal
case 'begin':
$result = true;
$this->transaction = true;
- break;
+ break;
case 'commit':
$result = @ocicommit($this->db_connect_id);
@@ -67,12 +67,12 @@ class dbal_oracle extends dbal
{
@ocirollback($this->db_connect_id);
}
- break;
+ break;
case 'rollback':
$result = @ocirollback($this->db_connect_id);
$this->transaction = false;
- break;
+ break;
default:
$result = true;
@@ -90,13 +90,12 @@ class dbal_oracle extends dbal
{
global $cache;
-
// EXPLAIN only in extra debug mode
if (defined('DEBUG_EXTRA'))
{
$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->sql_add_num_queries($this->query_result);
@@ -128,7 +127,7 @@ class dbal_oracle extends dbal
$this->sql_transaction('commit');
}
}
-
+
if (defined('DEBUG_EXTRA'))
{
$this->sql_report('stop', $query);
@@ -161,19 +160,19 @@ class dbal_oracle extends dbal
* Build LIMIT query
*/
function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
- {
- if ($query != '')
+ {
+ if ($query != '')
{
$this->query_result = false;
$query = 'SELECT * FROM (SELECT /*+ FIRST_ROWS */ rownum AS xrownum, a.* FROM (' . $query . ') a WHERE rownum <= ' . ($offset + $total) . ') WHERE xrownum >= ' . $offset;
return $this->sql_query($query, $cache_ttl);
- }
- else
- {
+ }
+ else
+ {
return false;
- }
+ }
}
/**
@@ -220,7 +219,7 @@ class dbal_oracle extends dbal
{
return $cache->sql_fetchrow($query_id);
}
-
+
$row = array();
$result = @ocifetchinto($query_id, $row, OCI_ASSOC + OCI_RETURN_NULLS);
@@ -261,11 +260,11 @@ class dbal_oracle extends dbal
{
$this->sql_rowseek($rownum, $query_id);
}
-
+
$row = $this->sql_fetchrow($query_id);
return isset($row[$field]) ? $row[$field] : false;
}
-
+
return false;
}
--
cgit v1.2.1