From 903cc985da13463369a4cb1831ccbe5449316ee7 Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Mon, 11 Feb 2008 06:06:59 +0000
Subject: remove backticks from ODBC

---
 system/database/drivers/odbc/odbc_driver.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'system/database/drivers')

diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index fd2460853..bdedab32f 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -386,11 +386,7 @@ class CI_DB_odbc_driver extends CI_DB {
 	 */
 	function _escape_table($table)
 	{
-		if (strpos($table, '.') !== FALSE)
-		{
-			$table = '`' . str_replace('.', '`.`', $table) . '`';
-		}
-		
+		// used to add backticks in other db drivers		
 		return $table;
 	}
 		
@@ -438,7 +434,7 @@ class CI_DB_odbc_driver extends CI_DB {
 		}
 		else
 		{
-			return "`{$item}`";
+			return "{$item}";
 		}
 
 		$exceptions = array('AS', '/', '-', '%', '+', '*');
@@ -446,9 +442,9 @@ class CI_DB_odbc_driver extends CI_DB {
 		foreach ($exceptions as $exception)
 		{
 		
-			if (stristr($item, " `{$exception}` ") !== FALSE)
+			if (stristr($item, " {$exception} ") !== FALSE)
 			{
-				$item = preg_replace('/ `('.preg_quote($exception).')` /i', ' $1 ', $item);
+				$item = preg_replace('/ ('.preg_quote($exception).') /i', ' $1 ', $item);
 			}
 		}
 		return $item;
-- 
cgit v1.2.3-24-g4f1b