Renaming the transaction*() methods to just be the type of transaction statement...

* DbMySql.php
* DbMySqlI.php
* Db.php
* DbPostgreSql.php

diff --git a/Db.php b/Db.php
index 9450351e308a5bf5f8a55a648565c7948f49c0c4..2bfe2c59b670c2a146ec3e76ddda3e77980b2550 100644 (file)
--- a/Db.php
+++ b/Db.php
@@ -423,16 +423,7 @@ abstract class BSDb
        * Sends the command to start a transaction. This command should never
        * be reached as it's always overridden
        */
-       public abstract function transactionStart();
-       
-       // ###################################################################
-       /**
-       * Sends the command to set this as a savepoint. This command should never
-       * be reached as it's always overridden
-       *
-       * @param        string  Named savepoint
-       */
-       public abstract function transactionSavepoint($name);
+       public abstract function begin();
        
        // ###################################################################
        /**
@@ -441,14 +432,14 @@ abstract class BSDb
        *
        * @param        string  Named savepoint
        */
-       public abstract function transactionRollback($name = null);
+       public abstract function rollback();
        
        // ###################################################################
        /**
        * Sends the command to commit the entire transaction. This command
        * should never be reached as it's always overridden
        */
-       public abstract function transactionCommit();
+       public abstract function commit();
 }
 
 /**

diff --git a/DbMySql.php b/DbMySql.php
index 94e59a70d1d3f497ac266268decde19c1361e6c5..a01db030922fe766b741da738a7bd8099816d6f2 100644 (file)
--- a/DbMySql.php
+++ b/DbMySql.php
@@ -181,38 +181,26 @@ class BSDbMySql extends BSDb
        /**
        * Starts a database transaction
        */
-       public function transactionStart()
+       public function begin()
        {
                $this->query("BEGIN WORK");
        }
        
-       // ###################################################################
-       /**
-       * Saves current transaction steps as a savepoint
-       *
-       * @param        string  Named savepoint
-       */
-       public function transactionSavepoint($name)
-       {
-               $this->query("SAVEPOINT $name");
-       }
        
        // ###################################################################
        /**
        * Reverts a transaction back to a given savepoint
-       *
-       * @param        string  Named savepoint
        */
-       public function transactionRollback($name = null)
+       public function rollback()
        {
-               $this->query("ROLLBACK" . ($name != null ? " TO SAVEPOINT $name" : ""));
+               $this->query("ROLLBACK");
        }
        
        // ###################################################################
        /**
        * Commits a database transaction
        */
-       public function transactionCommit()
+       public function commit()
        {
                $this->query("COMMIT");
        }

diff --git a/DbMySqlI.php b/DbMySqlI.php
index 9e0dec08528956561fa57fb792c83145483bd461..e0dba3ac3fd769acc052358ac6ab03761e11e327 100644 (file)
--- a/DbMySqlI.php
+++ b/DbMySqlI.php
@@ -153,38 +153,25 @@ class BSDbMySqlI extends BSDb
        /**
        * Starts a database transaction
        */
-       public function transactionStart()
+       public function begin()
        {
                $this->query("START TRANSACTION");
        }
        
-       // ###################################################################
-       /**
-       * Saves current transaction steps as a savepoint
-       *
-       * @param        string  Named savepoint
-       */
-       public function transactionSavepoint($name)
-       {
-               $this->query("SAVEPOINT $name");
-       }
-       
        // ###################################################################
        /**
        * Reverts a transaction back to a given savepoint
-       *
-       * @param        string  Named savepoint
        */
-       public function transactionRollback($name = null)
+       public function rollback()
        {
-               $this->query("ROLLBACK" . ($name != null ? " TO SAVEPOINT $name" : ""));
+               $this->query("ROLLBACK");
        }
        
        // ###################################################################
        /**
        * Commits a database transaction
        */
-       public function transactionCommit()
+       public function commit()
        {
                $this->query("COMMIT");
        }

diff --git a/DbPostgreSql.php b/DbPostgreSql.php
index c49fd3bb453175f831e0d7b9d036b611c827b7c0..505942794397f384db721c117704c676b8d1a7a4 100644 (file)
--- a/DbPostgreSql.php
+++ b/DbPostgreSql.php
@@ -172,38 +172,25 @@ class BSDbPostgreSql extends BSDb
        /**
        * Starts a database transaction
        */
-       public function transactionStart()
+       public function start()
        {
                $this->query("BEGIN");
        }
-       
-       // ###################################################################
-       /**
-       * Saves current transaction steps as a savepoint
-       *
-       * @param        string  Named savepoint
-       */
-       public function transactionSavepoint($name)
-       {
-               $this->query("SAVEPOINT $name");
-       }
-       
+
        // ###################################################################
        /**
        * Reverts a transaction back to a given savepoint
-       *
-       * @param        string  Named savepoint
        */
-       public function transactionRollback($name = null)
+       public function rollback()
        {
-               $this->query("ROLLBACK" . ($name != null ? " TO $name" : ""));
+               $this->query("ROLLBACK");
        }
        
        // ###################################################################
        /**
        * Commits a database transaction
        */
-       public function transactionCommit()
+       public function commit()
        {
                $this->query("COMMIT");
        }