Skip to content

Commit

Permalink
Minor fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
JiamingL committed Nov 30, 2017
1 parent 73068ae commit e0cb553
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
5 changes: 0 additions & 5 deletions .buildpath
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
<attribute name="composer" value="source"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="src/test/php/Gomoob">
<attributes>
<attribute name="composer" value="source"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/cilex/cilex/src">
<attributes>
<attribute name="composer" value="vendor"/>
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to
[Semantic Versioning](http://semver.org/).

## [1.1.2] - 2017-11-30
* Minor fixes of README.md.

## [1.1.1] - 2017-11-28
* Minor fixes for PHP 5.6.

## [1.1.0] - 2017-11-28
* Add support for expressions with simple logical operators and without parenthesis. The or operator is writen with `-`,
the and operator is written with `+` ;
the and operator is written with `+` ;
* Update minor composer dependency versions.

## [1.0.0] - 2017-08-01
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@ The expression language provides the following operators.

| Operator | ASCII value | Name | Value type(s) |
|----------|-------------|--------------------------|----------------------------------------|
| `=` | `%3D% | Equals | Integer, Float, String |
| `=` | `%3D` | Equals | Integer, Float, String |
| `<` | `%3C` | Less than | Integer, Float |
| `<=` | `%3C%3D` | Less than or equal to | Integer, Float |
| `>` | `%3E` | Greater than | Integer, Float |
| `>=` | `%3E%3D` | Greater than or equal to | Integer, Float |
| `in` | | In | Integer list, Double list, String list |
| `~` | `%7E%` | Like | String |
| `!` | | Not | _see description above_ |
| `+` | | And | _see description above_ |
| `-` | | Or | _see description above_ |
| `~` | `%7E` | Like | String |
| `!` | `%21` | Not | _see description above_ |
| `+` | `%2B` | And | _see description above_ |
| `-` | `%2D` | Or | _see description above_ |

### Not operator

Expand All @@ -95,7 +95,7 @@ The `+` and `-` operator allow to create AND and OR SQL requests.
Here are sample expressions with logical operators.

* `property=>5.4+<12` is translated to `property >= ? AND property < ?` with 2 parameters `[5.4,12]` ;
* `property=~'*ball*'-~'*tennis*'` is translated to `property like ? OR property like ?` with 2 parameters
* `property=~'*ball*'-~'*tennis*'` is translated to `property like ? OR property like ?` with 2 parameters
`['%ball%','%tennis%'].

### Like operator
Expand Down

0 comments on commit e0cb553

Please sign in to comment.