Merge pull request #67 from vierge-noire/cake3_next

Postgres update merged on cake_3
vierge-noire · Apr 15, 2021 · f841515 · f841515
2 parents 376a650 + eabd1ff
commit f841515
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Factory/DataCompiler.php b/src/Factory/DataCompiler.php
@@ -432,6 +432,7 @@ public function generateRandomPrimaryKey(string $columnType)
     {
         switch ($columnType) {
             case 'uuid':
+            case 'string':
                 $res = $this->getFactory()->getFaker()->uuid;
                 break;
             case 'biginteger':
@@ -479,9 +480,13 @@ private function updatePostgresSequence(array $primaryKeys)
             $tableName = $this->getFactory()->getRootTableRegistry()->getTable();
 
             foreach ($primaryKeys as $pk => $offset) {
-                $this->getFactory()->getRootTableRegistry()->getConnection()->execute(
-                    "SELECT setval('$tableName". "_$pk" . "_seq', $offset);"
-                );
+                $seq = $this->getFactory()->getRootTableRegistry()->getConnection()->execute("
+		            SELECT pg_get_serial_sequence('$tableName','$pk')")->fetchAll()[0][0];
+                if ($seq !== null) {
+                    $this->getFactory()->getRootTableRegistry()->getConnection()->execute(
+                        "SELECT setval('$seq', $offset);"
+                    );
+                }
             }
         }
     }