Merge pull request #9 from 100DAYS/master

Fix PostgreSQL problem with given ids

bin/doctrine-dbal

@@ -0,0 +1 @@
+../vendor/doctrine/dbal/bin/doctrine-dbal

bin/phpunit

@@ -0,0 +1 @@
+../vendor/phpunit/phpunit/phpunit

bin/yaml-lint

@@ -0,0 +1 @@
+../vendor/symfony/yaml/Resources/bin/yaml-lint

composer.json

@@ -11,10 +11,10 @@
     ],
     "require": {
         "php": ">=7.1",
-        "doctrine/dbal": "^2.5",
-        "fzaninotto/faker": "^1.6",
-        "symfony/console": "^4.0",
-        "symfony/yaml": "^4.0"
+        "doctrine/dbal": "^2.5 | ^3.3",
+        "symfony/console": "^4.0 | ^5.0 | ^6.0",
+        "symfony/yaml": "^4.0 | ^5.0 | ^6.0",
+        "fakerphp/faker": "^1.12"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0"

src/Database/DBALConnection.php

@@ -18,14 +18,21 @@ public function __construct(DbConnection $connection)
         $this->connection = $connection;
     }
 
-    /** @throws \Doctrine\DBAL\DBALException */
+    /**
+     * @param string $table
+     * @param Row $row
+     * @throws \Doctrine\DBAL\DBALException
+     */
     public function insert(string $table, Row $row): void
     {
         $insert = Insert::into($table, $row);
 
         $this->connection->executeUpdate($insert->toSQL($this->connection), $insert->parameters());
 
-        $row->assignId($this->connection->lastInsertId());
+        try {
+            $id = $this->connection->lastInsertId();
+            $row->assignId($id);
+        } catch (\Exception $e) {};
     }
 
     /**

src/Database/Insert.php

@@ -36,7 +36,9 @@ public function parameters(): array
     {
         $parameters = [];
         foreach ($this->row->values() as $value) {
-            if (is_numeric($value) || trim($value, '`') === $value) {
+            if(is_array($value)) {
+                $parameters[] = json_encode($value);
+            } elseif (is_numeric($value) || trim($value, '`') === $value) {
                 $parameters[] = $value;
             }
         }

src/Database/Row.php

@@ -76,7 +76,7 @@ public function placeholders(): array
     {
         $placeholders = [];
         foreach ($this->values as $column => $value) {
-            if (is_numeric($value) || trim($value, '`') === $value) {
+            if (is_array($value) || is_numeric($value) || trim($value, '`') === $value) {
                 $placeholders[$column] = '?';
             } else {
                 $placeholders[$column] = $value === null ? 'null' : trim($value, '`');

src/Processors/FakerProcessor.php

@@ -30,8 +30,9 @@ public function beforeInsert(Row $row): void
         }
     }
 
-    private function generateFakeDataIfNeeded(Row $row, string $column, ?string $value): void
+    private function generateFakeDataIfNeeded(Row $row, string $column, $value): void
     {
+        if(!is_scalar($value)) return;
         $formatted = $value;
         while (FormatterCall::matches($formatted)) {
             $formatted = FormatterCall::from($formatted)->run($this->generator);

src/Processors/ForeignKeyProcessor.php

@@ -59,8 +59,9 @@ public function addReference(Row $row)
     /**
      * @return mixed
      */
-    private function parseKeyIfNeeded(string $value)
+    private function parseKeyIfNeeded($value)
     {
+        if (!is_scalar($value)) return $value;
         if ($this->isAReference($value) && $this->referenceExistsFor($value)) {
             return $this->references[substr($value, 1)];
         }