Merge remote-tracking branch 'origin/master'

Author: rkrx

README.md

@@ -14,6 +14,7 @@ The main motive for this library is an environment where a lot of things are aut
 Here a few things to keep in mind:
 
 * The charset is up to you. No special binding to UTF8, although UTF8 is the default.
+* You're allowed to nest most queries to build big and powerful queries.
 * 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.
 * The order of method-calls doesn't matter.

doc/optional-conditions.md

@@ -1,5 +1,7 @@
 # Optional conditions
 
+Sometimes you want to set conditions based on dynamic data. One example would be a grid-list with dynamic filters for certain columns. Following the example below, you can predefine _optional conditions_ which will execute when the corresponding data in the `$filter`-Array is present. 
+
 ```PHP
 $filter = [
 	'name' => 'Peter',
@@ -9,15 +11,19 @@ $filter = [
 	],
 ];
 
-$req = new RequiredFilterMap($filter);
-$opt = new OptionalFilterMap($filter);
+$orderBy = [
+	['date', 'DESC'],  // Define the Sort-Order as a Multi-Value-Field
+	['name' => 'ASC'], // ... or define the Sort-Order as a Key-Value-Field
+];
 
 $query = $db
 ->from('t', 'test')
-->where($req('t.name=?', $filter, 'name'))
-->where($opt('t.date >= ?', $filter, 'date.start')) // Key in dot-notation
-->where($opt('t.date <= ?', $filter, ['date', 'end'])) // Array-Key
+->where(new DBExprFilter('t.name = ?', $filter, 'name'))
+->where(new DBExprFilter('t.date >= ?', $filter, 'date.start')) // Key in dot-notation
+->where(new DBExprFilter('t.date <= ?', $filter, ['date', 'end'])) // Key in array-notation
+->orderBy(new DBExprOrderBySpec(['name', 'date' => 'DATE(t.date)'], $orderBy))
 ```
 
+You can also define validation rules to only match certain data in `$filter`.
 
 [Back](../README.md)