Merge pull request #29 from moufmouf/1.2

Removing bundled PHPSQLParser

Author: moufmouf

README.md

@@ -1,9 +1,9 @@
 [![Latest Stable Version](https://poser.pugx.org/mouf/magic-query/v/stable)](https://packagist.org/packages/mouf/magic-query)
 [![Latest Unstable Version](https://poser.pugx.org/mouf/magic-query/v/unstable)](https://packagist.org/packages/mouf/magic-query)
 [![License](https://poser.pugx.org/mouf/magic-query/license)](https://packagist.org/packages/mouf/magic-query)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/thecodingmachine/magic-query/badges/quality-score.png?b=1.1)](https://scrutinizer-ci.com/g/thecodingmachine/magic-query/?branch=1.1)
-[![Build Status](https://travis-ci.org/thecodingmachine/magic-query.svg?branch=1.1)](https://travis-ci.org/thecodingmachine/magic-query)
-[![Coverage Status](https://coveralls.io/repos/thecodingmachine/magic-query/badge.svg?branch=1.1)](https://coveralls.io/r/thecodingmachine/magic-query?branch=1.1)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/thecodingmachine/magic-query/badges/quality-score.png?b=1.2)](https://scrutinizer-ci.com/g/thecodingmachine/magic-query/?branch=1.2)
+[![Build Status](https://travis-ci.org/thecodingmachine/magic-query.svg?branch=1.2)](https://travis-ci.org/thecodingmachine/magic-query)
+[![Coverage Status](https://coveralls.io/repos/thecodingmachine/magic-query/badge.svg?branch=1.2)](https://coveralls.io/r/thecodingmachine/magic-query?branch=1.2)
 
 What is Magic-query?
 ====================
@@ -24,7 +24,7 @@ Simply use the composer package:
 ```json
 {
 	"require": {
-		"mouf/magic-query": "~1.1"
+		"mouf/magic-query": "^1.2"
 	},
 	"minimum-stability": "dev",
 	"prefer-stable": true

composer.json

@@ -19,7 +19,8 @@
     	"mouf/utils.common.paginable-interface": "~1.0",
     	"mouf/utils.common.sortable-interface": "~1.0",
         "mouf/schema-analyzer": "~1.0",
-        "twig/twig": "~1.14"
+        "twig/twig": "~1.14",
+        "greenlion/php-sql-parser": "^4.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.0",

src/Mouf/Database/MagicQuery.php

@@ -5,6 +5,7 @@
 use Doctrine\Common\Cache\VoidCache;
 use Mouf\Database\MagicQuery\Twig\SqlTwigEnvironmentFactory;
 use Mouf\Database\SchemaAnalyzer\SchemaAnalyzer;
+use PHPSQLParser\PHPSQLParser;
 use SQLParser\Node\ColRef;
 use SQLParser\Node\Equal;
 use SQLParser\Node\NodeInterface;
@@ -105,7 +106,8 @@ public function parse($sql)
         $select = $this->cache->fetch($cacheKey);
 
         if ($select === false) {
-            $parser = new SQLParser();
+            //$parser = new SQLParser();
+            $parser = new PHPSQLParser();
             $parsed = $parser->parse($sql);
 
             if ($parsed == false) {