From 85ef90fd029ed559f19324c0621560dee8892c15 Mon Sep 17 00:00:00 2001
From: "Jonathan.Wage" <Jonathan.Wage@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 15 Nov 2007 23:22:18 +0000
Subject: [PATCH] Fixed connection binding so it is only put in the base class.

---
 lib/Doctrine/Import/Builder.php | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/lib/Doctrine/Import/Builder.php b/lib/Doctrine/Import/Builder.php
index fa2c89331..0ff6ede01 100644
--- a/lib/Doctrine/Import/Builder.php
+++ b/lib/Doctrine/Import/Builder.php
@@ -684,6 +684,7 @@ END;
             $topLevel['no_definition'] = true;
             $topLevel['generate_once'] = true;
             $topLevel['is_main_class'] = true;
+            unset($topLevel['connection']);
 
             // Package level definition that extends from the base definition
             if (isset($options['package'])) {
@@ -696,6 +697,7 @@ END;
                 $packageLevel['override_parent'] = true;
                 $packageLevel['generate_once'] = true;
                 $packageLevel['is_package_class'] = true;
+                unset($packageLevel['connection']);
             }
 
             $baseClass = $options;
@@ -807,19 +809,9 @@ END;
             
             $writePath = $this->_path . DIRECTORY_SEPARATOR . $fileName;
         }
-        
+
         $code = "<?php" . PHP_EOL;
-        
-        if (isset($options['requires'])) {
-            if ( ! is_array($options['requires'])) {
-                $options['requires'] = array($options['requires']);
-            }
-            
-            foreach ($options['requires'] as $require) {
-                $code .= "require_once('".$require."');\n";
-            }
-        }
-        
+
         if (isset($options['connection']) && $options['connection']) {
             $code .= "// Connection Component Binding\n";
             $code .= "Doctrine_Manager::getInstance()->bindComponent('" . $options['connectionClassName'] . "', '" . $options['connection'] . "');\n";