Merge Branches & Trunk

/trunk:r2680,2692,2707-2736
/branches/3.1:r2682-2686,2694-2702,2705,2738-2762

1 files changed, 16 insertions, 8 deletions

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