Merge pull request #80 from os-cillation/master

Fix String IDs enclosed in Quotes

Author: TobiasHauck

Makefile

@@ -19,6 +19,13 @@ test:
 	php -S 127.0.0.1:3000 -t Tests/app 2>1 & ./vendor/phpunit/phpunit/phpunit -c phpunit.xml --coverage-html $(LOGDIR)/coverage
 	ps -eaf | awk '/ph[p] -S/{ print $$2 }' | xargs kill
 	rm 1
+unit:
+	php -S 127.0.0.1:3000 -t Tests/app 2>1 & ./vendor/phpunit/phpunit/phpunit -c phpunit.xml --coverage-html $(LOGDIR)/coverage
+	ps -eaf | awk '/ph[p] -S/{ print $$2 }' | xargs kill
+	rm 1
+clean:
+	ps -eaf | awk '/ph[p] -S/{ print $$2 }' | xargs kill
+	rm 1
 docs:
 
-install:
+install:

Tests/Factory/ResponseExceptionFactoryTest.php

@@ -28,7 +28,7 @@
  * 
  * @author Rob Treacy <[email protected]>
  */
-class ResponseExceptionFactoryTest extends \PHPUnit_Framework_TestCase {
+class ResponseExceptionFactoryTest extends \PHPUnit\Framework\TestCase {
     private $responseExceptionFactory;
 
     public function setUp() {
@@ -42,8 +42,8 @@ public function setUp() {
      * @dataProvider createDbalExceptionProvider
      */
     public function createDbalException(Response $response, $expectedExceptionClass) {
-        $return = $this->responseExceptionFactory->createDbalException($response, $this->createMock(DriverExceptionInterface::class));
-        $this->assertInstanceOf($expectedExceptionClass, $return);
+        $return = $this->responseExceptionFactory->createDbalException($response, $this->createMock($expectedExceptionClass));
+        $this->assertInstanceOf(DriverExceptionInterface::class, $return);
     }
 
     /**

Tests/Types/IdentifierTest.php

@@ -45,6 +45,48 @@ public function create() {
         $this->assertSame('1', Identifier::create($tokens));
     }
 
+    /**
+     * @test
+     * @group  unit
+     * @covers ::create
+     *
+     * @SuppressWarnings("PHPMD.StaticAccess")
+     */
+    public function createWithStringId() {
+        $parser = new PHPSQLParser();
+        $tokens = $parser->parse('SELECT name FROM products WHERE id="test"');
+
+        $this->assertSame('test', Identifier::create($tokens));
+    }
+
+    /**
+     * @test
+     * @group  unit
+     * @covers ::create
+     *
+     * @SuppressWarnings("PHPMD.StaticAccess")
+     */
+    public function createWithStringIdSingleQuotes() {
+        $parser = new PHPSQLParser();
+        $tokens = $parser->parse('SELECT name FROM products WHERE id=\'test\'');
+
+        $this->assertSame('test', Identifier::create($tokens));
+    }
+
+    /**
+     * @test
+     * @group  unit
+     * @covers ::create
+     *
+     * @SuppressWarnings("PHPMD.StaticAccess")
+     */
+    public function createWithStringIdNoQuotes() {
+        $parser = new PHPSQLParser();
+        $tokens = $parser->parse('SELECT name FROM products WHERE id=test');
+
+        $this->assertSame('test', Identifier::create($tokens));
+    }
+
     /**
      * @test
      * @group  unit

Types/HttpQuery.php

@@ -70,7 +70,7 @@ public static function createConditionals(array $tokens) {
 
         // Get WHERE conditions as string including table alias and primary key column if present
         $sqlWhereString = array_reduce($tokens['WHERE'], function($query, $token) use ($tableAlias) {
-            return $query . str_replace('"', '', str_replace('OR', '|', str_replace('AND', '&', $token['base_expr'])));
+            return $query . str_replace(['"', '\''], '', str_replace('OR', '|', str_replace('AND', '&', $token['base_expr'])));
         });
 
         // Remove primary key column before removing table alias and returning

Types/Identifier.php

@@ -19,7 +19,6 @@
 namespace Circle\DoctrineRestDriver\Types;
 
 use Circle\DoctrineRestDriver\MetaData;
-use Circle\DoctrineRestDriver\Validation\Assertions;
 
 /**
  * Extracts id information from a sql token array
@@ -45,10 +44,10 @@ public static function create(array $tokens) {
         $idAlias = self::alias($tokens);
 
         return array_reduce($tokens['WHERE'], function($carry, $token) use ($tokens, $idAlias) {
-            if (!is_int($carry)) return $carry;
+            if ($carry !== null) return (string)Value::create($carry);
             if ($token['expr_type'] === 'colref' && $token['base_expr'] === $idAlias) return $tokens['WHERE'][$carry+2]['base_expr'];
             if (!isset($tokens[$carry+1])) return '';
-        }, 0);
+        }, null);
     }
 
     /**
@@ -85,4 +84,4 @@ public static function column(array $tokens, MetaData $metaData) {
 
         return !empty($idColumns) ? end($idColumns) : 'id';
     }
-}
+}

Types/Value.php

@@ -40,7 +40,7 @@ class Value {
      */
     public static function create($value) {
         Str::assert($value, 'value');
-      
+
         if($value === 'true')  return true;
         if($value === 'false') return false;
         if($value === 'null')  return null;