Merge pull request #6638 from jlyu/select-from-write-pdo

[4.2] Select From Write Pdo

Author: taylorotwell

src/Illuminate/Database/Eloquent/Model.php

@@ -644,6 +644,18 @@ public static function find($id, $columns = array('*'))
 		return $instance->newQuery()->find($id, $columns);
 	}
 
+	/**
+	 * Begin querying the model on the write connection.
+	 *
+	 * @return \Illuminate\Database\Query\Builder
+	 */
+	public static function onWrite()
+	{
+		$instance = new static;
+
+		return $instance->newQuery()->useWritePdo();
+	}
+
 	/**
 	 * Find a model by its primary key or return new static.
 	 *

src/Illuminate/Database/Query/Builder.php

@@ -180,6 +180,13 @@ class Builder {
 		'rlike', 'regexp', 'not regexp',
 	);
 
+	/**
+	 * Whether use write pdo for select.
+	 *
+	 * @var bool
+	 */
+	protected $useWritePdo = false;
+
 	/**
 	 * Create a new query builder instance.
 	 *
@@ -1356,6 +1363,11 @@ public function getFresh($columns = array('*'))
 	 */
 	protected function runSelect()
 	{
+		if ($this->useWritePdo)
+		{
+			return $this->connection->select($this->toSql(), $this->getBindings(), false);
+		}
+
 		return $this->connection->select($this->toSql(), $this->getBindings());
 	}
 
@@ -2092,6 +2104,18 @@ public function getGrammar()
 		return $this->grammar;
 	}
 
+	/**
+	 * Use the write pdo for query.
+	 *
+	 * @return $this
+	 */
+	public function useWritePdo()
+	{
+		$this->useWritePdo = true;
+
+		return $this;
+	}
+
 	/**
 	 * Handle dynamic method calls into the method.
 	 *

tests/Database/DatabaseEloquentModelTest.php

@@ -105,6 +105,11 @@ public function testFindMethodCallsQueryBuilderCorrectly()
 		$this->assertEquals('foo', $result);
 	}
 
+	public function testFindMethodUseWritePdo()
+	{
+		$result =  EloquentModelFindWithWritePdoStub::onWrite()->find(1);
+	}
+
 	/**
 	 * @expectedException Illuminate\Database\Eloquent\ModelNotFoundException
 	 */
@@ -1049,6 +1054,17 @@ public function newQuery()
 	}
 }
 
+class EloquentModelFindWithWritePdoStub extends Illuminate\Database\Eloquent\Model {
+	public function newQuery()
+	{
+		$mock = m::mock('Illuminate\Database\Eloquent\Builder');
+		$mock->shouldReceive('useWritePdo')->once()->andReturnSelf();
+		$mock->shouldReceive('find')->once()->with(1)->andReturn('foo');
+
+		return $mock;
+	}
+}
+
 class EloquentModelFindNotFoundStub extends Illuminate\Database\Eloquent\Model {
 	public function newQuery()
 	{

tests/Database/DatabaseQueryBuilderTest.php

@@ -20,6 +20,20 @@ public function testBasicSelect()
 	}
 
 
+	public function testBasicSelectUseWritePdo()
+	{
+		$builder = $this->getMySqlBuilderWithProcessor();
+		$builder->getConnection()->shouldReceive('select')->once()
+			->with('select * from `users`', array(), false);
+		$builder->useWritePdo()->select('*')->from('users')->get();
+
+		$builder = $this->getMySqlBuilderWithProcessor();
+		$builder->getConnection()->shouldReceive('select')->once()
+			->with('select * from `users`', array());
+		$builder->select('*')->from('users')->get();
+	}
+
+
 	public function testBasicTableWrappingProtectsQuotationMarks()
 	{
 		$builder = $this->getBuilder();
@@ -1253,4 +1267,12 @@ protected function getSqlServerBuilder()
 		return new Builder(m::mock('Illuminate\Database\ConnectionInterface'), $grammar, $processor);
 	}
 
+
+	protected function getMySqlBuilderWithProcessor()
+	{
+		$grammar = new Illuminate\Database\Query\Grammars\MySqlGrammar;
+		$processor = new Illuminate\Database\Query\Processors\MySqlProcessor;
+		return new Builder(m::mock('Illuminate\Database\ConnectionInterface'), $grammar, $processor);
+	}
+
 }