Release version 1.9.5

CHANGELOG.md

@@ -1,5 +1,10 @@
 ### Changelog
 
+##### v1.9.5
++ Updated documentation
++ Added protected override allowed
++ Better parameter naming
+
 ##### v1.9.4
 + Revised documentation (WIP)
 + Updated `InsertStatement` class with:

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "slim/pdo",
     "description": "PDO database library for Slim Framework",
-    "version": "1.9.4",
+    "version": "1.9.5",
     "type": "library",
     "keywords": ["pdo", "database", "slim", "framework"],
     "homepage": "https://github.com/FaaPz/Slim-PDO",

docs/AGGREGATES.md

@@ -8,44 +8,44 @@
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$column` | *string* | `'*'` | ...
-`$as` | *string* | `null` | ...
-`$distinct` | *bool* | `false` | ...
+`$column` | *string* | `'*'` | String containing column names
+`$as` | *string* | `null` | Column alias
+`$distinct` | *bool* | `false` | Boolean **DISTINCT** clause
 
 ##### `distinctCount($column = '*', $as = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$column` | *string* | `'*'` | ...
-`$as` | *string* | `null` | ...
+`$column` | *string* | `'*'` | String containing column names
+`$as` | *string* | `null` | Column alias
 
 ##### `max($column, $as = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$column` | *string* | required | ...
-`$as` | *string* | `null` | ...
+`$column` | *string* | required | Column name
+`$as` | *string* | `null` | Column alias
 
 ##### `min($column, $as = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$column` | *string* | required | ...
-`$as` | *string* | `null` | ...
+`$column` | *string* | required | Column name
+`$as` | *string* | `null` | Column alias
 
 ##### `avg($column, $as = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$column` | *string* | required | ...
-`$as` | *string* | `null` | ...
+`$column` | *string* | required | Column name
+`$as` | *string* | `null` | Column alias
 
 ##### `sum($column, $as = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$column` | *string* | required | ...
-`$as` | *string* | `null` | ...
+`$column` | *string* | required | Column name
+`$as` | *string* | `null` | Column alias
 
 ### Examples
 

docs/Clause/GROUP_BY.md

@@ -4,11 +4,11 @@
 
 ### Methods
 
-##### `groupBy($statement)`
+##### `groupBy($columns)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$statement` | *string* | required | ...
+`$columns` | *string* | required | String containing column names
 
 ### Examples
 

docs/Clause/HAVING.md

@@ -4,55 +4,55 @@
 
 ### Methods
 
-##### `having($column, $operator = null, $rule = 'AND')`
+##### `having($column, $operator = null, $chainType = 'AND')`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$column` | *string* | required | ...
-`$operator` | *string* | `null` | ...
-`$rule` | *string* | `'AND'` | ...
+`$column` | *string* | required | Column name
+`$operator` | *string* | `null` | Logic operator
+`$chainType` | *string* | `'AND'` | Chain type: `AND` or `OR`
 
 ##### `orHaving($column, $operator = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$column` | *string* | required | ...
-`$operator` | *string* | `null` | ...
+`$column` | *string* | required | Column name
+`$operator` | *string* | `null` | Logic operator
 
 ##### `havingCount($column, $operator = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$column` | *string* | required | ...
-`$operator` | *string* | `null` | ...
+`$column` | *string* | required | Column name
+`$operator` | *string* | `null` | Logic operator
 
 ##### `havingMax($column, $operator = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$column` | *string* | required | ...
-`$operator` | *string* | `null` | ...
+`$column` | *string* | required | Column name
+`$operator` | *string* | `null` | Logic operator
 
 ##### `havingMin($column, $operator = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$column` | *string* | required | ...
-`$operator` | *string* | `null` | ...
+`$column` | *string* | required | Column name
+`$operator` | *string* | `null` | Logic operator
 
 ##### `havingAvg($column, $operator = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$column` | *string* | required | ...
-`$operator` | *string* | `null` | ...
+`$column` | *string* | required | Column name
+`$operator` | *string* | `null` | Logic operator
 
 ##### `havingSum($column, $operator = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$column` | *string* | required | ...
-`$operator` | *string* | `null` | ...
+`$column` | *string* | required | Column name
+`$operator` | *string* | `null` | Logic operator
 
 ### Examples
 

docs/Clause/JOIN.md

@@ -4,42 +4,42 @@
 
 ### Methods
 
-##### `join($table, $first, $operator = null, $second = null, $type = 'INNER')`
+##### `join($table, $first, $operator = null, $second = null, $joinType = 'INNER')`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$table` | *string* | required | ...
-`$first` | *string* | required | ...
-`$operator` | *string* | `null` | ...
-`$second` | *string* | `null` | ...
-`$type` | *string* | `'INNER'` | ...
+`$table` | *string* | required | Table name
+`$first` | *string* | required | Column name
+`$operator` | *string* | `null` | Logical operator
+`$second` | *string* | `null` | Column name
+`$joinType` | *string* | `'INNER'` | Join type: `INNER`, `LEFT OUTER`, `RIGHT OUTER` or `FULL OUTER`
 
 ##### `leftJoin($table, $first, $operator = null, $second = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$table` | *string* | required | ...
-`$first` | *string* | required | ...
-`$operator` | *string* | `null` | ...
-`$second` | *string* | `null` | ...
+`$table` | *string* | required | Table name
+`$first` | *string* | required | Column name
+`$operator` | *string* | `null` | Logical operator
+`$second` | *string* | `null` | Column name
 
 ##### `rightJoin($table, $first, $operator = null, $second = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$table` | *string* | required | ...
-`$first` | *string* | required | ...
-`$operator` | *string* | `null` | ...
-`$second` | *string* | `null` | ...
+`$table` | *string* | required | Table name
+`$first` | *string* | required | Column name
+`$operator` | *string* | `null` | Logical operator
+`$second` | *string* | `null` | Column name
 
 ##### `fullJoin($table, $first, $operator = null, $second = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$table` | *string* | required | ...
-`$first` | *string* | required | ...
-`$operator` | *string* | `null` | ...
-`$second` | *string* | `null` | ...
+`$table` | *string* | required | Table name
+`$first` | *string* | required | Column name
+`$operator` | *string* | `null` | Logical operator
+`$second` | *string* | `null` | Column name
 
 ### Examples
 

docs/Clause/LIMIT.md

@@ -4,12 +4,12 @@
 
 ### Methods
 
-##### `limit($number, $end = null)`
+##### `limit($number, $offset = null)`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$number` | *int* | required | ...
-`$end` | *int* | `null` | ...
+`$number` | *int* | required | Number of rows
+`$offset` | *int* | `null` | Offset value
 
 ### Examples
 

docs/Clause/OFFSET.md

@@ -8,7 +8,7 @@
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$number` | *int* | required | ...
+`$number` | *int* | required | Number of rows
 
 ### Examples
 

docs/Clause/ORDER_BY.md

@@ -4,12 +4,12 @@
 
 ### Methods
 
-##### `orderBy($statement, $order = 'ASC')`
+##### `orderBy($column, $direction = 'ASC')`
 
 Parameter | Type | Default | Description
 --- | --- | --- | ---
-`$statement` | *string* | required | ...
-`$order` | *string* | `'ASC'` | ...
+`$column` | *string* | required | Column name
+`$direction` | *string* | `'ASC'` | Direction: `ASC` or `DESC`
 
 ### Examples