Changeset 423

Timestamp:

11.07.2006 21:00:11 (4 years ago)

Author:

hans

Message:

ticket:268 (wrapping up)

• Reverted the change from changeset:372 that required that static code be put in the extension classes
• Changed static attributes of the base peer class to not reference the peer subclass
• Changed OMBuilder::getColumnConstant() method to take an optional classname parameter.

Location:

trunk/generator/classes/propel/engine/builder/om

Files:

• OMBuilder.php (modified) (2 diffs)
• php5/PHP5BasicPeerBuilder.php (modified) (3 diffs)
• php5/PHP5ExtensionPeerBuilder.php (modified) (1 diff)

trunk/generator/classes/propel/engine/builder/om/OMBuilder.php

@@ -357 +357 @@
      * 
      * @param Column $col The column we need a name for.
-     * @param string $phpName The PHP Name of the peer class. The 'Peer' is appended automatically.
+     * @param string $classname The Peer classname to use.
      * 
-     * @return string If $phpName is provided, then will return {$phpName}Peer::COLUMN_NAME; if not, then uses current table COLUMN_NAME.
+     * @return string If $classname is provided, then will return $classname::COLUMN_NAME; if not, then the peername is looked up for current table to yield $currTablePeer::COLUMN_NAME.
      */
-    public function getColumnConstant($col, $phpName = null)
+    public function getColumnConstant($col, $classname = null)
         {       
                 if ($col === null) {
@@ -368 +368 @@
                         throw $e;
                 }
-                $classname = $this->getPeerClassname($phpName);
+                
+                if ($classname === null) {
+                        $classname = $this->getPeerClassname();
+                }
                 
         // was it overridden in schema.xml ?

trunk/generator/classes/propel/engine/builder/om/php5/PHP5BasicPeerBuilder.php

@@ -118 +118 @@
 } // " . $this->getClassname() . "
 ";
-        }
+                $this->addStaticMapBuilderRegistration($script);
+        }
+
+        /**
+         * Adds the static map builder registration code.
+         * @param string &$script The script will be modified in this method.
+         */
+        protected function addStaticMapBuilderRegistration(&$script)
+        {
+                $table = $this->getTable();
+                $mapBuilderFile = $this->getMapBuilderBuilder()->getClassFilePath();
+
+                $script .= "
+// This is the static code needed to register the MapBuilder for this table with the main Propel class.
+//
+// NOTE: This static code cannot call methods on the ".$this->getPeerClassname()." class, because it is not defined yet.
+// If you need to use overridden methods, you can add this code to the bottom of the ".$this->getPeerClassname()." class:
+// 
+// Propel::getDatabaseMap(".$this->getPeerClassname()."::DATABASE_NAME)->addTableBuilder(".$this->getPeerClassname()."::TABLE_NAME, ".$this->getPeerClassname()."::getMapBuilder());
+// 
+// Doing so will effectively overwrite the registration below.
+
+Propel::getDatabaseMap(".$this->getClassname()."::DATABASE_NAME)->addTableBuilder(".$this->getClassname()."::TABLE_NAME, ".$this->getClassname()."::getMapBuilder());
+
+";
+        }
+
 
         /**
@@ -208 +234 @@
                 BasePeer::TYPE_COLNAME => array (";
                 foreach ($tableColumns as $col) {
-                        $script .= $this->getColumnConstant($col).", ";
+                        $script .= $this->getColumnConstant($col, 'self').", ";
                 }
                 $script .= "),
@@ -247 +273 @@
                 BasePeer::TYPE_COLNAME => array (";
                 foreach ($tableColumns as $num => $col) {
-                        $script .= $this->getColumnConstant($col)." => $num, ";
+                        $script .= $this->getColumnConstant($col, 'self')." => $num, ";
                 }
                 $script .= "),

trunk/generator/classes/propel/engine/builder/om/php5/PHP5ExtensionPeerBuilder.php

@@ -123 +123 @@
 } // " . $this->getClassname() . "
 ";
-                $this->addStaticMapBuilderRegistration($script);
         }
         
-        /**
-         * Adds the static map builder registration code.
-         * @param string &$script The script will be modified in this method.
-         */
-        protected function addStaticMapBuilderRegistration(&$script)
-        {
-                $table = $this->getTable();
-                $mapBuilderFile = $this->getMapBuilderBuilder()->getClassFilePath();
-
-                $script .= "
-// static code to register the map builder for this table with the main Propel class
-try {
-        Propel::getDatabaseMap(".$this->getPeerClassname()."::DATABASE_NAME)->addTableBuilder(".$this->getPeerClassname()."::TABLE_NAME, ".$this->getPeerClassname()."::getMapBuilder());
-} catch (Exception \$e) {
-        Propel::log('Could not register MapBuilder  for ".$this->getPeerClassname()." with Propel: ' . \$e->getMessage(), Propel::LOG_ERR);
-}
-";
-        }
         
 } // PHP5ExtensionPeerBuilder