.gitignore

@@ -1,4 +1,3 @@
-.idea/
 build/
 vendor/
 bin/

.travis.yml

@@ -1,10 +1,12 @@
 language: php
 php:
-  - "5.5"
   - "5.6"
   - "7.0"
-  - "hhvm"
-
+  - "7.1"
+  - "7.2"
+  - "7.3"
+  - "7.4"
+
 before_script:
   - composer install
 
@@ -13,4 +15,8 @@ script:
 
 matrix:
      allow_failures:
-         - php: "hhvm"
+         - php: "hhvm"
+branches:
+  only:
+    - master
+

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## Unreleased
+
+### Added
+
+- Added parentQuery field to Select Object
+- New test for orderBy method in Select Class
+
+### Altered
+
+- Changed orderBy method logic in Select Class. Now every select query has access to his parent object. You can manipulate sequence of your orderBy clause. 
+
 ## 1.0.2 - TBA
 
 ### Added
@@ -27,4 +38,4 @@
 
 ## 0.0.5-alpha - 2014-07-01
 
-- Initial release
+- Initial release

README.md

@@ -1,9 +1,11 @@
 SQL Query Builder
 =================
 
-[![Build Status](https://travis-ci.org/nilportugues/sql-query-builder.svg)](https://travis-ci.org/nilportugues/sql-query-builder) [![Coverage Status](https://img.shields.io/coveralls/nilportugues/sql-query-builder.svg)](https://coveralls.io/r/nilportugues/sql-query-builder) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nilportugues/sql-query-builder/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nilportugues/sql-query-builder/?branch=master)  [![SensioLabsInsight](https://insight.sensiolabs.com/projects/89ec1003-4227-43a2-8432-67a9fc2d3ba3/mini.png)](https://insight.sensiolabs.com/projects/89ec1003-4227-43a2-8432-67a9fc2d3ba3) [![Latest Stable Version](https://poser.pugx.org/nilportugues/sql-query-builder/v/stable)](https://packagist.org/packages/nilportugues/sql-query-builder) [![Total Downloads](https://poser.pugx.org/nilportugues/sql-query-builder/downloads)](https://packagist.org/packages/nilportugues/sql-query-builder) [![License](https://poser.pugx.org/nilportugues/sql-query-builder/license)](https://packagist.org/packages/nilportugues/sql-query-builder)
+[![Build Status](https://travis-ci.org/nilportugues/php-sql-query-builder.svg)](https://travis-ci.org/nilportugues/php-sql-query-builder) [![Coverage Status](https://img.shields.io/coveralls/nilportugues/sql-query-builder.svg)](https://coveralls.io/r/nilportugues/sql-query-builder) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nilportugues/sql-query-builder/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nilportugues/sql-query-builder/?branch=master) [![Latest Stable Version](https://poser.pugx.org/nilportugues/sql-query-builder/v/stable)](https://packagist.org/packages/nilportugues/sql-query-builder) [![Total Downloads](https://poser.pugx.org/nilportugues/sql-query-builder/downloads)](https://packagist.org/packages/nilportugues/sql-query-builder) [![License](https://poser.pugx.org/nilportugues/sql-query-builder/license)](https://packagist.org/packages/nilportugues/sql-query-builder)
+[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://paypal.me/nilportugues)
+
+An elegant lightweight and efficient SQL Query Builder with fluid interface SQL syntax supporting bindings and complicated query generation. **Works without establishing a connection to the database.** 
 
-An elegant lightweight and efficient SQL Query Builder with fluid interface SQL syntax supporting bindings and complicated query generation.
 <a name="index_block"></a>
 
 * [1. Installation](#block1)
@@ -61,6 +63,8 @@ php composer.phar require nilportugues/sql-query-builder
 
 The SQL Query Builder allows to generate complex SQL queries standard using the `SQL-2003` dialect (default) and the `MySQL` dialect, that extends the `SQL-2003` dialect.
 
+<img src="./diagram.svg" />
+
 <a name="block2.1"></a>
 ### 2.1. Generic Builder [↑](#index_block)
 The Generic Query Builder is the default builder for this class and writes standard SQL-2003.
@@ -206,7 +210,8 @@ $query = $builder->select()
     ])
     ->where()
     ->greaterThan('user_id', 5)
-    ->notLike('username', 'John');
+    ->notLike('username', 'John')
+	->end();
 
 echo $builder->writeFormatted($query);    
 ```
@@ -240,7 +245,8 @@ $query = $builder->select()
     ->equals('user_id', 2)
     ->subWhere("OR")
     ->lessThan($column, 10)
-    ->greaterThan('user_id', 100);
+    ->greaterThan('user_id', 100)
+	->end();
 
 echo $builder->writeFormatted($query);
 ```
@@ -295,7 +301,8 @@ $query = $builder->select()
 $query
     ->where()
     ->greaterThan('user_id', 5)
-    ->notLike('username', 'John');
+    ->notLike('username', 'John')
+	->end();
 
 $query
     ->orderBy('created_at', OrderBy::DESC);
@@ -454,7 +461,8 @@ $query = $builder->update()
         'contact' => 'contact@nilportugues.com'
     ])
     ->where()
-    ->equals('user_id', 1);
+    ->equals('user_id', 1)
+	->end();
 
 $sql = $builder->writeFormatted($query);    
 $values = $builder->getValues();
@@ -493,7 +501,8 @@ $query = $builder->update()
 $query
     ->where()
     ->like('username', '%N')
-    ->between('user_id', 1, 2000);
+    ->between('user_id', 1, 2000)
+	->end();
 
 $query
     ->orderBy('user_id', OrderBy::ASC)
@@ -559,7 +568,8 @@ $query = $builder->delete()
 
 $query
     ->where()
-    ->equals('user_id', 100);
+    ->equals('user_id', 100)
+	->end();
 
 $query
     ->limit(1);
@@ -591,7 +601,8 @@ $query = $builder->delete()
 $query
     ->where()
     ->like('username', '%N')
-    ->between('user_id', 1, 2000);
+    ->between('user_id', 1, 2000)
+	->end();
 
 $query
     ->orderBy('user_id', OrderBy::ASC)
@@ -767,27 +778,28 @@ SELECT user_email.* FROM user_email
 The following operators are available for filtering using WHERE conditionals:
 
 ```php
-    public function subWhere($operator = 'OR');
-    public function equals($column, $value);
-    public function compare($column, $value, $operator);
-    public function notEquals($column, $value);
-    public function greaterThan($column, $value);
-    public function greaterThanOrEqual($column, $value);
-    public function lessThan($column, $value);
-    public function lessThanOrEqual($column, $value);
-    public function like($column, $value);
-    public function notLike($column, $value);
-    public function match(array $columns, array $values);
-    public function matchBoolean(array $columns, array $values);
-    public function matchWithQueryExpansion(array $columns, array $values);
-    public function in($column, array $values);
-    public function notIn($column, array $values);
-    public function between($column, $a, $b);
-    public function isNull($column);
-    public function isNotNull($column);
-    public function exists(Select $select);
-    public function notExists(Select $select);
-    public function addBitClause($column, $value);    
+public function subWhere($operator = 'OR');
+public function equals($column, $value);        
+public function notEquals($column, $value);
+public function greaterThan($column, $value);
+public function greaterThanOrEqual($column, $value);
+public function lessThan($column, $value);
+public function lessThanOrEqual($column, $value);
+public function like($column, $value);
+public function notLike($column, $value);
+public function match(array $columns, array $values);
+public function matchBoolean(array $columns, array $values);
+public function matchWithQueryExpansion(array $columns, array $values);
+public function in($column, array $values);
+public function notIn($column, array $values);
+public function between($column, $a, $b);
+public function notBetween($column, $a, $b);
+public function isNull($column);
+public function isNotNull($column);
+public function exists(Select $select);
+public function notExists(Select $select);
+public function addBitClause($column, $value);    
+public function asLiteral($literal);
 ```
 
 <a name="block4.2"></a>
@@ -806,7 +818,8 @@ $query = $builder->select()
     ->setTable('user')
     ->where('OR')
     ->equals('user_id', 1)
-    ->like('name', '%N%');       
+    ->like('name', '%N%')
+	->end();       
 
 $sql = $builder->writeFormatted($query);    
 $values = $builder->getValues();
@@ -933,7 +946,8 @@ $query = $builder->select()
     ->setSelectAsColumn(array('user_role' => $selectRole))
     ->setSelectAsColumn(array($selectRole))
     ->where()
-    ->equals('user_id', 4);
+    ->equals('user_id', 4)
+	->end();
 
 $sql = $builder->writeFormatted($query);    
 $values = $builder->getValues();
@@ -984,7 +998,8 @@ $query = $builder->select()
     ->setColumns(array('user_id', 'username'))
     ->setValueAsColumn('10', 'priority')
     ->where()
-    ->equals('user_id', 1);
+    ->equals('user_id', 1)
+	->end();
 
 $sql = $builder->writeFormatted($query);    
 $values = $builder->getValues();
@@ -1018,7 +1033,8 @@ $query = $builder->select()
     ->setColumns(array('user_id', 'username'))
     ->setFunctionAsColumn('MAX', array('user_id'), 'max_id')
     ->where()
-    ->equals('user_id', 1); 
+    ->equals('user_id', 1)
+	->end(); 
 
 $sql = $builder->writeFormatted($query);    
 $values = $builder->getValues();
@@ -1050,7 +1066,8 @@ $query = $builder->select()
     ->setColumns(array('user_id', 'username'))
     ->setFunctionAsColumn('CURRENT_TIMESTAMP', array(), 'server_time')
     ->where()
-    ->equals('user_id', 1);
+    ->equals('user_id', 1)
+	->end();
 
 $sql = $builder->writeFormatted($query);    
 $values = $builder->getValues();

composer.json

@@ -36,7 +36,7 @@
         "nilportugues/sql-query-formatter": "~1.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "5.*",
+        "phpunit/phpunit": "4.*",
         "fabpot/php-cs-fixer": "~1.9",
         "nilportugues/php_backslasher": "~0.2"
     },