Changeset 474

Timestamp:

20.10.2006 18:24:30 (4 years ago)

Author:

hans

Message:

ticket:267 (cont.) - Renamed Peer doSelectRS() -> doSelectStmt()

Location:

branches/1.3

Files:

• contrib/pat/patForms/Datasource/Propel.php (modified) (1 diff)
• contrib/pear/Structures_DataGrid_Propel/Propel.php (modified) (2 diffs)
• generator/classes/propel/engine/builder/om/PeerBuilder.php (modified) (1 diff)
• generator/classes/propel/engine/builder/om/php5/PHP5BasicObjectBuilder.php (modified) (1 diff)
• generator/classes/propel/engine/builder/om/php5/PHP5BasicPeerBuilder.php (modified) (3 diffs)
• generator/classes/propel/engine/builder/om/php5/PHP5ComplexPeerBuilder.php (modified) (3 diffs)
• generator/classes/propel/engine/builder/om/php5/PHP5NodePeerBuilder.php (modified) (2 diffs)

branches/1.3/contrib/pat/patForms/Datasource/Propel.php

@@ -42 +42 @@
                 }
 
-                $rs = AuthorPeer::doSelectRs($c);
+                $rs = AuthorPeer::doSelectStmt($c);
                 $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
                 while ($rs->next()) {

branches/1.3/contrib/pear/Structures_DataGrid_Propel/Propel.php

@@ -294 +294 @@
                 $dbMap = $mapBuilder->getDatabaseMap();
                 $cols = $dbMap->getTable(constant($this->getPeerName()."::TABLE_NAME"))->getColumns();
-                $rs = call_user_func(array( $this->getPeerName(), 'doSelectRS'), $this->criteria);
+                $stmt = call_user_func(array( $this->getPeerName(), 'doSelectStmt'), $this->criteria);
 
                 $dataset = array();
@@ -300 +300 @@
                 $this->primaryKeys = array();
                 $class = $this->getClassName();
-                while($rs->next()) { // use Creole ResultSet methods to iterate over resultset
+                while($row = $stmt->fetch(PDO::FETCH_NUM)) { // use Creole ResultSet methods to iterate over resultset
                         $obj = new $class();
-                        $obj->hydrate($rs);
+                        $obj->hydrate($row);
 
                         $row = array();

branches/1.3/generator/classes/propel/engine/builder/om/PeerBuilder.php

@@ -62 +62 @@
                 $this->addDoSelectOne($script);
                 $this->addDoSelect($script);
-                $this->addDoSelectRS($script);   // <-- there's Creole code in here
-                $this->addPopulateObjects($script); // <-- there's Creole code in here
+                $this->addDoSelectStmt($script);         // <-- there's PDO code in here
+                $this->addPopulateObjects($script); // <-- there's PDO code in here
 
         }

branches/1.3/generator/classes/propel/engine/builder/om/php5/PHP5BasicObjectBuilder.php

@@ -399 +399 @@
                 \$c->addSelectColumn(".$this->getColumnConstant($col).");
                 try {
-                        \$stmt = ".$this->getPeerClassname()."::doSelectRS(\$c, \$con);
+                        \$stmt = ".$this->getPeerClassname()."::doSelectStmt(\$c, \$con);
                         \$row = \$stmt->fetch(PDO::FETCH_NUM);
 ";

branches/1.3/generator/classes/propel/engine/builder/om/php5/PHP5BasicPeerBuilder.php

@@ -492 +492 @@
                 }
 
-                \$stmt = ".$this->getPeerClassname()."::doSelectRS(\$criteria, \$con);
+                \$stmt = ".$this->getPeerClassname()."::doSelectStmt(\$criteria, \$con);
                 if (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
                         return \$row[0];
@@ -548 +548 @@
         public static function doSelect(Criteria \$criteria, PDO \$con = null)
         {
-                return ".$this->getPeerClassname()."::populateObjects(".$this->getPeerClassname()."::doSelectRS(\$criteria, \$con));
+                return ".$this->getPeerClassname()."::populateObjects(".$this->getPeerClassname()."::doSelectStmt(\$criteria, \$con));
         }";
         }
 
         /**
-         * Adds the doSelectRS() method.
-         * @param string &$script The script will be modified in this method.
-         */
-        protected function addDoSelectRS(&$script)
-        {
-
-                $script .= "
-        /**
-         * Prepares the Criteria object and uses the parent doSelect()
-         * method to get a ResultSet.
-         *
-         * Use this method directly if you want to just get the resultset
-         * (instead of an array of objects).
+         * Adds the doSelectStmt() method.
+         * @param string &$script The script will be modified in this method.
+         */
+        protected function addDoSelectStmt(&$script)
+        {
+
+                $script .= "
+        /**
+         * Prepares the Criteria object and uses the parent doSelect() method to execute a PDOStatement.
+         *
+         * Use this method directly if you want to work with an executed statement durirectly (for example
+         * to perform your own object hydration).
          *
          * @param Criteria \$criteria The Criteria object used to build the SELECT statement.
@@ -571 +570 @@
          * @throws PropelException Any exceptions caught during processing will be
          *               rethrown wrapped into a PropelException.
-         * @return ResultSet The resultset object with numerically-indexed fields.
+         * @return PDOStatement The executed PDOStatement object.
          * @see ".$this->basePeerClassname."::doSelect()
          */
-        public static function doSelectRS(Criteria \$criteria, PDO \$con = null)
+        public static function doSelectStmt(Criteria \$criteria, PDO \$con = null)
         {
                 if (\$con === null) {

branches/1.3/generator/classes/propel/engine/builder/om/php5/PHP5ComplexPeerBuilder.php

@@ -294 +294 @@
                                                 }
                                                 $script .= "
-                \$stmt = ".$this->getPeerClassname()."::doSelectRS(\$criteria, \$con);
+                \$stmt = ".$this->getPeerClassname()."::doSelectStmt(\$criteria, \$con);
                 if (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
                         return \$row[0];
@@ -550 +550 @@
 
                 $script .= "
-                \$stmt = ".$this->getPeerClassname()."::doSelectRS(\$criteria, \$con);
+                \$stmt = ".$this->getPeerClassname()."::doSelectStmt(\$criteria, \$con);
                 if (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
                         return \$row[0];
@@ -850 +850 @@
                         } // foreach fkeys 
                         $script .= "
-                \$stmt = ".$this->getPeerClassname()."::doSelectRS(\$criteria, \$con);
+                \$stmt = ".$this->getPeerClassname()."::doSelectStmt(\$criteria, \$con);
                 if (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
                         return \$row[0];

branches/1.3/generator/classes/propel/engine/builder/om/php5/PHP5NodePeerBuilder.php

@@ -314 +314 @@
     {
         \$criteria = $nodePeerClassname::buildFamilyCriteria(\$criteria, \$ancestors, \$descendants);
-        \$rs = ".$this->getStubPeerBuilder()->getClassname()."::doSelectRS(\$criteria, \$con);
+        \$rs = ".$this->getStubPeerBuilder()->getClassname()."::doSelectStmt(\$criteria, \$con);
         return self::populateNodes(\$rs, \$criteria);
     }
@@ -370 +370 @@
         \$criteria->add(self::NPATH_COLNAME, \$np, Criteria::EQUAL);
         \$criteria = self::buildFamilyCriteria(\$criteria, \$ancestors, \$descendants);
-        \$rs = $peerClassname::doSelectRS(\$criteria, \$con);
+        \$rs = $peerClassname::doSelectStmt(\$criteria, \$con);
         \$nodes = self::populateNodes(\$rs, \$criteria);
         return (count(\$nodes) == 1 ? \$nodes[0] : null);