Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Database.php
#	README.md

Author: anzawi

README.md

@@ -127,6 +127,18 @@ you can use ->results(); to convert to array or object as you config a "fetch"
     ```
     you can use `where` method an infinite :)
 
+### get last records (from last) :
+
+to get last records in table just send seconde parameter to select method, or just first method to true
+
+```php
+$fromLast = $db->table('users')->select(true);
+
+or 
+
+$fromLast = $db->table('users')->select(['id', 'name', 'email'], true);
+```
+
 ### where types :
 - whereBetween($field, $values = []) :
     ```php
@@ -368,7 +380,25 @@ var_dump($results->results());
 now add to url this string query (?page=2 or 3 or 4 .. etc)
 see (link() method to know how to generate navigation automatically)
 
+<<<<<<< HEAD
 ### link() : 
+=======
+- get last records (from last) :
+
+to get last records in table just send seconde parameter to paginate method, or just first method to true
+
+```php
+$fromLast = $db->table('users')->paginate(true);
+
+or 
+
+$fromLast = $db->table('users')->paginate(20, true);
+```
+
+
+
+### link : 
+>>>>>>> origin/master
  create pagination list to navigate between pages
  * compatible with bootstrap and foundation frameworks
 
@@ -399,6 +429,21 @@ echo $posts->link();
 
 ```
 
+<<<<<<< HEAD
+=======
+## get last records (from last) :
+
+to get last records in table after select or paginate
+
+```php
+get last records
+$lastRecords = $db->table('users')->select()->last();
+
+or get last 10 records
+
+$lastRecords = $db->table('users')->select()->last(10);
+```
+>>>>>>> origin/master
 
 you can echo out the results directlly that convert 
 the results to json format
@@ -418,6 +463,45 @@ foreach($results as $key => $value)
 }
 ```
 
+## orderBy()
+
+to order results " ORDER BY "
+
+```php
+$db->table('posts')
+    ->notIn('id', [1, 2, 3, 4, 5])
+    ->orderBy('id', 'DESC)
+    ->select();
+    
+// OR
+
+
+$db->table('posts')
+    ->where('type', 'posts')
+    ->orderBy('author', 'ASC')
+    ->select();
+```
+
+plase note :
+
+when you using " limit() with orderBy() " let limit() method after orderBy()
+for example :
+
+``php
+
+// OK
+$db->table('posts')
+    ->orderBy('id', 'DESC)
+    ->limit(10)
+    ->select();
+    
+// NO
+$db->table('posts')
+    ->limit(10)
+    ->orderBy('id', 'DESC)
+    ->select();
+```
+
 select(), first(), find(), paginate() methods
 now return an instance of Collection class
 
@@ -429,6 +513,18 @@ get last record selected
 
 $all = $db->table('my_table')->select();
 var_dump($all->last());
+
+to get last records in table after select or paginate
+
+```php
+get last records
+$lastRecords = $db->table('users')->select()->last();
+
+or get last 10 records
+
+$lastRecords = $db->table('users')->select()->last(10);
+```
+
 ```
 
 ### all()
@@ -680,9 +776,16 @@ $db->table('users')->alterSchema(['drop', 'full_name'])->alter();
 =============================
 # Change Log
 
+<<<<<<< HEAD
 ### 4.0.0
 * MODIFY : namesace to `PHPtricks\Orm`
 * MODIFY : files structure
+=======
+### 3.2.0
+* ADD    : Order By (orderBy())
+* ADD    : get Latest Data inserted into table
+* MODIFY : last() method to return last -n- recordes
+>>>>>>> origin/master
 
 ### 3.1.0
 * FIX : Duplicate connection

phptricksORM/Database.php

@@ -6,7 +6,7 @@
  * @author phptricks Team - Mohammad Anzawi
  * @author_uri https://phptricks.org
  * @uri https://github.com/anzawi/php-database-class
- * @version 3.2.0
+ * @version 4.0.0
  * @licence MIT -> https://opensource.org/licenses/MIT
  * @package PHPtricks\Database
  */