summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/oci8
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-05-13 06:22:33 +0200
committerDerek Jones <derek.jones@ellislab.com>2008-05-13 06:22:33 +0200
commit0b59f270a432f8c7b6128981f0a39b4a2e2fbd34 (patch)
tree1e7655eabd76bb981692f5d4f21cb1fc7be3e9cd /system/database/drivers/oci8
parent5cf664748ee295867f593d7eb7991bd35fe8eca6 (diff)
Some sweeping syntax changes for consistency:
(! foo) changed to ( ! foo) || changed to OR changed newline standardization code in various places from preg_replace to str_replace
Diffstat (limited to 'system/database/drivers/oci8')
-rw-r--r--system/database/drivers/oci8/oci8_driver.php26
-rw-r--r--system/database/drivers/oci8/oci8_forge.php6
-rw-r--r--system/database/drivers/oci8/oci8_result.php6
-rw-r--r--system/database/drivers/oci8/oci8_utility.php6
4 files changed, 22 insertions, 22 deletions
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 367095990..2bc45258d 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -1,4 +1,4 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -155,7 +155,7 @@ class CI_DB_oci8_driver extends CI_DB {
*/
function _set_stmt_id($sql)
{
- if (! is_resource($this->stmt_id))
+ if ( ! is_resource($this->stmt_id))
{
$this->stmt_id = ociparse($this->conn_id, $this->_prep_query($sql));
}
@@ -254,7 +254,7 @@ class CI_DB_oci8_driver extends CI_DB {
*/
function _bind_params($params)
{
- if (! is_array($params) OR ! is_resource($this->stmt_id))
+ if ( ! is_array($params) OR ! is_resource($this->stmt_id))
{
return;
}
@@ -263,7 +263,7 @@ class CI_DB_oci8_driver extends CI_DB {
{
foreach (array('name', 'value', 'type', 'length') as $val)
{
- if (! isset($param[$val]))
+ if ( ! isset($param[$val]))
{
$param[$val] = '';
}
@@ -283,7 +283,7 @@ class CI_DB_oci8_driver extends CI_DB {
*/
function trans_begin($test_mode = FALSE)
{
- if (! $this->trans_enabled)
+ if ( ! $this->trans_enabled)
{
return TRUE;
}
@@ -313,7 +313,7 @@ class CI_DB_oci8_driver extends CI_DB {
*/
function trans_commit()
{
- if (! $this->trans_enabled)
+ if ( ! $this->trans_enabled)
{
return TRUE;
}
@@ -339,7 +339,7 @@ class CI_DB_oci8_driver extends CI_DB {
*/
function trans_rollback()
{
- if (! $this->trans_enabled)
+ if ( ! $this->trans_enabled)
{
return TRUE;
}
@@ -603,7 +603,7 @@ class CI_DB_oci8_driver extends CI_DB {
*/
function _from_tables($tables)
{
- if (! is_array($tables))
+ if ( ! is_array($tables))
{
$tables = array($tables);
}
@@ -651,7 +651,7 @@ class CI_DB_oci8_driver extends CI_DB {
$valstr[] = $key." = ".$val;
}
- $limit = (!$limit) ? '' : ' LIMIT '.$limit;
+ $limit = ( ! $limit) ? '' : ' LIMIT '.$limit;
$orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):'';
@@ -697,7 +697,7 @@ class CI_DB_oci8_driver extends CI_DB {
{
$conditions = '';
- if (count($where) > 0 || count($like) > 0)
+ if (count($where) > 0 OR count($like) > 0)
{
$conditions = "\nWHERE ";
$conditions .= implode("\n", $this->ar_where);
@@ -709,7 +709,7 @@ class CI_DB_oci8_driver extends CI_DB {
$conditions .= implode("\n", $like);
}
- $limit = (!$limit) ? '' : ' LIMIT '.$limit;
+ $limit = ( ! $limit) ? '' : ' LIMIT '.$limit;
return "DELETE FROM ".$table.$conditions.$limit;
}
@@ -761,6 +761,6 @@ class CI_DB_oci8_driver extends CI_DB {
}
-
-/* End of file oci8_driver.php */
+
+/* End of file oci8_driver.php */
/* Location: ./system/database/drivers/oci8/oci8_driver.php */ \ No newline at end of file
diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php
index 64dd2a202..9f3fac54f 100644
--- a/system/database/drivers/oci8/oci8_forge.php
+++ b/system/database/drivers/oci8/oci8_forge.php
@@ -1,4 +1,4 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -232,6 +232,6 @@ class CI_DB_oci8_forge extends CI_DB_forge {
}
-
-/* End of file oci8_forge.php */
+
+/* End of file oci8_forge.php */
/* Location: ./system/database/drivers/oci8/oci8_forge.php */ \ No newline at end of file
diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php
index 416c57de0..73373c882 100644
--- a/system/database/drivers/oci8/oci8_result.php
+++ b/system/database/drivers/oci8/oci8_result.php
@@ -1,4 +1,4 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -248,6 +248,6 @@ class CI_DB_oci8_result extends CI_DB_result {
}
-
-/* End of file oci8_result.php */
+
+/* End of file oci8_result.php */
/* Location: ./system/database/drivers/oci8/oci8_result.php */ \ No newline at end of file
diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php
index 93eaa226f..69d07f437 100644
--- a/system/database/drivers/oci8/oci8_utility.php
+++ b/system/database/drivers/oci8/oci8_utility.php
@@ -1,4 +1,4 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -117,6 +117,6 @@ class CI_DB_oci8_utility extends CI_DB_utility {
}
}
-
-/* End of file oci8_utility.php */
+
+/* End of file oci8_utility.php */
/* Location: ./system/database/drivers/oci8/oci8_utility.php */ \ No newline at end of file