Merge remote-tracking branch 'origin/master'

Author: rkrx

README.md

@@ -1,5 +1,8 @@
 mysql query builder (php 5.4+)
 ==============================
+
+[![Build Status](https://travis-ci.org/rkrx/php-mysql-query-builder.svg)](https://travis-ci.org/rkrx/php-mysql-query-builder)
+
 Simple mysql query builder to build select, insert, update and delete queries with conditional parts.
 This library was initially not intended to build prepared statements, but this is also possible.
 The main motive for this library is an environment where a lot of things are automated.
@@ -8,4 +11,79 @@ Here a few things to keep in mind:
 
 * The charset is up to you. No special binding to UTF8, although UTF8 is the default.
 * The order of method-calls of each statement-builder is irrelevant. The resulting query will always render the right order.
-* No animals were harmed due to the production of this library.
+* No animals were harmed due to the production of this library.
+
+## Some examples
+
+### Initialization
+
+```PHP
+$pdo = new PDO('mysql:host=127.0.0.1;dbname=test;charset=utf8', 'root', '');
+$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+$mysql = new MySQL($pdo);
+$mysql->getAliasRegistry()->add('textprefix', 'testdb.test__');
+```
+
+### Select
+
+```PHP
+$select = $mysql->select(['customer_count' => 'COUNT(*)'])
+->from('t1', 'textprefix#test1') // You are forced to used aliases for tables.
+->joinInner('t2', 'textprefix#test2', 't2.test_id = t1.id AND t2.field1 = ?', 123)
+->joinLeft('t3', 'textprefix#test3', 't3.test_id = t1.id')
+->joinRight('t4', 'textprefix#test4', 't4.test_id = t1.id')
+->orderBy('t1.field1')
+->orderBy('t1.field2', 'DESC')
+->limit(100)
+->offset(50);
+
+if($contition === true) {
+	$select->where('t1.somefield = ?', $someValue);
+}
+
+$rows = $select->fetchRows();
+
+foreach($rows as $row) {
+	print_r($row);
+}
+```
+
+### Insert
+
+You can insert key-value-arrays with `addAll`, `updateAll`, `addOrUpdateAll`. As the second parameter you can provide an array to specify the only fields to consider. 
+
+```PHP
+$mysql->insert()
+->into('test')
+->addOrUpdateAll($data, ['field1', 'field2', 'field3'])
+->add('created_at=NOW()')
+->addOrUpdateExpr('updated_at=NOW()')
+->run();
+```
+
+There is also an option to build an `INSERT INTO ... SELECT ... FROM ... ON DUPLICATE KEY UPDATE ...`
+
+### Update
+
+```PHP
+$mysql->update()
+->table('t1', 'test1')
+->joinLeft('t2', 'test2', 't1.id = t2.test_id')
+->setAll($data)
+->where("t1.field1 = ? OR t2.field2 > ?", 1, 10)
+->where("field IN (?)", [1, 2, 3, 4, 5, 6])
+->run();
+```
+
+### Delete
+
+You can use joins in delete-statements. But only the rows of tables specified in `from` will be modified (deleted).
+
+```PHP
+$mysql->delete()
+->from('t1', 'test1')
+->joinLeft('t2', 'test2', 't1.id=t2.test_id')
+->where('t1.field1=? AND t2.field2 > ?', 1, 10)
+->run();
+```

src/Builder/Insert.php

@@ -52,7 +52,6 @@ public function into($table) {
 	/**
 	 * @param bool $value
 	 * @return $this
-
 	 */
 	public function setIgnore($value = true) {
 		$this->ignore = $value;
@@ -65,7 +64,6 @@ public function setIgnore($value = true) {
 	 *
 	 * @param string $field
 	 * @return $this
-
 	 */
 	public function setKey($field) {
 		$this->keyField = $field;
@@ -146,10 +144,13 @@ public function addOrUpdateExpr($str) {
 
 	/**
 	 * @param array $data
+	 * @param array $mask
 	 * @return $this
-	 * @throws UnexpectedValueException
 	 */
-	public function addAll(array $data) {
+	public function addAll(array $data, array $mask = null) {
+		if($mask !== null) {
+			$data = array_intersect_key($data, array_combine($mask, $mask));
+		}
 		$data = $this->clearValues($data);
 		foreach ($data as $field => $value) {
 			$this->add($field, $value);
@@ -159,10 +160,13 @@ public function addAll(array $data) {
 
 	/**
 	 * @param array $data
-	 * @throws UnexpectedValueException
+	 * @param array $mask
 	 * @return $this
 	 */
-	public function updateAll(array $data) {
+	public function updateAll(array $data, array $mask = null) {
+		if($mask !== null) {
+			$data = array_intersect_key($data, array_combine($mask, $mask));
+		}
 		$data = $this->clearValues($data);
 		foreach ($data as $field => $value) {
 			if ($field != $this->keyField) {
@@ -174,12 +178,12 @@ public function updateAll(array $data) {
 
 	/**
 	 * @param array $data
-	 * @throws UnexpectedValueException
+	 * @param array $mask
 	 * @return $this
 	 */
-	public function addOrUpdateAll(array $data) {
-		$this->addAll($data);
-		$this->updateAll($data);
+	public function addOrUpdateAll(array $data, array $mask = null) {
+		$this->addAll($data, $mask);
+		$this->updateAll($data, $mask);
 		return $this;
 	}
 
@@ -267,7 +271,9 @@ private function clearValues(array $values) {
 		if(!count($values)) {
 			return [];
 		}
-		$fields = $this->db()->getTableFields($this->table);
+
+		$tableName = (new AliasReplacer($this->db()->getAliasRegistry()))->replace($this->table);
+		$fields = $this->db()->getTableFields($tableName);
 		$result = array();
 
 		foreach ($values as $fieldName => $fieldValue) {

src/Builder/Traits/joinBuilder.php renamed to src/Builder/Traits/JoinBuilder.php

@@ -5,7 +5,7 @@
 		 verbose="true"
 		 timeoutForSmallTests="5">
 	<testsuites>
-		<testsuite name="Streams">
+		<testsuite name="Tests">
 			<directory>tests</directory>
 		</testsuite>
 	</testsuites>

tests.xml

@@ -3,8 +3,6 @@
 
 use Kir\MySQL\Builder\InsertTest\TestInsert;
 use Kir\MySQL\Builder\SelectTest\TestSelect;
-use Kir\MySQL\Database;
-use Kir\MySQL\Tools\AliasRegistry;
 use Phake;
 
 class InsertTest extends \PHPUnit_Framework_TestCase {
@@ -38,4 +36,97 @@ public function testMassInsert() {
 
 		$this->assertEquals("INSERT INTO\n\ttravis_test.test2\n\t(a)\nSELECT\n\tb AS `a`\nFROM\n\ttravis_test.test1 oi\nWHERE\n\t(1!=2)\nON DUPLICATE KEY UPDATE\n\ta = VALUES(a)\n;\n", $query);
 	}
+
+	public function testAddAll() {
+		$reg = Phake::mock('Kir\\MySQL\\Tools\\AliasRegistry');
+		Phake::when($reg)->__call('get', ['travis'])->thenReturn('travis_test.');
+
+		$db = Phake::mock('Kir\\MySQL\\Database');
+		Phake::when($db)->__call('getTableFields', ['test1'])->thenReturn(['field1', 'field2']);
+		Phake::when($db)->__call('getTableFields', ['travis_test.test1'])->thenReturn(['field1', 'field2']);
+		Phake::when($db)->__call('quoteField', [Phake::anyParameters()])->thenGetReturnByLambda(function ($fieldName) { return "`{$fieldName}`"; });
+		Phake::when($db)->__call('quote', [Phake::anyParameters()])->thenGetReturnByLambda(function ($value) { return "'{$value}'"; });
+		Phake::when($db)->__call('getAliasRegistry', [])->thenReturn($reg);
+
+		$query = (new TestInsert($db))
+		->into('test1')
+		->addAll(['field1' => 123, 'field2' => 456])
+		->asString();
+		$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123',\n\t`field2`='456'\n;\n", $query);
+
+		$query = (new TestInsert($db))
+		->into('test1')
+		->addAll(['field1' => 123, 'field2' => 456], ['field1'])
+		->asString();
+		$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123'\n;\n", $query);
+
+		$query = (new TestInsert($db))
+		->into('travis#test1')
+		->addAll(['field1' => 123, 'field2' => 456], ['field1'])
+		->asString();
+		$this->assertEquals("INSERT INTO\n\ttravis_test.test1\nSET\n\t`field1`='123'\n;\n", $query);
+	}
+
+	public function testUpdateAll() {
+		$reg = Phake::mock('Kir\\MySQL\\Tools\\AliasRegistry');
+		Phake::when($reg)->__call('get', ['travis'])->thenReturn('travis_test.');
+
+		$db = Phake::mock('Kir\\MySQL\\Database');
+		Phake::when($db)->__call('getTableFields', ['test1'])->thenReturn(['field1', 'field2']);
+		Phake::when($db)->__call('getTableFields', ['travis_test.test1'])->thenReturn(['field1', 'field2']);
+		Phake::when($db)->__call('quoteField', [Phake::anyParameters()])->thenGetReturnByLambda(function ($fieldName) { return "`{$fieldName}`"; });
+		Phake::when($db)->__call('quote', [Phake::anyParameters()])->thenGetReturnByLambda(function ($value) { return "'{$value}'"; });
+		Phake::when($db)->__call('getAliasRegistry', [])->thenReturn($reg);
+
+		$query = (new TestInsert($db))
+		->into('test1')
+		->add('field1', 123)
+		->updateAll(['field1' => 123, 'field2' => 456])
+		->asString();
+		$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123',\n\t`field2`='456'\n;\n", $query);
+
+		$query = (new TestInsert($db))
+		->into('test1')
+		->add('field1', 123)
+		->updateAll(['field1' => 123, 'field2' => 456], ['field1'])
+		->asString();
+		$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123'\n;\n", $query);
+
+		$query = (new TestInsert($db))
+		->into('travis#test1')
+		->add('field1', 123)
+		->updateAll(['field1' => 123, 'field2' => 456], ['field1'])
+		->asString();
+		$this->assertEquals("INSERT INTO\n\ttravis_test.test1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123'\n;\n", $query);
+	}
+
+	public function testAddOrUpdateAll() {
+		$reg = Phake::mock('Kir\\MySQL\\Tools\\AliasRegistry');
+		Phake::when($reg)->__call('get', ['travis'])->thenReturn('travis_test.');
+
+		$db = Phake::mock('Kir\\MySQL\\Database');
+		Phake::when($db)->__call('getTableFields', ['test1'])->thenReturn(['field1', 'field2']);
+		Phake::when($db)->__call('getTableFields', ['travis_test.test1'])->thenReturn(['field1', 'field2']);
+		Phake::when($db)->__call('quoteField', [Phake::anyParameters()])->thenGetReturnByLambda(function ($fieldName) { return "`{$fieldName}`"; });
+		Phake::when($db)->__call('quote', [Phake::anyParameters()])->thenGetReturnByLambda(function ($value) { return "'{$value}'"; });
+		Phake::when($db)->__call('getAliasRegistry', [])->thenReturn($reg);
+
+		$query = (new TestInsert($db))
+		->into('test1')
+		->addOrUpdateAll(['field1' => 123, 'field2' => 456])
+		->asString();
+		$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123',\n\t`field2`='456'\nON DUPLICATE KEY UPDATE\n\t`field1`='123',\n\t`field2`='456'\n;\n", $query);
+
+		$query = (new TestInsert($db))
+		->into('test1')
+		->addOrUpdateAll(['field1' => 123, 'field2' => 456], ['field1'])
+		->asString();
+		$this->assertEquals("INSERT INTO\n\ttest1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123'\n;\n", $query);
+
+		$query = (new TestInsert($db))
+		->into('travis#test1')
+		->addOrUpdateAll(['field1' => 123, 'field2' => 456], ['field1'])
+		->asString();
+		$this->assertEquals("INSERT INTO\n\ttravis_test.test1\nSET\n\t`field1`='123'\nON DUPLICATE KEY UPDATE\n\t`field1`='123'\n;\n", $query);
+	}
 }