--no commit message

--no commit message

lib/Doctrine.php

@@ -155,9 +155,7 @@ final class Doctrine
     const ATTR_DBNAME_FORMAT        = 117;
     const ATTR_TBLCLASS_FORMAT      = 119;
     const ATTR_EXPORT               = 140;
-    const ATTR_DECIMAL_PLACES       = 141;
-
-
+    const ATTR_DECIMAL_PLACES       = 141;  
 
     const ATTR_PORTABILITY          = 106;
     const ATTR_VLD                  = 107;
@@ -428,7 +426,7 @@ final class Doctrine
      *
      * @param string $directory
      */
-    public static function export($directory)
+    public static function export($directory = null)
     {
         return Doctrine_Manager::connection()->export->export($directory);
     }
@@ -438,7 +436,7 @@ final class Doctrine
      *
      * @param string $directory
      */
-    public static function exportSql($directory)
+    public static function exportSql($directory = null)
     {
         return Doctrine_Manager::connection()->export->exportSql($directory);
     }

lib/Doctrine/Compiler.php

@@ -53,7 +53,7 @@ class Doctrine_Compiler
                 require_once $file->getPathName();
             }
         }
-
+                
         $classes = array_merge(get_declared_classes(), get_declared_interfaces());
 
         $ret     = array();

lib/Doctrine/Connection/Profiler.php

+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.com>.
+ */
+Doctrine::autoload('Doctrine_Overloadable');
+/**
+ * Doctrine_Connection_Profiler
+ *
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @package     Doctrine
+ * @category    Object Relational Mapping
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Connection_Profiler implements Doctrine_Overloadable, IteratorAggregate, Countable
+{
+    /**
+     * @param array $listeners      an array containing all availible listeners
+     */
+    private $listeners  = array('query',
+                                'prepare',
+                                'commit',
+                                'rollback',
+                                'connect',
+                                'begintransaction',
+                                'exec',
+                                'execute',
+                                );
+    /**
+     * @param array $events         an array containing all listened events
+     */
+    private $events     = array();
+    /**
+     * constructor
+     */
+    public function __construct() {
+
+    }
+    /**
+     * setFilterQueryType
+     *
+     * @param integer $filter
+     * @return boolean
+     */
+    public function setFilterQueryType() {
+                                         	
+    }                                     	
+    /**
+     * method overloader
+     * this method is used for invoking different listeners, for the full
+     * list of availible listeners, see Doctrine_Db_EventListener
+     *
+     * @param string $m     the name of the method
+     * @param array $a      method arguments
+     * @see Doctrine_Db_EventListener
+     * @return boolean
+     */
+    public function __call($m, $a)
+    {
+        // first argument should be an instance of Doctrine_Db_Event
+        if ( ! ($a[0] instanceof Doctrine_Db_Event)) {
+            throw new Doctrine_Connection_Profiler_Exception("Couldn't listen event. Event should be an instance of Doctrine_Db_Event.");
+        }
+
+        // event methods should start with 'on'
+        if (substr($m, 0, 2) !== 'on') {
+            throw new Doctrine_Connection_Profiler_Exception("Couldn't invoke listener :" . $m);
+        }
+
+        if (substr($m, 2, 3) === 'Pre' && substr($m, 2, 7) !== 'Prepare') {
+            if ( ! in_array(strtolower(substr($m, 5)), $this->listeners)) {
+                throw new Doctrine_Connection_Profiler_Exception("Couldn't invoke listener :" . $m);
+            }
+            // pre-event listener found
+            $a[0]->start();
+            if( ! in_array($a[0], $this->events, true)) {
+                $this->events[] = $a[0];
+            }
+        } else {
+            if ( ! in_array(strtolower(substr($m, 2)), $this->listeners)) {
+                throw new Doctrine_Connection_Profiler_Exception("Couldn't invoke listener :" . $m);
+            }
+            // after-event listener found
+            $a[0]->end();
+        }
+        /**
+         * If filtering by query type is enabled, only keep the query if
+         * it was one of the allowed types.
+         */
+        if ( ! is_null($this->filterTypes)) {
+            if ( ! ($a[0]->getQueryType() & $this->_filterTypes)) {
+
+            }
+        }
+
+    }
+    /**
+     * get
+     *
+     * @param mixed $key
+     * @return Doctrine_Event
+     */
+    public function get($key) 
+    {
+        if (isset($this->events[$key])) {
+            return $this->events[$key];
+        }
+        return null;
+    }
+    /**
+     * getAll
+     * returns all profiled events as an array
+     *
+     * @return array        all events in an array
+     */
+    public function getAll() 
+    {
+    	return $this->events;
+    }
+    /**
+     * getIterator
+     * returns an iterator that iterates through the logged events
+     *
+     * @return ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->events);
+    }
+    /**
+     * count
+     * 
+     * @return integer
+     */
+    public function count() 
+    {
+        return count($this->events);
+    }
+    /**
+     * pop the last event from the event stack
+     *
+     * @return Doctrine_Db_Event
+     */
+    public function pop() 
+    {
+        return array_pop($this->events);
+    }
+    /**
+     * Get the Doctrine_Db_Event object for the last query that was run, regardless if it has
+     * ended or not. If the event has not ended, it's end time will be Null.
+     *
+     * @return Doctrine_Db_Event
+     */
+    public function lastEvent()
+    {
+        if (empty($this->events)) {
+            return false;
+        }
+
+        end($this->events);
+        return current($this->events);
+    }
+}

lib/Doctrine/Import/Pgsql.php

@@ -208,7 +208,15 @@ class Doctrine_Import_Pgsql extends Doctrine_Import
      */
     public function listTableTriggers($table)
     {
-
+        $query = 'SELECT trg.tgname AS trigger_name
+                    FROM pg_trigger trg,
+                         pg_class tbl
+                   WHERE trg.tgrelid = tbl.oid';
+        if ($table !== null) {
+            $table = $this->conn->quote(strtoupper($table), 'string');
+            $query .= " AND tbl.relname = $table";
+        }
+        return $this->conn->fetchColumn($query);
     }
     /**
      * list the views in the database that reference a given table

tests/BooleanTestCase.php

@@ -70,7 +70,7 @@ class Doctrine_Boolean_TestCase extends Doctrine_UnitTestCase {
 
         $query = new Doctrine_Query($this->connection);
         $ret = $query->query('FROM BooleanTest WHERE BooleanTest.is_working = 1');
-        Doctrine_Lib::formatSql($query->getQuery());
+
         $this->assertEqual(count($ret), 1);
     }
     public function testPreparedQueries() {
@@ -89,7 +89,7 @@ class Doctrine_Boolean_TestCase extends Doctrine_UnitTestCase {
 
         $query = new Doctrine_Query($this->connection);
         $ret = $query->query('FROM BooleanTest WHERE BooleanTest.is_working = true');
-        Doctrine_Lib::formatSql($query->getQuery());
+
         $this->assertEqual(count($ret), 1);
     }
 
@@ -107,7 +107,7 @@ class Doctrine_Boolean_TestCase extends Doctrine_UnitTestCase {
         $test = new BooleanTest();
         $this->is_working_notnull = null;
 
-        $this->assertIdentical($this->is_working_notnull, false);
+        $this->assertIdentical($this->is_working_notnull, null);
         $this->assertEqual($test->state(), Doctrine_Record::STATE_TDIRTY);
         $test->save();
 

tests/DBTestCase.php

@@ -32,7 +32,7 @@ class Doctrine_Db_TestCase extends Doctrine_UnitTestCase {
         $this->dbh->exec("INSERT INTO entity (id, name) VALUES (2, 'John')");
         
         
-        $this->assertEqual($this->dbh->getAttribute(PDO::ATTR_DRIVER_NAME), 'sqlite');
+        $this->assertEqual($this->dbh->getAttribute(Doctrine::ATTR_DRIVER_NAME), 'sqlite');
     }
 
     public function testAddValidEventListener() {

tests/run.php

@@ -294,7 +294,7 @@ $test->addTestCase(new Doctrine_Query_JoinCondition_TestCase());
 $test->addTestCase(new Doctrine_Query_MultipleAggregateValue_TestCase());
 
 $test->addTestCase(new Doctrine_Query_TestCase());
-                                                   /**
+                                                               /**
 //$test->addTestCase(new Doctrine_IntegrityAction_TestCase());
 */
 //$test->addTestCase(new Doctrine_AuditLog_TestCase());