Author: Frederik Holljen
Date: 2006-01-23 10:04:27 +0100 (Mon, 23 Jan 2006)
New Revision: 1999

Log:
- removed ezcDbHandler::begin() to avoid mix ups with PDO.

Modified:
   packages/Database/trunk/ChangeLog
   packages/Database/trunk/src/handler.php
   
packages/Database/trunk/src/sqlabstraction/implementations/utilities_mysql.php
   
packages/Database/trunk/src/sqlabstraction/implementations/utilities_oracle.php
   
packages/Database/trunk/src/sqlabstraction/implementations/utilities_pgsql.php
   packages/Database/trunk/tests/transactions_test.php
   packages/DatabaseSchema/trunk/src/handlers/mysql.php
   packages/DatabaseSchema/trunk/src/handlers/pgsql.php

Modified: packages/Database/trunk/ChangeLog
===================================================================
--- packages/Database/trunk/ChangeLog   2006-01-23 08:52:03 UTC (rev 1998)
+++ packages/Database/trunk/ChangeLog   2006-01-23 09:04:27 UTC (rev 1999)
@@ -1,3 +1,9 @@
+1.0 - [RELEASEDATE]
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- removed ezcDbHandler::begin(). It was a rename of PDO::beginTransaction()
+  because of the strange PDO naming. Unfortunately it caused problems with
+  re-implementation.
+       
 1.0rc1 - Monday 16 January 2006
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

Modified: packages/Database/trunk/src/handler.php
===================================================================
--- packages/Database/trunk/src/handler.php     2006-01-23 08:52:03 UTC (rev 
1998)
+++ packages/Database/trunk/src/handler.php     2006-01-23 09:04:27 UTC (rev 
1999)
@@ -106,18 +106,6 @@
     /**
      * Begins a transaction.
      *
-     * Wraps [EMAIL PROTECTED] begin()} for PDO compatibility.
-     *
-     * @return bool
-     */
-    public function beginTransaction()
-    {
-        return $this->begin();
-    }
-
-    /**
-     * Begins a transaction.
-     *
      * This method executes a begin transaction query unless a
      * transaction has already been started (transaction nesting level > 0 )
      *
@@ -127,7 +115,7 @@
      * @see rollback()
      * @return bool
      */
-    public function begin()
+    public function beginTransaction()
     {
         $retval = true;
         if ( $this->transactionNestingLevel == 0 )

Modified: 
packages/Database/trunk/src/sqlabstraction/implementations/utilities_mysql.php
===================================================================
--- 
packages/Database/trunk/src/sqlabstraction/implementations/utilities_mysql.php  
    2006-01-23 08:52:03 UTC (rev 1998)
+++ 
packages/Database/trunk/src/sqlabstraction/implementations/utilities_mysql.php  
    2006-01-23 09:04:27 UTC (rev 1999)
@@ -31,7 +31,7 @@
 
     public function cleanup()
     {
-        $this->db->begin();
+        $this->db->beginTransaction();
         $rslt = $this->db->query( 'SHOW TABLES' );
         $rslt->setFetchMode( PDO::FETCH_NUM );
         $rows = $rslt->fetchAll();

Modified: 
packages/Database/trunk/src/sqlabstraction/implementations/utilities_oracle.php
===================================================================
--- 
packages/Database/trunk/src/sqlabstraction/implementations/utilities_oracle.php 
    2006-01-23 08:52:03 UTC (rev 1998)
+++ 
packages/Database/trunk/src/sqlabstraction/implementations/utilities_oracle.php 
    2006-01-23 09:04:27 UTC (rev 1999)
@@ -31,7 +31,7 @@
 
     public function cleanup()
     {
-        $this->db->begin();
+        $this->db->beginTransaction();
 
         // drop tables
         $rslt = $this->db->query( "SELECT lower(table_name) FROM user_tables" 
);

Modified: 
packages/Database/trunk/src/sqlabstraction/implementations/utilities_pgsql.php
===================================================================
--- 
packages/Database/trunk/src/sqlabstraction/implementations/utilities_pgsql.php  
    2006-01-23 08:52:03 UTC (rev 1998)
+++ 
packages/Database/trunk/src/sqlabstraction/implementations/utilities_pgsql.php  
    2006-01-23 09:04:27 UTC (rev 1999)
@@ -32,7 +32,7 @@
     // move out
     public function cleanup()
     {
-        $this->db->begin();
+        $this->db->beginTransaction();
 
         // drop tables
         $rslt = $this->db->query( "SELECT tablename FROM pg_tables WHERE 
schemaname = 'public' AND tablename NOT LIKE 'pg_%'" );

Modified: packages/Database/trunk/tests/transactions_test.php
===================================================================
--- packages/Database/trunk/tests/transactions_test.php 2006-01-23 08:52:03 UTC 
(rev 1998)
+++ packages/Database/trunk/tests/transactions_test.php 2006-01-23 09:04:27 UTC 
(rev 1999)
@@ -61,10 +61,10 @@
         try
         {
             $db = MyDB::create();
-            $db->begin();
-            $db->begin();
+            $db->beginTransaction();
+            $db->beginTransaction();
             $db->commit();
-            $db->begin();
+            $db->beginTransaction();
             $db->commit();
             $db->commit();
             unset( $db );
@@ -80,10 +80,10 @@
         try
         {
             $db = MyDB::create();
-            $db->begin();
-            $db->begin();
-            $db->begin();
-            $db->begin();
+            $db->beginTransaction();
+            $db->beginTransaction();
+            $db->beginTransaction();
+            $db->beginTransaction();
             $db->commit();
             $db->commit();
             unset( $db ); // destroy db connection
@@ -101,7 +101,7 @@
         try
         {
             $db = MyDB::create();
-            $db->begin();
+            $db->beginTransaction();
             $db->commit();
             $db->commit();
             $db->commit();
@@ -123,8 +123,8 @@
         try
         {
             $db = MyDB::create();
-            $db->begin();
-            $db->begin();
+            $db->beginTransaction();
+            $db->beginTransaction();
             $db->commit();
             $db->rollback();
             unset( $db );
@@ -141,8 +141,8 @@
         try
         {
             $db = MyDB::create();
-            $db->begin();
-            $db->begin();
+            $db->beginTransaction();
+            $db->beginTransaction();
             $db->rollback();
             $db->commit();
             unset( $db );
@@ -159,7 +159,7 @@
         try
         {
             $db = MyDB::create();
-            $db->begin();
+            $db->beginTransaction();
             $db->rollback();
             $db->commit();
             unset( $db );
@@ -178,7 +178,7 @@
         try
         {
             $db = MyDB::create();
-            $db->begin();
+            $db->beginTransaction();
             $db->commit();
             $db->rollback();
             unset( $db );

Modified: packages/DatabaseSchema/trunk/src/handlers/mysql.php
===================================================================
--- packages/DatabaseSchema/trunk/src/handlers/mysql.php        2006-01-23 
08:52:03 UTC (rev 1998)
+++ packages/DatabaseSchema/trunk/src/handlers/mysql.php        2006-01-23 
09:04:27 UTC (rev 1999)
@@ -138,7 +138,7 @@
         {
             $db = $dst;
 
-            $db->begin();
+            $db->beginTransaction();
 
             if ( $saveSchema && !$saveData )
             {

Modified: packages/DatabaseSchema/trunk/src/handlers/pgsql.php
===================================================================
--- packages/DatabaseSchema/trunk/src/handlers/pgsql.php        2006-01-23 
08:52:03 UTC (rev 1998)
+++ packages/DatabaseSchema/trunk/src/handlers/pgsql.php        2006-01-23 
09:04:27 UTC (rev 1999)
@@ -240,7 +240,7 @@
         {
             $db = $dst;
 
-            $db->begin();
+            $db->beginTransaction();
 
             if ( $saveSchema )
             {

-- 
svn-components mailing list
[email protected]
http://lists.ez.no/mailman/listinfo/svn-components

Reply via email to