From 9b3e7b5f2d4ec4feae793ef90454506addbb19e1 Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Mon, 4 Feb 2008 23:20:34 +0000
Subject: Added and documented Active Record caching. Made AR fully
 database-prefix aware

---
 system/database/drivers/mssql/mssql_driver.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'system/database/drivers/mssql')

diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
index ad747d4ad..ecd404b52 100644
--- a/system/database/drivers/mssql/mssql_driver.php
+++ b/system/database/drivers/mssql/mssql_driver.php
@@ -433,6 +433,13 @@ class CI_DB_mssql_driver extends CI_DB {
 	function _protect_identifiers($item, $affect_spaces = TRUE, $first_word_only = FALSE)
 	{
 		// MSSQL doesn't use backticks
+		if (strpos($item, '.') !== FALSE)
+		{
+			$aliased_tables = implode(".",$this->ar_aliased_tables).'.';
+			$table_name =  substr($item, 0, strpos($item, '.')+1);
+			$item = (strpos($aliased_tables, $table_name) !== FALSE) ? $item = $item : $this->dbprefix.$item;
+		}
+
 		return $item;
 	}
 			
-- 
cgit v1.2.3-24-g4f1b