Merge branch 'master' into motranslator

Author: nijel

.gitattributes

@@ -0,0 +1,8 @@
+/tests export-ignore
+/tools export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+codeconv.yml export-ignore
+phpunit.xml export-ignore
+.php_cs export-ignore

CHANGELOG.md

@@ -2,13 +2,21 @@
 
 ## [Unreleased]
 
+* Coding style fixes.
+* Fixed indentation in HTML formatting.
+* Fixed parsing of unterminated variables.
+
+## [3.4.16] - 2017-01-06
+
+* Coding style fixes.
+* Properly handle operators AND, NOT, OR, XOR, DIV, MOD
+
 ## [3.4.15] - 2017-01-02
 
 * Fix return value of Formatter.toString() when type is text
 * Fix parsing of FIELDS and LINES options in SELECT..INTO
 * PHP 7.2 compatibility.
 * Better parameter passing to query formatter.
-* Coding style fixes.
 
 ## [3.4.14] - 2016-11-30
 

README.md

@@ -77,6 +77,13 @@ $parser->statements[0]->from[0] = $table2;
 $statement = $parser->statements[0];
 $query2 = $statement->build();
 var_dump($query2); // outputs string(19) "SELECT  * FROM `b` "
+
+// Change SQL mode
+SqlParser\Context::setMode('ANSI_QUOTES');
+
+// build the query again using different quotes
+$query2 = $statement->build();
+var_dump($query2); // outputs string(19) "SELECT  * FROM "b" "
 ```
 
 ## More information

composer.json

@@ -32,5 +32,10 @@
         "psr-4": {
             "SqlParser\\": "src"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "SqlParser\\Tests\\": "tests"
+        }
     }
 }

phpunit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"

src/Components/Expression.php

@@ -30,6 +30,7 @@ class Expression extends Component
      */
     private static $ALLOWED_KEYWORDS = array(
         'AS' => 1, 'DUAL' => 1, 'NULL' => 1, 'REGEXP' => 1, 'CASE' => 1,
+        'DIV' => 1, 'AND' => 1, 'OR' => 1, 'XOR' => 1, 'NOT' => 1, 'MOD' => 1,
     );
 
     /**