From 94e94e0a8566f23d16658a04c55b0bbfdd6689aa Mon Sep 17 00:00:00 2001
From: "godzilla80@gmx.net" <>
Date: Sun, 14 Feb 2010 01:22:57 +0000
Subject: Merge Branches & Trunk /trunk:r2680,2692,2707-2736
 /branches/3.1:r2682-2686,2694-2702,2705,2738-2762

---
 framework/Data/Common/TDbTableInfo.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'framework/Data/Common/TDbTableInfo.php')

diff --git a/framework/Data/Common/TDbTableInfo.php b/framework/Data/Common/TDbTableInfo.php
index e2aae3d0..455dbc33 100644
--- a/framework/Data/Common/TDbTableInfo.php
+++ b/framework/Data/Common/TDbTableInfo.php
@@ -27,7 +27,13 @@ class TDbTableInfo extends TComponent
 
 	private $_columns;
 
-	private $_lowercase;
+	private $_lowercase;
+
+	/**
+	 * @var null|array
+	 * @since 3.1.7
+	 */
+	private $_names = null;
 
 	/**
 	 * Sets the database table meta data information.
@@ -118,11 +124,14 @@ class TDbTableInfo extends TComponent
 	 * @return array table column names (identifier quoted)
 	 */
 	public function getColumnNames()
-	{
-		$names=array();
-		foreach($this->getColumns() as $column)
-			$names[] = $column->getColumnName();
-		return $names;
+	{
+		if($this->_names===null)
+		{
+			$this->_names=array();
+			foreach($this->getColumns() as $column)
+				$this->_names[] = $column->getColumnName();
+		}
+		return $this->_names;
 	}
 
 	/**
@@ -154,5 +163,4 @@ class TDbTableInfo extends TComponent
 		}
 		return $this->_lowercase;
 	}
-}
-
+}
\ No newline at end of file
-- 
cgit v1.2.3