Merge pull request #55 from CircleOfNice/bugfixes

fixed id column name issue

Author: TobiasHauck

Tests/Controller/MockController.php

@@ -40,9 +40,10 @@ public function getAction($id) {
         if ($id != 1) return new Response('', 404);
 
         return new Response(json_encode([
-            'id'    => 1,
-            'name'  => 'MyName',
-            'value' => 'MyValue',
+            'id'                          => 1,
+            'extremelyStrange_identifier' => 1,
+            'name'                        => 'MyName',
+            'value'                       => 'MyValue',
         ]));
     }
 

Tests/Entity/CustomIdentifierEntity.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * This file is part of DoctrineRestDriver.
+ *
+ * DoctrineRestDriver is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DoctrineRestDriver is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with DoctrineRestDriver.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Circle\DoctrineRestDriver\Tests\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Circle\DoctrineRestDriver\Annotations as DataSource;
+
+/**
+ * This is a test entity with a strange named identifier
+ *
+ * @author    Tobias Hauck <[email protected]>
+ * @copyright 2015 TeeAge-Beatz UG
+ *
+ * @ORM\Entity
+ * @ORM\Table(name="other_products")
+ * @SuppressWarnings("PHPMD")
+ */
+class CustomIdentifierEntity {
+    /**
+     * @ORM\Column(type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     * @var int
+     */
+    protected $extremelyStrange_identifier;
+
+    /**
+     * @return int
+     */
+    public function getId() {
+        return $this->extremelyStrange_identifier;
+    }
+
+    /**
+     * @param  int                    $id
+     * @return CustomIdentifierEntity
+     */
+    public function setId($id) {
+        $this->extremelyStrange_identifier = $id;
+        return $this;
+    }
+}

Tests/FunctionalTest.php

@@ -291,6 +291,19 @@ public function dqlWithObjectParameter() {
      * @expectedException \Exception
      */
     public function nonImplementedEntity() {
-        $this->em->find('Circle\DoctrineRestDriver\Entity\NonImplementedEntity', 1);
+        $this->em->find('Circle\DoctrineRestDriver\Tests\Entity\NonImplementedEntity', 1);
+    }
+
+    /**
+     * @test
+     * @group  functional
+     * @covers Circle\DoctrineRestDriver\Driver
+     * @covers Circle\DoctrineRestDriver\Connection
+     * @covers Circle\DoctrineRestDriver\Statement
+     * @covers Circle\DoctrineRestDriver\Statement::<private>
+     * @covers Circle\DoctrineRestDriver\MetaData
+     */
+    public function customIdentifierEntity() {
+        $this->em->find('Circle\DoctrineRestDriver\Tests\Entity\CustomIdentifierEntity', 1);
     }
 }

Tests/RestClientTest.php

@@ -58,9 +58,10 @@ public function send() {
         ]);
 
         $response = new Response(json_encode([
-            'id'    => 1,
-            'name'  => 'MyName',
-            'value' => 'MyValue'
+            'id'                          => 1,
+            'extremelyStrange_identifier' => 1,
+            'name'                        => 'MyName',
+            'value'                       => 'MyValue'
         ]));
 
         $this->assertEquals($response->getContent(), $this->restClient->send($request)->getContent());

Tests/app/config/routing.yml

@@ -10,6 +10,12 @@ circle_doctrine_rest_driver_mock_get:
     methods: [ GET ]
     condition: "request.getScriptName() == '/app_dev.php'"
 
+circle_doctrine_rest_driver_mock_get_custom_identifier:
+    path:   /mockapi/other_products/{id}
+    defaults:  { _controller: Circle\DoctrineRestDriver\Tests\Controller\MockController::getAction }
+    methods: [ GET ]
+    condition: "request.getScriptName() == '/app_dev.php'"
+
 circle_doctrine_rest_driver_mock_post:
     path:   /mockapi/products
     defaults:  { _controller: Circle\DoctrineRestDriver\Tests\Controller\MockController::postAction }

Types/HttpQuery.php

@@ -19,6 +19,7 @@
 namespace Circle\DoctrineRestDriver\Types;
 
 use Circle\DoctrineRestDriver\Enums\SqlOperations;
+use Circle\DoctrineRestDriver\MetaData;
 use Circle\DoctrineRestDriver\Validation\Assertions;
 
 /**
@@ -49,6 +50,6 @@ public static function create(array $tokens) {
             return $query . str_replace('"', '', str_replace('OR', '|', str_replace('AND', '&', str_replace($tableAlias . '.', '', $token['base_expr']))));
         });
 
-        return preg_replace('/id\=\d*&*/', '', $query);
+        return preg_replace('/' . Identifier::column($tokens, new MetaData()) . '\=\d*&*/', '', $query);
     }
 }

Types/Identifier.php

@@ -81,7 +81,7 @@ public static function column(array $tokens, MetaData $metaData) {
             return $meta->getTableName() === $table;
         });
 
-        $idColumns  = !empty($meta) ? end($meta)->getIdentifierColumnNames() : [];
+        $idColumns = !empty($meta) ? end($meta)->getIdentifierColumnNames() : [];
 
         return !empty($idColumns) ? end($idColumns) : 'id';
     }