X-Git-Url: http://git.onelab.eu/?p=www-register-wizard.git;a=blobdiff_plain;f=database%2Fdrivers%2Foci8%2Foci8_driver.php;h=614571940210f2bf260e0a70d6e029fe3ad0ab10;hp=c4e13064a8d09ec1e137147795206e6357d6876f;hb=47598daa8c32dbbd72db83dc33f2ce91b3f6f7b0;hpb=4afb2fe256f094a1caf6bff14f51c6a88938cc9f

diff --git a/database/drivers/oci8/oci8_driver.php b/database/drivers/oci8/oci8_driver.php
index c4e1306..6145719 100644
--- a/database/drivers/oci8/oci8_driver.php
+++ b/database/drivers/oci8/oci8_driver.php
@@ -6,7 +6,7 @@
  *
  * @package	 	CodeIgniter
  * @author	  	ExpressionEngine Dev Team
- * @copyright   Copyright (c) 2008, EllisLab, Inc.
+ * @copyright   Copyright (c) 2008 - 2009, EllisLab, Inc.
  * @license	 	http://codeigniter.com/user_guide/license.html
  * @link		http://codeigniter.com
  * @since	   	Version 1.0
@@ -47,7 +47,11 @@ class CI_DB_oci8_driver extends CI_DB {
 	
 	// The character used for excaping
 	var $_escape_char = '"';
-
+	
+	// clause and character used for LIKE escape sequences
+	var $_like_escape_str = " escape '%s' ";
+	var $_like_escape_chr = '!';
+	
 	/**
 	 * The syntax to count rows is slightly different across different
 	 * database engines, so this string appears in each driver and is
@@ -93,6 +97,22 @@ class CI_DB_oci8_driver extends CI_DB {
 
 	// --------------------------------------------------------------------
 
+	/**
+	 * Reconnect
+	 *
+	 * Keep / reestablish the db connection if no queries have been
+	 * sent for a length of time exceeding the server's idle timeout
+	 *
+	 * @access	public
+	 * @return	void
+	 */
+	function reconnect()
+	{
+		// not implemented in oracle
+	}
+
+	// --------------------------------------------------------------------
+
 	/**
 	 * Select the database
 	 *
@@ -368,14 +388,35 @@ class CI_DB_oci8_driver extends CI_DB {
 	 *
 	 * @access  public
 	 * @param   string
+	 * @param	bool	whether or not the string will be used in a LIKE condition
 	 * @return  string
 	 */
-	function escape_str($str)
+	function escape_str($str, $like = FALSE)
 	{
+		if (is_array($str))
+		{
+			foreach($str as $key => $val)
+	   		{
+				$str[$key] = $this->escape_str($val, $like);
+	   		}
+   		
+	   		return $str;
+	   	}
+
 		// Access the CI object
 		$CI =& get_instance();
 
-		return $CI->_remove_invisible_characters($str);
+		$str = $CI->input->_remove_invisible_characters($str);
+		
+		// escape LIKE condition wildcards
+		if ($like === TRUE)
+		{
+			$str = str_replace(	array('%', '_', $this->_like_escape_chr),
+								array($this->_like_escape_chr.'%', $this->_like_escape_chr.'_', $this->_like_escape_chr.$this->_like_escape_chr),
+								$str);
+		}
+		
+		return $str;
 	}
 
 	// --------------------------------------------------------------------
@@ -420,17 +461,19 @@ class CI_DB_oci8_driver extends CI_DB {
 	function count_all($table = '')
 	{
 		if ($table == '')
-			return '0';
+		{
+			return 0;
+		}
 
-		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE));
+		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows') . " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE));
 
 		if ($query == FALSE)
-			{
+		{
 			return 0;
-			}
+		}
 
 		$row = $query->row();
-		return $row->NUMROWS;
+		return (int) $row->numrows;
 	}
 
 	// --------------------------------------------------------------------
@@ -450,7 +493,7 @@ class CI_DB_oci8_driver extends CI_DB {
 
 		if ($prefix_limit !== FALSE AND $this->dbprefix != '')
 		{
-			$sql .= " WHERE TABLE_NAME LIKE '".$this->dbprefix."%'";
+			$sql .= " WHERE TABLE_NAME LIKE '".$this->escape_like_str($this->dbprefix)."%' ".sprintf($this->_like_escape_str, $this->_like_escape_char);
 		}
 		
 		return $sql;
@@ -533,6 +576,17 @@ class CI_DB_oci8_driver extends CI_DB {
 		{
 			return $item;
 		}
+
+		foreach ($this->_reserved_identifiers as $id)
+		{
+			if (strpos($item, '.'.$id) !== FALSE)
+			{
+				$str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item);  
+				
+				// remove duplicates if the user already included the escape
+				return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str);
+			}		
+		}
 	
 		if (strpos($item, '.') !== FALSE)
 		{