Merge pull request #25 from chrisandchris/release/v2.3

fixed issue when using auto camelCase and typecast and explicit schema

.gitignore

@@ -1,3 +1,4 @@
+.vagrant/
 !app/cache/.gitkeep
 !app/logs/.gitkeep
 /build/

src/ChrisAndChris/Common/RowMapperBundle/Services/Query/Parser/Snippets/MySqlBag.php

@@ -19,9 +19,9 @@
 class MySqlBag extends AbstractBag implements SnippetBagInterface
 {
 
+    const DELIMITER = '`';
     /** @var array */
     private $snippets = [];
-    const DELIMITER = '`';
 
     public function __construct()
     {
@@ -113,15 +113,20 @@ private function init()
 
                 // key = db column name, value = alias
                 foreach ($params['fields'] as $key => $value) {
-                    // explicit value
+                    // explicit value or auto camelCase
                     if (!is_numeric($key) || substr($value, 0, 1) === '!') {
+                        // auto camelCase
                         if (substr($value, 0, 1) === '!') {
                             $key = substr($value, 1);
                             $value = $this->toCamelCase($key);
                         }
                     } else {
                         // implicit value
                         $key = $value;
+                    }
+
+                    // remove explicit schema qualifier and typecast from alias
+                    if (strstr($value, ':') !== false) {
                         // remove casting and schema/table qualifier from alias
                         $value = strrev(explode(':',
                             strrev(explode('::', $value)[0]))[0]);

src/ChrisAndChris/Common/RowMapperBundle/Tests/Services/Query/BuilderTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace ChrisAndChris\Common\RowMapperBundle\Tests\Services\Query;
 
 use ChrisAndChris\Common\RowMapperBundle\Exceptions\MalformedQueryException;
@@ -132,6 +133,17 @@ public function testFieldlist_withCast()
         $this->equals('`table`.`field1` as `field1`', $builder);
     }
 
+    public function testFiedllist_withCastAndCamelCase()
+    {
+        $builder = $this->getBuilder();
+        $builder->fieldlist(
+            [
+                '!table:camel_case::int',
+            ]
+        );
+        $this->equals('`table`.`camel_case` as `camelCase`', $builder);
+    }
+
     public function testFieldlist()
     {
         $builder = $this->getBuilder();
@@ -187,7 +199,8 @@ public function testFieldlist()
                 '!first_name',
             ]
         );
-        $this->equals('`user_id` as `userId`, `first_name` as `firstName`', $builder);
+        $this->equals('`user_id` as `userId`, `first_name` as `firstName`',
+            $builder);
 
         $builder = $this->getBuilder();
         $builder->fieldlist(
@@ -517,7 +530,8 @@ function () {
 
         $this->assertEquals(5, count($builder->getStatement()));
         $query = $builder->getSqlQuery();
-        $this->assertEquals('`field` `field` `field` `field` `field`', $query->getQuery());
+        $this->assertEquals('`field` `field` `field` `field` `field`',
+            $query->getQuery());
     }
 
     public function testEach()