Changeset 6433

Timestamp:

12/11/07 01:25:59 (1 year ago)

Author:

dwhittle

Message:

dwhittle: merged changes for master/slave in propel 1.3

Files:

• branches/dwhittle/lib/plugins/sfPropelPlugin/lib/vendor/propel/Propel.php (modified) (7 diffs)
• branches/dwhittle/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelPDO.php (modified) (4 diffs)
• branches/dwhittle/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/SlavePDO.php (added)

branches/dwhittle/lib/plugins/sfPropelPlugin/lib/vendor/propel/Propel.php

@@ -1 +1 @@
-<?php
-/*
-42 2007-12-02 16:28:20Z heltem
+53 2007-12-10 21:48:31Z abeggchr
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -38 +38 @@
- * @author     Henning P. Schmiedehausen <hps@intermeta.de> (Torque)
- * @author     Kurt Schrader <kschrader@karmalab.org> (Torque)
-42
+53
- * @package    propel
- */
@@ -92 +92 @@
-   */
-  const VERSION = '1.3.0-dev';
+  
+  /**
+   * The class name for a PDO object
+   */
+  const CLASS_PDO = 'PDO';
+  
+    /**
+   * The class name for a PropelPDO object
+   */
+  const CLASS_PROPEL_PDO = 'PropelPDO';
+  
+    /**
+   * The class name for a SlavePDO object
+   */
+  const CLASS_SLAVE_PDO = 'SlavePDO';
-
-  /**
@@ -176 +191 @@
-    'PropelColumnTypes' => 'propel/util/PropelColumnTypes.php',
-    'PropelPDO' => 'propel/util/PropelPDO.php',
+    'SlavePDO' => 'propel/util/SlavePDO.php',
-    'PropelPager' => 'propel/util/PropelPager.php',
-    'PropelDateTime' => 'propel/util/PropelDateTime.php',
@@ -439 +455 @@
-    if (!isset(self::$connectionMap[$name])) {
-
+      // load connection parameter for master connection
-      $conparams = isset(self::$configuration['datasources'][$name]['connection']) ? self::$configuration['datasources'][$name]['connection'] : null;
-      if ($conparams === null) {
-        throw new PropelException('No connection information in your runtime configuration file for datasource ['.$name.']');
-      }
+      
+      // initialize master connection
+      $con = Propel::initConnection($conparams, $name, Propel::CLASS_PROPEL_PDO);
+      self::$connectionMap[$name] = $con;
+      
+      // load any slaves from the config file and add them to the master connection
+      $slaveparams = isset(self::$configuration['datasources'][$name]['slaves']) ? self::$configuration['datasources'][$name]['slaves'] : null;
+      if ($slaveparams != null) {
+        foreach ($slaveparams as $key => $slaveparam) {
+          $con->addSlave($slaveparam, $name);
+        }
+      }
+    }
+
+    return self::$connectionMap[$name];
+  }
+  
+  /**
+   * Opens a new PDO connection for passed-in db name.
+   *
+   * @param      string[] connection paramters
+   * @param      name
+   * @param      boolean Initialize a PropelPDO (true, default) or a plain PDO (false)
+   *
+   * @return     object A database connection of the given class (PDO, PropelPDO, SlavePropelPDO)
+   *
+   * @throws     PropelException - if lower-level exception caught when trying to connect.
+   */
+  public static function initConnection($conparams, $name, $class) {
-
-      $dsn = $conparams['dsn'];
@@ -466 +512 @@
-        $con = new PropelPDO($dsn, $user, $password, $driver_options);
-        $con->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        self::$connectionMap[$name] = $con;
-      } catch (PDOException $e) {
-        throw new PropelException("Unable to open PDO connection", $e);
@@ -488 +533 @@
-      $adapter = self::getDB($name);
-      $adapter->initConnection($con, isset($conparams['settings']) && is_array($conparams['settings']) ? $conparams['settings'] : array());
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-  }
-

branches/dwhittle/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelPDO.php

@@ -1 +1 @@
-<?php
-/*
-06 2007-11-15 00:44:47Z david
+53 2007-12-10 21:48:31Z abeggchr
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -36 +36 @@
- * @author     Cameron Brunner <cameron.brunner@gmail.com>
- * @author     Hans Lellelid <hans@xmpl.org>
+ * @author     Christian Abegg <abegg.ch@gmail.com>
- * @since      2006-09-22
- * @package    propel.util
@@ -46 +47 @@
-   */
-  protected $nestedTransactionCount = 0;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  /**
-   * Gets the current transaction depth.
@@ -141 +159 @@
-
-  /**
-.
+ and split r/w queries
-   */
-  public function prepare($sql, $driver_options = array())
-  {
-    Propel::log($sql, Propel::LOG_DEBUG);
+    if ($this->isForSlave($sql)) {
+      if ($slave = $this->getSlave()) {
+        return $slave->prepare($sql, $driver_options);
+      }
+    }
-    return parent::prepare($sql, $driver_options);
-  }
+  
+  /**
+     * Overrides PDO::query() to add logging and split r/w queries
+     */
+  public function query($sql, $fetch = null, $input3=null, $input4=null) {
+    Propel::log($sql, Propel::LOG_DEBUG);
+    if ($this->isForSlave($sql)) {
+      if ($slave = $this->getSlave()) {
+        return $slave->query($sql, $fetch, $input3, $input4);
+      }
+    }
+    return parent::query($sql, $fetch, $input3, $input4);
+  }
+  
+  /**
+     * Overrides PDO::exec() to add logging and split r/w queries
+     */
+  public function exec($sql) {
+    Propel::log($sql, Propel::LOG_DEBUG);
+    if ($this->isForSlave($sql)) {
+      if ($slave = $this->getSlave()) {
+        $slave->exec($sql);
+      }
+    }
+    return parent::exec($sql);
+  }
+
+  /**
+     * Adds the configuration for a slave connection
+     * 
+     * @param  array slave param from config
+     * @param  string name of the connection
+     * @return void
+     */
+  public function addSlave($slaveparam, $name) {
+    $newIndex = count($this->slaves);
+    $this->slaves[$newIndex]['param'] = $slaveparam;
+    $this->slaves[$newIndex]['name'] = $name;
+  }
+  
+  /**
+   * Gets one of the slave connections for read only access
+   * 
+   * @return SlavePDO or false if there are no slaves
+   */
+  private function getSlave() {
+  
+    if (isset($this->slave)) return $this->slave;   // slave already initialised
+    if (count($this->slaves) == 0) return false;  // return the plain PDO object to avoid endless loops
+    
+    $random = mt_rand(0, count($this->slaves)-1);
+    if (isset($this->slaves[$random]['con'])) {
+      $this->slave = $this->slaves[$random]['con'];
+    }
+    else {
+      $this->slaves[$random]['con'] = Propel::initConnection($this->slaves[$random]['param'], $this->slaves[$random]['name'], Propel::CLASS_SLAVE_PDO);
+      $this->slave = $this->slaves[$random]['con'];
+    }
+    return $this->slave;
+  }
+  
+  /**
+   * Checks if a sql query should be handled by the slave connection
+   * 
+   * @return boolean
+   */
+  private function isForSlave($sql) {
+    
+    // return false if the use of the master connection is forced
+    if ($this->useMasterConnection) return false;
+
+    // return false if a transaction is open
+    $opcount = $this->getNestedTransactionCount();
+    if ($opcount > 0) return false;
+    
+    // check if sql is read only
+    return $this->isReadOnly($sql);
+  }
+  
+  /**
+   * Checks if a sql query is read only (e.g. starts with "select")
+   * 
+   * @return boolean
+   */
+  public static function isReadOnly($sql) {
+    
+    // analyse sql
+    $result = stripos($sql, "SELECT");
+    if ($result === false) {
+      // no select found
+      return false;
+    }
+    else if ($result == 0) {
+      // sql starts with select
+      return true;
+    }
+    else {
+      // select is somewhere else in string
+      return false;
+    }
+  }
+  
+  /**
+   * Forces the use of the master connection only
+   * 
+   * @param boolean use master connection only
+   * @return void
+   */
+  public function setUseMasterConnection($useMasterConnection) {
+    if (is_bool($useMasterConnection)) {
+      $this->useMasterConnection = $useMasterConnection;
+    }
+    else throw new PropelException("Parameter of setUseMasterConnection must be boolean");
+  }
-}