Merge pull request #154 from dovg/dblink-property

Dblink property

Author: dovg

doc/ChangeLog

@@ -1,3 +1,9 @@
+2012-12-06  Evgeny V. Kokovikhin
+	* main/DAOs/GenericDAO.class.php 
+		meta/builders/AutoDaoBuilder.class.php 
+		meta/builders/BaseBuilder.class.php:
+			dbLink became a property
+
 2012-11-25  Alexey S. Denisov
 
 	* core/Form/Primitives/PrimitiveIdentifier.class.php

main/DAOs/GenericDAO.class.php

@@ -18,6 +18,8 @@ abstract class GenericDAO extends Singleton implements BaseDAO
 	{
 		private $identityMap	= array();
 
+		protected $linkName		= null;
+		
 		abstract public function getTable();
 		abstract public function getObjectName();
 
@@ -71,7 +73,7 @@ public function completeObject(Identifiable $object)
 		**/
 		public function getLinkName()
 		{
-			return null;
+			return $this->linkName;
 		}
 
 		public function getIdName()

meta/builders/AutoDaoBuilder.class.php

@@ -37,7 +37,7 @@ abstract class Auto{$class->getName()}DAO extends {$parentName}
 {
 
 EOT;
-
+			
 			$out .= self::buildPointers($class)."\n}\n";
 
 			return $out.self::getHeel();

meta/builders/BaseBuilder.class.php

@@ -24,6 +24,14 @@ protected static function buildPointers(MetaClass $class)
 			$out = null;
 
 			if (!$class->getPattern() instanceof AbstractClassPattern) {
+				if ($source = $class->getSourceLink()) {
+					$out .= <<<EOT
+	protected \$linkName =  '{$source}';
+	
+
+EOT;
+				}
+				
 				if (
 					$class->getIdentifier()->getColumnName() !== 'id'
 				) {
@@ -78,17 +86,6 @@ public function uncacheLists()
 EOT;
 			}
 
-			if ($source = $class->getSourceLink()) {
-				$out .= <<<EOT
-
-
-public function getLinkName()
-{
-	return '{$source}';
-}
-EOT;
-			}
-			
 			return $out;
 		}